JavaConventions.java (spring-boot-2.7.3) | : | JavaConventions.java (spring-boot-2.7.4) | ||
---|---|---|---|---|
skipping to change at line 234 | skipping to change at line 234 | |||
ConfigurationContainer configurations = project.getConfigurations (); | ConfigurationContainer configurations = project.getConfigurations (); | |||
Configuration dependencyManagement = configurations.create("depen dencyManagement", (configuration) -> { | Configuration dependencyManagement = configurations.create("depen dencyManagement", (configuration) -> { | |||
configuration.setVisible(false); | configuration.setVisible(false); | |||
configuration.setCanBeConsumed(false); | configuration.setCanBeConsumed(false); | |||
configuration.setCanBeResolved(false); | configuration.setCanBeResolved(false); | |||
}); | }); | |||
configurations | configurations | |||
.matching((configuration) -> configuration.getNam e().endsWith("Classpath") | .matching((configuration) -> configuration.getNam e().endsWith("Classpath") | |||
|| JavaPlugin.ANNOTATION_PROCESSO R_CONFIGURATION_NAME.equals(configuration.getName())) | || JavaPlugin.ANNOTATION_PROCESSO R_CONFIGURATION_NAME.equals(configuration.getName())) | |||
.all((configuration) -> configuration.extendsFrom (dependencyManagement)); | .all((configuration) -> configuration.extendsFrom (dependencyManagement)); | |||
Dependency springBootParent = project.getDependencies().enforcedP | String path = project.getName().contains("spring-boot-starter") | |||
latform(project.getDependencies() | ? ":spring-boot-project:spring-boot-dependencies" | |||
.project(Collections.singletonMap("path", ":sprin | : ":spring-boot-project:spring-boot-parent"; | |||
g-boot-project:spring-boot-parent"))); | Dependency dependency = project.getDependencies() | |||
dependencyManagement.getDependencies().add(springBootParent); | .enforcedPlatform(project.getDependencies().proje | |||
ct(Collections.singletonMap("path", path))); | ||||
dependencyManagement.getDependencies().add(dependency); | ||||
project.getPlugins().withType(OptionalDependenciesPlugin.class, ( optionalDependencies) -> configurations | project.getPlugins().withType(OptionalDependenciesPlugin.class, ( optionalDependencies) -> configurations | |||
.getByName(OptionalDependenciesPlugin.OPTIONAL_CO NFIGURATION_NAME).extendsFrom(dependencyManagement)); | .getByName(OptionalDependenciesPlugin.OPTIONAL_CO NFIGURATION_NAME).extendsFrom(dependencyManagement)); | |||
} | } | |||
private void configureToolchain(Project project) { | private void configureToolchain(Project project) { | |||
project.getPlugins().apply(ToolchainPlugin.class); | project.getPlugins().apply(ToolchainPlugin.class); | |||
} | } | |||
private void configureProhibitedDependencyChecks(Project project) { | private void configureProhibitedDependencyChecks(Project project) { | |||
SourceSetContainer sourceSets = project.getExtensions().getByType (SourceSetContainer.class); | SourceSetContainer sourceSets = project.getExtensions().getByType (SourceSetContainer.class); | |||
End of changes. 1 change blocks. | ||||
5 lines changed or deleted | 7 lines changed or added |