diff --git a/build.gradle b/build.gradle index 8cf0d12..00798f4 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'java-gradle-plugin' id 'maven-publish' - id 'io.spring.javaformat' version '0.0.34' + id 'io.spring.javaformat' version '0.0.39' id 'io.spring.nohttp' version '0.0.10' id 'org.asciidoctor.jvm.convert' version '3.3.2' } @@ -65,7 +65,7 @@ def mavenRepackJar = tasks.register("mavenRepackJar", Jar) { repackJar -> dependencies { asciidoctorExt 'io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.4' - checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.34' + checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.39' implementation(files(mavenRepackJar)) diff --git a/src/main/java/io/spring/gradle/dependencymanagement/DependencyManagementPlugin.java b/src/main/java/io/spring/gradle/dependencymanagement/DependencyManagementPlugin.java index 4940763..cc0306b 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/DependencyManagementPlugin.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/DependencyManagementPlugin.java @@ -36,7 +36,7 @@ public class DependencyManagementPlugin implements Plugin { public void apply(Project project) { InternalComponents internalComponents = new InternalComponents(project); DependencyManagementExtension dependencyManagementExtension = internalComponents - .getDependencyManagementExtension(); + .getDependencyManagementExtension(); project.getExtensions().add("dependencyManagement", dependencyManagementExtension); internalComponents.createDependencyManagementReportTask("dependencyManagement"); project.getConfigurations().all(internalComponents.getImplicitDependencyManagementCollector()); @@ -47,19 +47,21 @@ public void apply(Project project) { private void configurePomCustomization(Project project, DependencyManagementExtension dependencyManagementExtension) { PomDependencyManagementConfigurer pomConfigurer = dependencyManagementExtension.getPomConfigurer(); - project.getPlugins().withType(MavenPublishPlugin.class, - (mavenPublishPlugin) -> configurePublishingExtension(project, pomConfigurer)); + project.getPlugins() + .withType(MavenPublishPlugin.class, + (mavenPublishPlugin) -> configurePublishingExtension(project, pomConfigurer)); } private void configurePublishingExtension(Project project, PomDependencyManagementConfigurer extension) { - project.getExtensions().configure(PublishingExtension.class, - (publishingExtension) -> configurePublications(publishingExtension, extension)); + project.getExtensions() + .configure(PublishingExtension.class, + (publishingExtension) -> configurePublications(publishingExtension, extension)); } private void configurePublications(PublishingExtension publishingExtension, PomDependencyManagementConfigurer extension) { - publishingExtension.getPublications().withType(MavenPublication.class, - (mavenPublication) -> mavenPublication.getPom().withXml(extension)); + publishingExtension.getPublications() + .withType(MavenPublication.class, (mavenPublication) -> mavenPublication.getPom().withXml(extension)); } } diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/DependencyManagementApplier.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/DependencyManagementApplier.java index cb0060d..55ca397 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/DependencyManagementApplier.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/DependencyManagementApplier.java @@ -70,7 +70,8 @@ public DependencyManagementApplier(Project project, DependencyManagementContaine public void execute(Configuration configuration) { logger.info("Applying dependency management to configuration '{}' in project '{}'", configuration.getName(), this.project.getName()); - configuration.getIncoming().beforeResolve((resolvableDependencies) -> this.dependencyManagementContainer + configuration.getIncoming() + .beforeResolve((resolvableDependencies) -> this.dependencyManagementContainer .getManagedVersionsForConfiguration(configuration)); VersionConfiguringAction versionConfiguringAction = new VersionConfiguringAction(this.project, this.dependencyManagementContainer, configuration); diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/ExclusionResolver.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/ExclusionResolver.java index 2215a3c..80e37a1 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/ExclusionResolver.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/ExclusionResolver.java @@ -44,7 +44,7 @@ class ExclusionResolver { private static final Set IGNORED_SCOPES = Collections - .unmodifiableSet(new HashSet<>(Arrays.asList("provided", "test"))); + .unmodifiableSet(new HashSet<>(Arrays.asList("provided", "test"))); private final Map exclusionsCache = new HashMap<>(); diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/Exclusions.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/Exclusions.java index 071848f..ee8e485 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/Exclusions.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/Exclusions.java @@ -36,7 +36,7 @@ void add(String dependency, Collection exclusionsForDependency) { return; } this.exclusionsByDependency.computeIfAbsent(dependency, (key) -> new HashSet<>()) - .addAll(exclusionsForDependency); + .addAll(exclusionsForDependency); } void addAll(Exclusions exclusions) { diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/Versions.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/Versions.java index 33042ff..20568d6 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/Versions.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/Versions.java @@ -29,7 +29,7 @@ final class Versions { private static final Set DYNAMIC_PREFIXES = Collections - .unmodifiableSet(new HashSet<>(Arrays.asList("latest.", "[", "]", "("))); + .unmodifiableSet(new HashSet<>(Arrays.asList("latest.", "[", "]", "("))); private Versions() { } diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/ConfigurationModelResolver.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/ConfigurationModelResolver.java index 7f255f7..8198bb8 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/ConfigurationModelResolver.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/ConfigurationModelResolver.java @@ -87,8 +87,13 @@ private io.spring.gradle.dependencymanagement.org.apache.maven.model.building.Mo private FileModelSource resolveModel(String coordinates, Consumer versionHandler) { Dependency dependency = this.project.getDependencies().create(coordinates); Configuration configuration = this.configurationContainer.newConfiguration(dependency); - versionHandler.accept(configuration.getResolvedConfiguration().getResolvedArtifacts().iterator().next() - .getModuleVersion().getId().getVersion()); + versionHandler.accept(configuration.getResolvedConfiguration() + .getResolvedArtifacts() + .iterator() + .next() + .getModuleVersion() + .getId() + .getVersion()); return new FileModelSource(configuration.resolve().iterator().next()); } diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolver.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolver.java index 6817376..77813b0 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolver.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolver.java @@ -76,8 +76,9 @@ public MavenPomResolver(Project project, DependencyManagementConfigurationContai @Override public List resolvePomsLeniently(List pomReferences) { - return createPoms(createConfiguration(pomReferences).getResolvedConfiguration().getLenientConfiguration() - .getArtifacts(Specs.SATISFIES_ALL), pomReferences, new MapPropertySource(Collections.emptyMap())); + return createPoms(createConfiguration(pomReferences).getResolvedConfiguration() + .getLenientConfiguration() + .getArtifacts(Specs.SATISFIES_ALL), pomReferences, new MapPropertySource(Collections.emptyMap())); } @Override @@ -146,17 +147,21 @@ private List getManagedDependencies(Model model) { if (model.getDependencyManagement() == null || model.getDependencyManagement().getDependencies() == null) { return Collections.emptyList(); } - return model.getDependencyManagement().getDependencies().stream().map(this::createDependency) - .collect(Collectors.toList()); + return model.getDependencyManagement() + .getDependencies() + .stream() + .map(this::createDependency) + .collect(Collectors.toList()); } private Dependency createDependency( io.spring.gradle.dependencymanagement.org.apache.maven.model.Dependency dependency) { Set exclusions = new LinkedHashSet<>(); if (dependency.getExclusions() != null) { - dependency.getExclusions().stream() - .map((exclusion) -> new Exclusion(exclusion.getGroupId(), exclusion.getArtifactId())) - .forEach(exclusions::add); + dependency.getExclusions() + .stream() + .map((exclusion) -> new Exclusion(exclusion.getGroupId(), exclusion.getArtifactId())) + .forEach(exclusions::add); } Coordinates coordinates = new Coordinates(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion()); diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/properties/CompositePropertySource.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/properties/CompositePropertySource.java index 1802843..581551d 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/properties/CompositePropertySource.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/properties/CompositePropertySource.java @@ -40,8 +40,11 @@ public CompositePropertySource(PropertySource... delegates) { @Override public Object getProperty(String name) { - return this.delegates.stream().map((delegate) -> delegate.getProperty(name)).filter(Objects::nonNull) - .findFirst().orElse(null); + return this.delegates.stream() + .map((delegate) -> delegate.getProperty(name)) + .filter(Objects::nonNull) + .findFirst() + .orElse(null); } } diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTask.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTask.java index 1edb847..5c30aaf 100644 --- a/src/main/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTask.java +++ b/src/main/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTask.java @@ -56,13 +56,13 @@ public void setDependencyManagementContainer(DependencyManagementContainer depen public void report() { this.renderer.startProject(getProject()); Map globalManagedVersions = this.dependencyManagementContainer - .getManagedVersionsForConfiguration(null); + .getManagedVersionsForConfiguration(null); this.renderer.renderGlobalManagedVersions(globalManagedVersions); Set configurations = new TreeSet<>(Comparator.comparing(Configuration::getName)); configurations.addAll(getProject().getConfigurations()); for (Configuration configuration : configurations) { Map managedVersions = this.dependencyManagementContainer - .getManagedVersionsForConfiguration(configuration); + .getManagedVersionsForConfiguration(configuration); this.renderer.renderConfigurationManagedVersions(managedVersions, configuration, globalManagedVersions); } } diff --git a/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginIntegrationTests.java b/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginIntegrationTests.java index dc55831..fb1227c 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginIntegrationTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginIntegrationTests.java @@ -163,7 +163,7 @@ void bomWithNoDependencyManagementCanBeImportedAndItsPropertiesUsed() { void springCloudStarterParentBomCanBeImportedAndUsedForDependencyManagement() { this.gradleBuild.runner().withArguments("managedVersions").build(); assertThat(readLines("managed-versions.txt")) - .contains("org.springframework.cloud:spring-cloud-starter-eureka-server -> 1.0.0.M3"); + .contains("org.springframework.cloud:spring-cloud-starter-eureka-server -> 1.0.0.M3"); } @Test @@ -352,7 +352,7 @@ void managedVersionsOfAConfigurationCanBeAccessed() { void dependencyWithAMissingComponentInItsStringIdentifierProducesAHelpfulError() { String output = this.gradleBuild.runner().withArguments("build").buildAndFail().getOutput(); assertThat(output) - .contains("Dependency identifier 'a:1.0' is malformed. The required form is 'group:name:version'"); + .contains("Dependency identifier 'a:1.0' is malformed. The required form is 'group:name:version'"); } @Test @@ -365,7 +365,7 @@ void dependencyWithAMissingComponentInItsMapIdentifierProducesAHelpfulError() { void dynamicVersionIsNotAddedToDependencyManagement() { this.gradleBuild.runner().withArguments("managedVersions").build(); assertThat(readLines("managed-versions.txt")) - .noneMatch((line) -> line.startsWith("commons-logging:commons-logging ->")); + .noneMatch((line) -> line.startsWith("commons-logging:commons-logging ->")); } @Test @@ -501,8 +501,8 @@ private void writeLines(Path path, String... lines) { private List readLines(String filename) { try { - return Files.readAllLines( - this.gradleBuild.runner().getProjectDir().toPath().resolve(Paths.get("build", filename))); + return Files + .readAllLines(this.gradleBuild.runner().getProjectDir().toPath().resolve(Paths.get("build", filename))); } catch (IOException ex) { throw new RuntimeException(ex); diff --git a/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginTests.java b/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginTests.java index 14fd4d9..c5a5abf 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/DependencyManagementPluginTests.java @@ -54,7 +54,7 @@ void whenPluginIsAppliedThenDependencyManagementExtensionIsAdded() { void whenPluginIsAppliedThenPomConfigurerIsAvailable() { this.project.getPlugins().apply(DependencyManagementPlugin.class); assertThat(this.project.getExtensions().findByType(DependencyManagementExtension.class).getPomConfigurer()) - .isNotNull(); + .isNotNull(); } @Test diff --git a/src/test/java/io/spring/gradle/dependencymanagement/GradleBuild.java b/src/test/java/io/spring/gradle/dependencymanagement/GradleBuild.java index 54c592f..6fba335 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/GradleBuild.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/GradleBuild.java @@ -52,8 +52,10 @@ public void beforeEach(ExtensionContext context) throws Exception { Store store = context.getStore(Namespace.create(GradleBuild.class)); Project project = new Project(); store.put("project", project); - this.runner = GradleRunner.create().withPluginClasspath().withProjectDir(project.dir.toFile()) - .withArguments("-PmavenRepo=" + new File("src/test/resources/maven-repo").getAbsolutePath()); + this.runner = GradleRunner.create() + .withPluginClasspath() + .withProjectDir(project.dir.toFile()) + .withArguments("-PmavenRepo=" + new File("src/test/resources/maven-repo").getAbsolutePath()); Class testClass = context.getRequiredTestClass(); String methodName = context.getRequiredTestMethod().getName(); InputStream input = testClass.getResourceAsStream(initials(testClass) + "/" + methodName + ".gradle"); diff --git a/src/test/java/io/spring/gradle/dependencymanagement/GradleVersionCompatibilityIntegrationTests.java b/src/test/java/io/spring/gradle/dependencymanagement/GradleVersionCompatibilityIntegrationTests.java index cbc4caa..e00450d 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/GradleVersionCompatibilityIntegrationTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/GradleVersionCompatibilityIntegrationTests.java @@ -41,8 +41,10 @@ class GradleVersionCompatibilityIntegrationTests { @ParameterizedTest(name = "Gradle {0}") @MethodSource("gradleVersions") void pluginIsCompatible(String gradleVersion) { - BuildResult result = this.gradleBuild.runner().withGradleVersion(gradleVersion).withArguments("resolve") - .build(); + BuildResult result = this.gradleBuild.runner() + .withGradleVersion(gradleVersion) + .withArguments("resolve") + .build(); assertThat(result.task(":resolve").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); } diff --git a/src/test/java/io/spring/gradle/dependencymanagement/MavenPublishPluginIntegrationTests.java b/src/test/java/io/spring/gradle/dependencymanagement/MavenPublishPluginIntegrationTests.java index 34b4362..c8aa134 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/MavenPublishPluginIntegrationTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/MavenPublishPluginIntegrationTests.java @@ -53,8 +53,10 @@ void usingImportedPropertiesDoesNotPreventFurtherConfigurationOfThePublishingExt } private NodeAssert generatedPom() { - return new NodeAssert(this.gradleBuild.runner().getProjectDir().toPath() - .resolve(Paths.get("build", "publications", "mavenJava", "pom-default.xml"))); + return new NodeAssert(this.gradleBuild.runner() + .getProjectDir() + .toPath() + .resolve(Paths.get("build", "publications", "mavenJava", "pom-default.xml"))); } } diff --git a/src/test/java/io/spring/gradle/dependencymanagement/NodeAssert.java b/src/test/java/io/spring/gradle/dependencymanagement/NodeAssert.java index db5bed2..942ed7f 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/NodeAssert.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/NodeAssert.java @@ -73,7 +73,7 @@ private static Document read(Path xmlFile) { private static Document read(String xmlContent) { try { return FACTORY.newDocumentBuilder() - .parse(new ByteArrayInputStream(xmlContent.getBytes(StandardCharsets.UTF_8))); + .parse(new ByteArrayInputStream(xmlContent.getBytes(StandardCharsets.UTF_8))); } catch (Exception ex) { throw new RuntimeException(ex); diff --git a/src/test/java/io/spring/gradle/dependencymanagement/internal/StandardPomDependencyManagementConfigurerTests.java b/src/test/java/io/spring/gradle/dependencymanagement/internal/StandardPomDependencyManagementConfigurerTests.java index de6f791..49ef536 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/internal/StandardPomDependencyManagementConfigurerTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/internal/StandardPomDependencyManagementConfigurerTests.java @@ -63,11 +63,11 @@ void anImportedBomIsImportedInThePom() throws Exception { new MapPropertySource(Collections.emptyMap())); NodeAssert pom = configuredPom(); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/groupId") - .isEqualTo("io.spring.platform"); + .isEqualTo("io.spring.platform"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/artifactId") - .isEqualTo("platform-bom"); + .isEqualTo("platform-bom"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/version") - .isEqualTo("1.0.3.RELEASE"); + .isEqualTo("1.0.3.RELEASE"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/scope").isEqualTo("import"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/type").isEqualTo("pom"); } @@ -75,29 +75,29 @@ void anImportedBomIsImportedInThePom() throws Exception { @Test void multipleImportsAreImportedInTheOppositeOrderToWhichTheyWereImported() throws Exception { this.project.getRepositories() - .maven((repository) -> repository.setUrl(new File("src/test/resources/maven-repo").getAbsoluteFile())); + .maven((repository) -> repository.setUrl(new File("src/test/resources/maven-repo").getAbsoluteFile())); this.dependencyManagement.importBom(null, new Coordinates("test", "bravo-pom-customization-bom", "1.0"), new MapPropertySource(Collections.emptyMap())); this.dependencyManagement.importBom(null, new Coordinates("test", "alpha-pom-customization-bom", "1.0"), new MapPropertySource(Collections.emptyMap())); NodeAssert pom = configuredPom(); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/groupId") - .isEqualTo("test"); + .isEqualTo("test"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/artifactId") - .isEqualTo("alpha-pom-customization-bom"); + .isEqualTo("alpha-pom-customization-bom"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/version") - .isEqualTo("1.0"); + .isEqualTo("1.0"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/scope") - .isEqualTo("import"); + .isEqualTo("import"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/type").isEqualTo("pom"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/groupId") - .isEqualTo("test"); + .isEqualTo("test"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/artifactId") - .isEqualTo("bravo-pom-customization-bom"); + .isEqualTo("bravo-pom-customization-bom"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/version") - .isEqualTo("1.0"); + .isEqualTo("1.0"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/scope") - .isEqualTo("import"); + .isEqualTo("import"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/type").isEqualTo("pom"); } @@ -118,11 +118,11 @@ void individualDependencyManagementIsAddedToThePom() throws Exception { Collections.emptyList()); NodeAssert pom = configuredPom(); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/groupId") - .isEqualTo("org.springframework"); + .isEqualTo("org.springframework"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/artifactId") - .isEqualTo("spring-core"); + .isEqualTo("spring-core"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/version") - .isEqualTo("4.1.3.RELEASE"); + .isEqualTo("4.1.3.RELEASE"); assertThat(pom).nodeAtPath("//project/dependencyManagement/dependencies/dependency/scope").isNull(); assertThat(pom).nodeAtPath("//project/dependencyManagement/dependencies/dependency/type").isNull(); } @@ -136,11 +136,11 @@ void dependencyManagementCanBeAddedToAPomWithExistingDependencyManagement() thro ""); assertThat(pom).nodesAtPath("//project/dependencyManagement/dependencies/dependency").hasSize(1); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/groupId") - .isEqualTo("io.spring.platform"); + .isEqualTo("io.spring.platform"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/artifactId") - .isEqualTo("platform-bom"); + .isEqualTo("platform-bom"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/version") - .isEqualTo("1.0.3.RELEASE"); + .isEqualTo("1.0.3.RELEASE"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/scope").isEqualTo("import"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/type").isEqualTo("pom"); } @@ -148,22 +148,22 @@ void dependencyManagementCanBeAddedToAPomWithExistingDependencyManagement() thro @Test void dependencyManagementExclusionsAreAddedToThePom() throws Exception { this.dependencyManagement.addManagedVersion(null, "org.springframework", "spring-core", "4.1.3.RELEASE", Arrays - .asList(new Exclusion("commons-logging", "commons-logging"), new Exclusion("com.example", "example"))); + .asList(new Exclusion("commons-logging", "commons-logging"), new Exclusion("com.example", "example"))); NodeAssert pom = configuredPom(); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/groupId") - .isEqualTo("org.springframework"); + .isEqualTo("org.springframework"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/artifactId") - .isEqualTo("spring-core"); + .isEqualTo("spring-core"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency/version") - .isEqualTo("4.1.3.RELEASE"); + .isEqualTo("4.1.3.RELEASE"); assertThat(pom).nodeAtPath("//project/dependencyManagement/dependencies/dependency/scope").isNull(); assertThat(pom).nodeAtPath("//project/dependencyManagement/dependencies/dependency/type").isNull(); assertThat(pom).textAtPath( "//project/dependencyManagement/dependencies/dependency/exclusions/exclusion[groupId/text() = 'commons-logging']/artifactId") - .isEqualTo("commons-logging"); + .isEqualTo("commons-logging"); assertThat(pom).textAtPath( "//project/dependencyManagement/dependencies/dependency/exclusions/exclusion[groupId/text() = 'com.example']/artifactId") - .isEqualTo("example"); + .isEqualTo("example"); } @Test @@ -176,18 +176,18 @@ void overridingAVersionPropertyResultsInDependencyOverridesInPom() throws Except assertThat(pom).nodesAtPath("//project/dependencyManagement/dependencies/dependency").hasSize(21); for (int i = 1; i < 21; i++) { assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[" + i + "]/groupId") - .isEqualTo("org.springframework"); + .isEqualTo("org.springframework"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[" + i + "]/version") - .isEqualTo("4.3.5.RELEASE"); + .isEqualTo("4.3.5.RELEASE"); } assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[21]/groupId") - .isEqualTo("org.springframework.boot"); + .isEqualTo("org.springframework.boot"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[21]/artifactId") - .isEqualTo("spring-boot-dependencies"); + .isEqualTo("spring-boot-dependencies"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[21]/version") - .isEqualTo("1.5.9.RELEASE"); + .isEqualTo("1.5.9.RELEASE"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[21]/scope") - .isEqualTo("import"); + .isEqualTo("import"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[21]/type").isEqualTo("pom"); } @@ -202,21 +202,21 @@ void whenAVersionOverrideResultsInABomWithManagementOfANewDependencyItsManagemen assertThat(pom).nodesAtPath("//project/dependencyManagement/dependencies/dependency").hasSize(22); for (int i = 1; i < 22; i++) { assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[" + i + "]/groupId") - .isEqualTo("org.springframework"); + .isEqualTo("org.springframework"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[" + i + "]/version") - .isEqualTo("5.0.2.RELEASE"); + .isEqualTo("5.0.2.RELEASE"); } assertThat(pom).nodeAtPath( "//project/dependencyManagement/dependencies/dependency[artifactId/text() = 'spring-context-indexer']") - .isNotNull(); + .isNotNull(); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[22]/groupId") - .isEqualTo("org.springframework.boot"); + .isEqualTo("org.springframework.boot"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[22]/artifactId") - .isEqualTo("spring-boot-dependencies"); + .isEqualTo("spring-boot-dependencies"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[22]/version") - .isEqualTo("1.5.9.RELEASE"); + .isEqualTo("1.5.9.RELEASE"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[22]/scope") - .isEqualTo("import"); + .isEqualTo("import"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[22]/type").isEqualTo("pom"); } @@ -224,7 +224,7 @@ void whenAVersionOverrideResultsInABomWithManagementOfANewDependencyItsManagemen void whenAnImportedBomOverridesDependencyManagementFromAnotherImportedBomAnExplicitOverrideIsNotAdded() throws Exception { this.project.getRepositories() - .maven((repository) -> repository.setUrl(new File("src/test/resources/maven-repo").getAbsoluteFile())); + .maven((repository) -> repository.setUrl(new File("src/test/resources/maven-repo").getAbsoluteFile())); this.dependencyManagement.importBom(null, new Coordinates("test", "first-alpha-dependency-management", "1.0"), new MapPropertySource(Collections.emptyMap())); this.dependencyManagement.importBom(null, new Coordinates("test", "second-alpha-dependency-management", "1.0"), @@ -241,20 +241,20 @@ void dependencyManagementIsExpandedToCoverDependenciesWithAClassifier() throws E "org.apache.logging.log4jlog4j-coretest"); assertThat(pom).nodesAtPath("//project/dependencyManagement/dependencies/dependency").hasSize(2); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/groupId") - .isEqualTo("org.apache.logging.log4j"); + .isEqualTo("org.apache.logging.log4j"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/artifactId") - .isEqualTo("log4j-core"); + .isEqualTo("log4j-core"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[1]/version") - .isEqualTo("2.6"); + .isEqualTo("2.6"); assertThat(pom).nodeAtPath("//project/dependencyManagement/dependencies/dependency[1]/classifier").isNull(); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/groupId") - .isEqualTo("org.apache.logging.log4j"); + .isEqualTo("org.apache.logging.log4j"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/artifactId") - .isEqualTo("log4j-core"); + .isEqualTo("log4j-core"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/version") - .isEqualTo("2.6"); + .isEqualTo("2.6"); assertThat(pom).textAtPath("//project/dependencyManagement/dependencies/dependency[2]/classifier") - .isEqualTo("test"); + .isEqualTo("test"); } private NodeAssert configuredPom() throws Exception { @@ -272,7 +272,8 @@ private NodeAssert configuredPom(PomCustomizationSettings settings) throws Excep private NodeAssert configuredPom(String existingPom, PomCustomizationSettings settings) throws Exception { Node pom = new XmlParser().parseText(existingPom); new StandardPomDependencyManagementConfigurer(this.dependencyManagement.getGlobalDependencyManagement(), - settings, this.pomResolver, this.project).configurePom(pom); + settings, this.pomResolver, this.project) + .configurePom(pom); return new NodeAssert(XmlUtil.serialize(pom)); } diff --git a/src/test/java/io/spring/gradle/dependencymanagement/internal/dsl/StandardDependenciesHandlerTests.java b/src/test/java/io/spring/gradle/dependencymanagement/internal/dsl/StandardDependenciesHandlerTests.java index fc19b97..2898825 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/internal/dsl/StandardDependenciesHandlerTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/internal/dsl/StandardDependenciesHandlerTests.java @@ -56,8 +56,8 @@ void dependencyCanBeConfiguredUseAMapWithGStringValues() { dependencyId.put("name", gstring("example")); dependencyId.put("version", gstring("1.0")); this.handler.dependency(dependencyId); - then(this.container).should().addManagedVersion(this.configuration, "com.example", "example", "1.0", - Collections.emptyList()); + then(this.container).should() + .addManagedVersion(this.configuration, "com.example", "example", "1.0", Collections.emptyList()); } @Test @@ -80,8 +80,8 @@ void dependencySetCanBeConfiguredUseAMapWithGStringValues() { dependencyId.put("name", gstring("example")); dependencyId.put("version", gstring("1.0")); this.handler.dependency(dependencyId); - then(this.container).should().addManagedVersion(this.configuration, "com.example", "example", "1.0", - Collections.emptyList()); + then(this.container).should() + .addManagedVersion(this.configuration, "com.example", "example", "1.0", Collections.emptyList()); } @Test @@ -119,7 +119,7 @@ void anExclusionUsingAStringInTheWrongFormatIsRejected() { } catch (Exception ex) { assertThat(ex.getMessage()) - .isEqualTo("Exclusion 'malformed' is malformed. The required form is 'group:name'"); + .isEqualTo("Exclusion 'malformed' is malformed. The required form is 'group:name'"); } } diff --git a/src/test/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolverTests.java b/src/test/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolverTests.java index ac0fe77..2ddc231 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolverTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/internal/maven/MavenPomResolverTests.java @@ -48,7 +48,7 @@ class MavenPomResolverTests { MavenPomResolverTests() { this.project.getRepositories().mavenCentral(); this.project.getRepositories() - .maven((repository) -> repository.setUrl(new File("src/test/resources/maven-repo").getAbsoluteFile())); + .maven((repository) -> repository.setUrl(new File("src/test/resources/maven-repo").getAbsoluteFile())); } @Test diff --git a/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportRendererTests.java b/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportRendererTests.java index 02803e7..111cdad 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportRendererTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportRendererTests.java @@ -57,8 +57,10 @@ void projectHeaderForRootProject() { @Test void projectHeaderForSubproject() { - Project subproject = ProjectBuilder.builder().withParent(ProjectBuilder.builder().build()).withName("alpha") - .build(); + Project subproject = ProjectBuilder.builder() + .withParent(ProjectBuilder.builder().build()) + .withName("alpha") + .build(); this.renderer.startProject(subproject); assertThat(outputLines()).containsExactly("", "------------------------------------------------------------", "Project :alpha", "------------------------------------------------------------", ""); @@ -66,8 +68,10 @@ void projectHeaderForSubproject() { @Test void projectHeaderForSubprojectWithDescription() { - Project subproject = ProjectBuilder.builder().withParent(ProjectBuilder.builder().build()).withName("alpha") - .build(); + Project subproject = ProjectBuilder.builder() + .withParent(ProjectBuilder.builder().build()) + .withName("alpha") + .build(); subproject.setDescription("description of alpha project"); this.renderer.startProject(subproject); assertThat(outputLines()).containsExactly("", "------------------------------------------------------------", diff --git a/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTaskTests.java b/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTaskTests.java index 7be8b67..861e925 100644 --- a/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTaskTests.java +++ b/src/test/java/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTaskTests.java @@ -40,8 +40,8 @@ class DependencyManagementReportTaskTests { private final Project project = ProjectBuilder.builder().build(); - private final DependencyManagementReportTask task = this.project.getTasks().create("dependencyManagement", - DependencyManagementReportTask.class); + private final DependencyManagementReportTask task = this.project.getTasks() + .create("dependencyManagement", DependencyManagementReportTask.class); private final DependencyManagementReportRenderer renderer = mock(DependencyManagementReportRenderer.class); @@ -68,10 +68,10 @@ void reportForProjectWithConfigurations() { this.task.report(); then(this.renderer).should().startProject(this.project); then(this.renderer).should().renderGlobalManagedVersions(any(Map.class)); - then(this.renderer).should().renderConfigurationManagedVersions(any(Map.class), eq(configurationTwo), - any(Map.class)); - then(this.renderer).should().renderConfigurationManagedVersions(any(Map.class), eq(configurationOne), - any(Map.class)); + then(this.renderer).should() + .renderConfigurationManagedVersions(any(Map.class), eq(configurationTwo), any(Map.class)); + then(this.renderer).should() + .renderConfigurationManagedVersions(any(Map.class), eq(configurationOne), any(Map.class)); then(this.renderer).shouldHaveNoMoreInteractions(); }