lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-26 05:32:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore Java 7 compatibility

Browse Source
This commit is contained in:
Stephane Nicoll
2015-12-15 11:21:34 +01:00
parent 496520e990
commit 8fa0e0103d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
View File

@@ -91,7 +91,7 @@ class InitializrMetadata {
dependencies.validate()
def repositories = configuration.env.repositories
dependencies.all.forEach { dependency ->
for (Dependency dependency : dependencies.all) {
def boms = configuration.env.boms
if (dependency.bom && !boms[dependency.bom]) {
throw new InvalidInitializrMetadataException("Dependency $dependency " +
@@ -103,15 +103,15 @@ class InitializrMetadata {
"defines an invalid repository id $dependency.repository, available repositores $repositories")
}
}
configuration.env.boms.values().forEach { bom ->
bom.repositories.forEach { r ->
for (BillOfMaterials bom : configuration.env.boms.values()) {
for (String r : bom.repositories) {
if (!repositories[r]) {
throw new InvalidInitializrMetadataException("$bom " +
"defines an invalid repository id $r, available repositores $repositories")
}
}
bom.mappings.forEach{ m ->
m.repositories.forEach { r ->
for (BillOfMaterials.Mapping m : bom.mappings) {
for (String r : m.repositories) {
if (!repositories[r]) {
throw new InvalidInitializrMetadataException("$m of $bom " +
"defines an invalid repository id $r, available repositores $repositories")

10
initializr/src/main/groovy/io/spring/initializr/support/DefaultDependencyMetadataProvider.groovy
View File

@@ -38,28 +38,28 @@ class DefaultDependencyMetadataProvider implements DependencyMetadataProvider {
@Cacheable(cacheNames = "dependency-metadata", key = "#p1")
DependencyMetadata get(InitializrMetadata metadata, Version bootVersion) {
Map<String, Dependency> dependencies = [:]
metadata.dependencies.getAll().forEach { d ->
for (Dependency d : metadata.dependencies.getAll()) {
if (d.match(bootVersion)) {
dependencies[d.id] = d.resolve(bootVersion)
}
}
Map<String, Repository> repositories = [:]
dependencies.values().forEach { d ->
for (Dependency d : dependencies.values()) {
if (d.repository) {
repositories[d.repository] = metadata.configuration.env.repositories[d.repository]
}
}
Map<String, BillOfMaterials> boms = [:]
dependencies.values().forEach { d ->
for (Dependency d : dependencies.values()) {
if (d.bom) {
boms[d.bom] = metadata.configuration.env.boms.get(d.bom).resolve(bootVersion)
}
}
// Each resolved bom may require additional repositories
boms.values().forEach { b ->
b.repositories.forEach { id ->
for (BillOfMaterials b : boms.values()) {
for (String id : b.repositories) {
repositories[id] = metadata.configuration.env.repositories[id]
}
}