Merge pull request #35 from jglick/trailing-slash

Restore trailing slash after `a` or `b`
jenkinsci · Feb 9, 2023 · f724edc · f724edc
2 parents 8be1af4 + 1ab538d
commit f724edc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...sion/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java b/...sion/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java
@@ -173,7 +173,7 @@ public void afterSessionStart(MavenSession session) throws MavenExecutionExcepti
     }
 
     static String sanitize(String hash) {
-        return hash.replaceAll("[ab]", "$0_").replaceAll("_$", "");
+        return hash.replaceAll("[ab]", "$0_");
     }
 
     private static String summarize(RevCommit c) {

diff --git a/.../src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java b/.../src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java
@@ -56,7 +56,7 @@ public class MainTest {
     @Test public void alphaBetaTrailing() {
         String hash = "852b473a2bcb";
         String sanitized = Main.sanitize(hash);
-        assertThat(hash + " has been sanitized to the expected format", sanitized, is("852b_473a_2b_cb"));
+        assertThat(hash + " has been sanitized to the expected format", sanitized, is("852b_473a_2b_cb_"));
         String canonical = new ComparableVersion(sanitized).getCanonical();
         for (String prerelease : PRERELEASE) {
             assertThat(sanitized + " treated as a prerelease", canonical, not(containsString(prerelease)));