IGNITE-1270 Update version number of OSGi modules to 1.5.0-b1-SNAPSHOT. Adjust test that assumed major.minor.micro to take into account qualifier.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ba911f0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ba911f0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ba911f0 Branch: refs/heads/ignite-843-rc2 Commit: 4ba911f0a4dfbfffd8bef019dcbaa284c5d98bf3 Parents: 96e0802 Author: Raul Kripalani <ra...@apache.org> Authored: Thu Dec 3 14:46:23 2015 +0000 Committer: Raul Kripalani <ra...@apache.org> Committed: Thu Dec 3 15:00:58 2015 +0000 ---------------------------------------------------------------------- modules/osgi-karaf/pom.xml | 3 +-- modules/osgi-paxlogging/pom.xml | 3 +-- modules/osgi/pom.xml | 2 +- .../apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/modules/osgi-karaf/pom.xml b/modules/osgi-karaf/pom.xml index f1ac66b..e1f53e2 100644 --- a/modules/osgi-karaf/pom.xml +++ b/modules/osgi-karaf/pom.xml @@ -31,9 +31,8 @@ <relativePath>../../parent</relativePath> </parent> - <groupId>org.apache.ignite</groupId> <artifactId>ignite-osgi-karaf</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.0-b1-SNAPSHOT</version> <packaging>pom</packaging> <build> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi-paxlogging/pom.xml ---------------------------------------------------------------------- diff --git a/modules/osgi-paxlogging/pom.xml b/modules/osgi-paxlogging/pom.xml index bd9e18e..15a5e0c 100644 --- a/modules/osgi-paxlogging/pom.xml +++ b/modules/osgi-paxlogging/pom.xml @@ -32,9 +32,8 @@ <relativePath>../../parent</relativePath> </parent> - <groupId>org.apache.ignite</groupId> <artifactId>ignite-osgi-paxlogging</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.0-b1-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml index d6d46bf..47c7928 100644 --- a/modules/osgi/pom.xml +++ b/modules/osgi/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>ignite-osgi</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.0-b1-SNAPSHOT</version> <url>http://ignite.apache.org</url> <dependencies> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java index c0eb06b..112a607 100644 --- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java +++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java @@ -87,7 +87,7 @@ public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest f.getName(), installed)); assertTrue(installed); - assertEquals(PROJECT_VERSION.replaceAll("-", "."), f.getVersion()); + assertEquals(PROJECT_VERSION.replaceAll("-", "."), f.getVersion().replaceAll("-", ".")); } }