You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2013/10/20 14:23:20 UTC
[4/4] git commit: JCLOUDS-352: Drops support for "-incubating"
release versions
JCLOUDS-352: Drops support for "-incubating" release versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/918d04d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/918d04d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/918d04d7
Branch: refs/heads/no-more-incubating
Commit: 918d04d75dc0c0da9b2decca79c7d201e375d2b8
Parents: 32b3385
Author: Andrew Phillips <an...@apache.org>
Authored: Thu Oct 17 19:28:12 2013 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Sun Oct 20 08:22:13 2013 -0400
----------------------------------------------------------------------
.../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/incubator-jclouds/blob/918d04d7/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/incubator-jclouds/blob/918d04d7/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");