From 6aeedd7c42507c8b8038c8eaa730626cde90f191 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 2 Oct 2017 09:39:37 +0200 Subject: [PATCH] #64 - Improved logging for managed dependency upgrades. --- .../data/release/build/MavenBuildSystem.java | 18 +++++++++++++++--- .../data/release/build/Pom.java | 3 +++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java index 804ac9e..21e286c 100644 --- a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java +++ b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java @@ -135,10 +135,22 @@ class MavenBuildSystem implements BuildSystem { logger.log(BUILD, "%s", module); - pom.setDependencyManagementVersion(new MavenArtifact(module).getArtifactId(), version); + String moduleArtifactId = new MavenArtifact(module).getArtifactId(); + pom.setDependencyManagementVersion(moduleArtifactId, version); + logger.log(BUILD, "Updated managed dependency version for %s to %s!", moduleArtifactId, version); - module.getProject().doWithAdditionalArtifacts( - additionalArtifact -> pom.setDependencyManagementVersion(additionalArtifact.getArtifactId(), version)); + module.getProject().doWithAdditionalArtifacts(additionalArtifact -> { + + String artifactId = additionalArtifact.getArtifactId(); + Artifact artifact = pom.getManagedDependency(artifactId); + + if (artifact != null) { + pom.setDependencyManagementVersion(artifactId, version); + logger.log(BUILD, "Updated managed dependency version for %s to %s!", artifactId, version); + } else { + logger.log(BUILD, "Artifact %s not found, skipping update!", artifactId); + } + }); } if (updateInformation.getPhase().equals(Phase.PREPARE)) { diff --git a/release-tools/src/main/java/org/springframework/data/release/build/Pom.java b/release-tools/src/main/java/org/springframework/data/release/build/Pom.java index 2e923ea..bd8cc5b 100644 --- a/release-tools/src/main/java/org/springframework/data/release/build/Pom.java +++ b/release-tools/src/main/java/org/springframework/data/release/build/Pom.java @@ -66,6 +66,9 @@ public interface Pom { @XBWrite("/project/dependencyManagement/dependencies/dependency[artifactId=\"{0}\"]/version") Pom setDependencyManagementVersion(String artifactId, @XBValue ArtifactVersion version); + @XBRead("/project/dependencyManagement/dependencies/dependency[artifactId=\"{0}\"]") + Artifact getManagedDependency(String artifactId); + @XBRead("//dependency[substring(version, string-length(version) - string-length('-SNAPSHOT') + 1) = '-SNAPSHOT']") List getSnapshotDependencies();