JCLOUDS-352: Drops support for "-incubating" release versions
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/02983187 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/02983187 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/02983187 Branch: refs/heads/1.6.x Commit: 02983187902d364011f482426dccc8f97194a9bb Parents: 3b8c389 Author: Andrew Phillips <[email protected]> Authored: Thu Oct 17 19:28:12 2013 -0400 Committer: Andrew Phillips <[email protected]> Committed: Wed Nov 6 22:34:09 2013 -0500 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/JcloudsVersion.java | 7 +++---- .../test/java/org/jclouds/JcloudsVersionTest.java | 18 ++++++------------ 2 files changed, 9 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/02983187/core/src/main/java/org/jclouds/JcloudsVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/JcloudsVersion.java b/core/src/main/java/org/jclouds/JcloudsVersion.java index f23118e..c5fa1d5 100644 --- a/core/src/main/java/org/jclouds/JcloudsVersion.java +++ b/core/src/main/java/org/jclouds/JcloudsVersion.java @@ -39,12 +39,11 @@ public class JcloudsVersion { private static final String VERSION_PROPERTY_NAME = "version"; /* - * x.y.z or x.y.z-incubating or x.y.z-alpha.n or x.y.z-beta.n or x.y.z-rc.n or x.y.z-SNAPSHOT - - * see http://semver.org. Note that x.y.z-incubating does *not* meet the - * semver criteria for a *release* version. + * x.y.z or x.y.z-alpha.n or x.y.z-beta.n or x.y.z-rc.n or x.y.z-SNAPSHOT - + * see http://semver.org. */ private static final Pattern SEMANTIC_VERSION_PATTERN = - Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(?:-(alpha|beta|rc)\\.(\\d+)|-incubating|-SNAPSHOT)?"); + Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(?:-(alpha|beta|rc)\\.(\\d+)|-SNAPSHOT)?"); private static final String ALPHA_VERSION_IDENTIFIER = "alpha"; private static final String BETA_VERSION_IDENTIFIER = "beta"; http://git-wip-us.apache.org/repos/asf/jclouds/blob/02983187/core/src/test/java/org/jclouds/JcloudsVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/JcloudsVersionTest.java b/core/src/test/java/org/jclouds/JcloudsVersionTest.java index dc2c973..027d117 100644 --- a/core/src/test/java/org/jclouds/JcloudsVersionTest.java +++ b/core/src/test/java/org/jclouds/JcloudsVersionTest.java @@ -54,6 +54,12 @@ public class JcloudsVersionTest { } @Test(expectedExceptions = { IllegalArgumentException.class }) + public void testFailsIfIncubating() { + // no longer supported after graduation from the Apache Incubator + new JcloudsVersion("1.2.3-incubating"); + } + + @Test(expectedExceptions = { IllegalArgumentException.class }) public void testFailsIfAlphaSnapshot() { new JcloudsVersion("1.2.3-alpha.5-SNAPSHOT"); } @@ -116,18 +122,6 @@ public class JcloudsVersionTest { } @Test - public void testSupportsIncubatingReleaseVersion() { - // *not* a semver-compliant release version! - JcloudsVersion version = new JcloudsVersion("1.2.3-incubating"); - assertFalse(version.alpha, "Expected non-alpha"); - assertFalse(version.beta, "Expected non-beta"); - assertFalse(version.releaseCandidate, "Expected non-release candidate"); - assertNull(version.alphaVersion); - assertNull(version.betaVersion); - assertNull(version.releaseCandidateVersion); - } - - @Test public void testRecognisesAlpha() { JcloudsVersion version = new JcloudsVersion("1.2.3-alpha.5"); assertTrue(version.alpha, "Expected alpha");
