diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/ProjectPomUpdater.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/ProjectPomUpdater.java index f620734c..4f2451f5 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/ProjectPomUpdater.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/ProjectPomUpdater.java @@ -17,7 +17,6 @@ package org.springframework.cloud.release.internal.pom; import java.io.File; import java.io.IOException; -import java.lang.invoke.MethodHandles; import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; @@ -25,11 +24,8 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Scanner; -import org.apache.maven.model.Model; -import org.codehaus.plexus.util.xml.Xpp3Dom; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.release.internal.ReleaserProperties; @@ -40,8 +36,10 @@ import org.springframework.cloud.release.internal.git.ProjectGitHandler; */ public class ProjectPomUpdater { - private static final List IGNORED_SNAPSHOT_LINE_CHECKS = Arrays.asList( - "replace=" + private static final List IGNORED_SNAPSHOT_LINE_PATTERNS = Arrays.asList( + "^.*replace=.*$", + // issue [#80] + "^[\\s]*.*$" ); private static final Logger log = LoggerFactory.getLogger(ProjectPomUpdater.class); @@ -145,7 +143,7 @@ public class ProjectPomUpdater { String line = scanner.nextLine(); lineNumber++; boolean containsSnapshot = line.contains("SNAPSHOT") && - IGNORED_SNAPSHOT_LINE_CHECKS.stream().noneMatch(line::contains); + IGNORED_SNAPSHOT_LINE_PATTERNS.stream().noneMatch(line::matches); if (containsSnapshot) { throw new IllegalStateException("The file [" + path + "] contains a SNAPSHOT " + "version for a non snapshot release in line number [" + lineNumber + "]\n\n" + line); diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/PomUpdateAcceptanceTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/PomUpdateAcceptanceTests.java index ed58b530..2425d5c1 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/PomUpdateAcceptanceTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/PomUpdateAcceptanceTests.java @@ -67,7 +67,7 @@ public class PomUpdateAcceptanceTests { } @Test - public void should_update_fail_when_after_updating_a_release_version_there_still_is_a_snapshot_version() throws Exception { + public void should_not_fail_when_after_updating_a_release_version_there_still_is_a_snapshot_version() throws Exception { ReleaserProperties releaserProperties = branchReleaserProperties(); ProjectPomUpdater projectPomUpdater = new ProjectPomUpdater(releaserProperties); Projects projects = projectPomUpdater.retrieveVersionsFromSCRelease(); diff --git a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-sleuth-with-unmatched-property/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml b/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-sleuth-with-unmatched-property/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml index 977e07d4..af1ad015 100644 --- a/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-sleuth-with-unmatched-property/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml +++ b/spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-sleuth-with-unmatched-property/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml @@ -39,6 +39,15 @@ true + + + + + + + + + org.springframework.boot