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/18 01:29:04 UTC
[1/2] git commit: 'Bet' -> 'Beta' typo in test name
Updated Branches:
refs/heads/no-more-incubating [created] a69d216dc
'Bet' -> 'Beta' typo in test name
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/633f2d77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/633f2d77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/633f2d77
Branch: refs/heads/no-more-incubating
Commit: 633f2d77a338e7a897d5913d99dd14c28f77f907
Parents: 13f38d6
Author: Andrew Phillips <an...@apache.org>
Authored: Thu Oct 17 19:19:17 2013 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Thu Oct 17 19:19:17 2013 -0400
----------------------------------------------------------------------
core/src/test/java/org/jclouds/JcloudsVersionTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/633f2d77/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 320a19d..712c7ae 100644
--- a/core/src/test/java/org/jclouds/JcloudsVersionTest.java
+++ b/core/src/test/java/org/jclouds/JcloudsVersionTest.java
@@ -59,7 +59,7 @@ public class JcloudsVersionTest {
}
@Test(expectedExceptions = { IllegalArgumentException.class })
- public void testFailsIfBetSanapshot() {
+ public void testFailsIfBetaSanapshot() {
new JcloudsVersion("1.2.3-beta.5-SNAPSHOT");
}
[2/2] git commit: JCLOUDS-352: Drops support for "-incubating"
release versions
Posted by an...@apache.org.
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/a69d216d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/a69d216d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/a69d216d
Branch: refs/heads/no-more-incubating
Commit: a69d216dcb93fbeeedaf030e03b92462aa760219
Parents: 633f2d7
Author: Andrew Phillips <an...@apache.org>
Authored: Thu Oct 17 19:28:12 2013 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Thu Oct 17 19:28:12 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/a69d216d/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/a69d216d/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 712c7ae..990452a 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");