Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dropped support for non-semver compliant 'x.y.z-rc-n' RC versions

This commit is contained in:
Andrew Phillips 2012-01-16 13:26:33 -05:00
parent 2f2953c603
commit 6b1e8cee34
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/jclouds/JcloudsVersion.java
View File

@ -39,10 +39,9 @@ public class JcloudsVersion {
static final String VERSION_RESOURCE_FILE = "META-INF/maven/org.jclouds/jclouds-core/pom.properties"; static final String VERSION_RESOURCE_FILE = "META-INF/maven/org.jclouds/jclouds-core/pom.properties";
private static final String VERSION_PROPERTY_NAME = "version"; private static final String VERSION_PROPERTY_NAME = "version";
// TODO: stop supporting x.y.z-rc-n after the 1.3.0 release // x.y.z or x.y.z-rc.n, optionally with -SNAPSHOT suffix - see http://semver.org
// x.y.z or x.y.z-rc.n or x.y.z-rc-n, optionally with -SNAPSHOT suffix - see http://semver.org
private static final Pattern SEMANTIC_VERSION_PATTERN = private static final Pattern SEMANTIC_VERSION_PATTERN =
Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(?:-rc[-\\.](\\d+))?(?:-SNAPSHOT)?"); Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(?:-rc\\.(\\d+))?(?:-SNAPSHOT)?");
private static final JcloudsVersion INSTANCE = new JcloudsVersion(); private static final JcloudsVersion INSTANCE = new JcloudsVersion();

22
core/src/test/java/org/jclouds/JcloudsVersionTest.java
View File

@ -54,6 +54,12 @@ public class JcloudsVersionTest {
new JcloudsVersion("${project.version}"); new JcloudsVersion("${project.version}");
} }
@Test(expectedExceptions = { IllegalArgumentException.class })
public void testFailsIfNonSemverReleaseCandidate() {
// no longer supported after the 1.3.0 RC cycle
new JcloudsVersion("1.2.3-rc-4");
}
@Test @Test
public void testExtractsVersionFromResourceFile() { public void testExtractsVersionFromResourceFile() {
JcloudsVersion version = new JcloudsVersion(); JcloudsVersion version = new JcloudsVersion();
@ -93,29 +99,15 @@ public class JcloudsVersionTest {
assertTrue(version.releaseCandidate, "Expected release candidate"); assertTrue(version.releaseCandidate, "Expected release candidate");
} }
// TODO: remove once x.y.z-rc-n support is dropped after 1.3.0
@Test
public void testRecognisesNonSemverReleaseCandidate() {
JcloudsVersion version = new JcloudsVersion("1.2.3-rc-4");
assertTrue(version.releaseCandidate, "Expected release candidate");
}
@Test @Test
public void testExtractsReleaseCandidateVersion() { public void testExtractsReleaseCandidateVersion() {
JcloudsVersion version = new JcloudsVersion("1.2.3-rc.4"); JcloudsVersion version = new JcloudsVersion("1.2.3-rc.4");
assertEquals(Integer.valueOf(4), version.releaseCandidateVersion); assertEquals(Integer.valueOf(4), version.releaseCandidateVersion);
} }
// TODO: remove once x.y.z-rc-n support is dropped after 1.3.0
@Test
public void testExtractsNonSemverReleaseCandidateVersion() {
JcloudsVersion version = new JcloudsVersion("1.2.3-rc-4");
assertEquals(Integer.valueOf(4), version.releaseCandidateVersion);
}
@Test @Test
public void testRecognisesReleaseCandidateSnapshot() { public void testRecognisesReleaseCandidateSnapshot() {
JcloudsVersion version = new JcloudsVersion("1.2.3-rc-4-SNAPSHOT"); JcloudsVersion version = new JcloudsVersion("1.2.3-rc.4-SNAPSHOT");
assertTrue(version.releaseCandidate, "Expected release candidate"); assertTrue(version.releaseCandidate, "Expected release candidate");
assertTrue(version.snapshot, "Expected snapshot"); assertTrue(version.snapshot, "Expected snapshot");
} }