FELIX-4699: Build broken as old snapshots are referenced.
Now, the samples are using released 3.2.0 artifact versions, and the test is using current snapshot versions.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1639613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/samples.annotation/pom.xml b/dependencymanager/samples.annotation/pom.xml
index c3dac25..babe3c7 100644
--- a/dependencymanager/samples.annotation/pom.xml
+++ b/dependencymanager/samples.annotation/pom.xml
@@ -12,7 +12,7 @@
</properties>
<name>Apache Felix Dependency Manager Annotation Samples</name>
<artifactId>org.apache.felix.dependencymanager.samples.annotation</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -28,7 +28,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.0</version>
<executions>
<execution>
<goals>
diff --git a/dependencymanager/samples/pom.xml b/dependencymanager/samples/pom.xml
index f4ad9a6..44370b8 100644
--- a/dependencymanager/samples/pom.xml
+++ b/dependencymanager/samples/pom.xml
@@ -27,7 +27,7 @@
</properties>
<name>Apache Felix Dependency Manager Samples</name>
<artifactId>org.apache.felix.dependencymanager.samples</artifactId>
- <version>3.0.0</version>
+ <version>3.2.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/dependencymanager/test/pom.xml b/dependencymanager/test/pom.xml
index 82d8e6e..07d53bb 100644
--- a/dependencymanager/test/pom.xml
+++ b/dependencymanager/test/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>org.apache.felix.dependencymanager.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Felix Dependency Manager Integration Tests</name>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -174,7 +174,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<executions>
<execution>
<goals>
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
index db7e303..18fb633 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
@@ -147,9 +147,9 @@
mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime", "0.10.0"),
mavenBundle("org.apache.felix", "org.apache.felix.deploymentadmin", "0.9.0").start(false),
mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "1.0.0"),
- mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager","3.2.0-SNAPSHOT"),
- mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell", "3.2.0-SNAPSHOT"),
- mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.runtime", "3.2.0-SNAPSHOT"),
+ mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager","3.2.1-SNAPSHOT"),
+ mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell", "3.2.1-SNAPSHOT"),
+ mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.runtime", "3.2.1-SNAPSHOT"),
bundle(testBundleFile.toURI().toString()).start(m_startTestBundle));
final Option option = (paxRunnerVmOption != null) ? vmOption(paxRunnerVmOption) : null;
return OptionUtils.combine(base, option);