Version.toRelease() is rolled buck because scm4j-releaser can not be build on master

Author: host6

src/main/java/org/scm4j/commons/Version.java

@@ -152,6 +152,13 @@ public Version toSnapshot() {
 		return new Version(toSnapshotString());
 	}
 
+	public Version toRelease() {
+		if (!isSemantic) {
+			return this;
+		}
+		return new Version(prefix + minor + (patch.isEmpty() ? "" : "." + patch));
+	}
+	
 	public String toReleaseString() {
 		return toRelease().toString();
 	}
@@ -195,10 +202,6 @@ public String getReleaseNoPatchString() {
 		return prefix + minor;
 	}
 
-	public String toReleaseString() {
-		return toRelease().toString();
-	}
-
 	public Version setMinor(String minor) {
 		if (!isSemantic) {
 			throw new IllegalStateException("can not set minor for non-semantic version");

src/test/java/org/scm4j/commons/VersionTest.java

@@ -31,12 +31,12 @@ public void testToString() {
 
 	@Test
 	public void testToReleaseString() {
-		assertEquals("11.21.31.0", new Version("11.21.31.41-SNAPSHOT").toReleaseString());
-		assertEquals("11.21.31.0", new Version("11.21.31.41").toReleaseString());
-		assertEquals("11.21.0", new Version("11.21.31").toReleaseString());
-		assertEquals("11.0", new Version("11.21").toReleaseString());
-		assertEquals("11", new Version("11-SNAPSHOT").toReleaseString());
-		assertEquals("-SNAPSHOT", new Version("-SNAPSHOT").toReleaseString());
+		assertEquals(new Version("11.21.31.41-SNAPSHOT").toReleaseString(), "11.21.31.41");
+		assertEquals(new Version("11.21.31.41").toReleaseString(), "11.21.31.41");
+		assertEquals(new Version("11.21.31").toReleaseString(), "11.21.31");
+		assertEquals(new Version("11.21").toReleaseString(), "11.21");
+		assertEquals(new Version("11-SNAPSHOT").toReleaseString(), "11");
+		assertEquals(new Version("-SNAPSHOT").toReleaseString(), "-SNAPSHOT");
 
 	}
 
@@ -50,12 +50,12 @@ public void testSnapshot() {
 
 	@Test
 	public void testMinorBumping() {
-		assertEquals("11.21.30.0", new Version("11.21.31.41").toPreviousMinor().toReleaseString());
-		assertEquals("11.21.30.0", new Version("11.21.31.41-SNAPSHOT").toPreviousMinor().toReleaseString());
-		assertEquals("11.21.32.0", new Version("11.21.31.41").toNextMinor().toReleaseString());
-		assertEquals("11.21.32.0", new Version("11.21.31.41-SNAPSHOT").toNextMinor().toReleaseString());
-		assertEquals("11.21.32.0", new Version("11.21.31.41").toNextMinor().toReleaseString());
-		assertEquals("11.21.32.41-SNAPSHOT", new Version("11.21.31.41-SNAPSHOT").toNextMinor().toString());
+		assertEquals(new Version("11.21.31.41").toPreviousMinor().toReleaseString(), "11.21.30.41");
+		assertEquals(new Version("11.21.31.41-SNAPSHOT").toPreviousMinor().toReleaseString(), "11.21.30.41");
+		assertEquals(new Version("11.21.31.41").toNextMinor().toReleaseString(), "11.21.32.41");
+		assertEquals(new Version("11.21.31.41-SNAPSHOT").toNextMinor().toReleaseString(), "11.21.32.41");
+		assertEquals(new Version("11.21.31.41").toNextMinor().toReleaseString(), "11.21.32.41");
+		assertEquals(new Version("11.21.31.41-SNAPSHOT").toNextMinor().toString(), "11.21.32.41-SNAPSHOT");
 		Version version = new Version("");
 		try {
 			version.toNextMinor();
@@ -151,10 +151,10 @@ public void testGetReleaseNoPatchString() {
 
 	@Test
 	public void testToRelease() {
-		assertEquals(new Version("11.21.31.0"), new Version("11.21.31.41-SNAPSHOT").toRelease());
-		assertEquals(new Version("11.21.31.0"), new Version("11.21.31.41").toRelease());
-		assertEquals(new Version("11.21.0"),  new Version("11.21.31").toRelease());
-		assertEquals(new Version("11.0"), new Version("11.21").toRelease());
+		assertEquals(new Version("11.21.31.41"), new Version("11.21.31.41-SNAPSHOT").toRelease());
+		assertEquals(new Version("11.21.31.41"), new Version("11.21.31.41").toRelease());
+		assertEquals(new Version("11.21.31"),  new Version("11.21.31").toRelease());
+		assertEquals(new Version("11.21"), new Version("11.21").toRelease());
 		assertEquals(new Version("11"), new Version("11-SNAPSHOT").toRelease());
 		assertEquals(new Version("-SNAPSHOT"), new Version("-SNAPSHOT").toRelease());
 	}