felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1610222 - in /felix/trunk/dependencymanager: annotation/pom.xml core/pom.xml runtime/pom.xml samples.annotation/pom.xml shell/pom.xml test/pom.xml test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
Date Sun, 13 Jul 2014 14:57:58 GMT
Author: pderop
Date: Sun Jul 13 14:57:58 2014
New Revision: 1610222

URL: http://svn.apache.org/r1610222
Log:
fixed artifacts version: core, shell, annotation, and runtime articacts are all using version
3.2.0-SNAPSHOT

Modified:
    felix/trunk/dependencymanager/annotation/pom.xml
    felix/trunk/dependencymanager/core/pom.xml
    felix/trunk/dependencymanager/runtime/pom.xml
    felix/trunk/dependencymanager/samples.annotation/pom.xml
    felix/trunk/dependencymanager/shell/pom.xml
    felix/trunk/dependencymanager/test/pom.xml
    felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java

Modified: felix/trunk/dependencymanager/annotation/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/pom.xml?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/pom.xml (original)
+++ felix/trunk/dependencymanager/annotation/pom.xml Sun Jul 13 14:57:58 2014
@@ -28,7 +28,7 @@
 	<name>Apache Felix Dependency Manager Annotation</name>
 	<description>Dependency Manager Annotation API and corresponding scanner plugins</description>
 	<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
     <scm>

Modified: felix/trunk/dependencymanager/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/pom.xml?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/pom.xml (original)
+++ felix/trunk/dependencymanager/core/pom.xml Sun Jul 13 14:57:58 2014
@@ -30,7 +30,7 @@
     </properties>
     <name>Apache Felix Dependency Manager</name>
     <artifactId>org.apache.felix.dependencymanager</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>

Modified: felix/trunk/dependencymanager/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/pom.xml?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/pom.xml (original)
+++ felix/trunk/dependencymanager/runtime/pom.xml Sun Jul 13 14:57:58 2014
@@ -27,7 +27,7 @@
     </properties>
     <name>Apache Felix Dependency Manager Runtime</name>
     <artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

Modified: felix/trunk/dependencymanager/samples.annotation/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/samples.annotation/pom.xml?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/samples.annotation/pom.xml (original)
+++ felix/trunk/dependencymanager/samples.annotation/pom.xml Sun Jul 13 14:57:58 2014
@@ -12,7 +12,7 @@
     </properties>
     <name>Apache Felix Dependency Manager Annotation Samples</name>
     <artifactId>org.apache.felix.dependencymanager.samples.annotation</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.2.0-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.1.1-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</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.1.1-SNAPSHOT</version>
+                <version>3.2.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: felix/trunk/dependencymanager/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/pom.xml?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/pom.xml (original)
+++ felix/trunk/dependencymanager/shell/pom.xml Sun Jul 13 14:57:58 2014
@@ -30,7 +30,7 @@
     </properties>
     <name>Apache Felix Dependency Manager Shell</name>
     <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <scm>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: felix/trunk/dependencymanager/test/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/pom.xml?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/pom.xml (original)
+++ felix/trunk/dependencymanager/test/pom.xml Sun Jul 13 14:57:58 2014
@@ -25,7 +25,7 @@
 	</parent>
 
 	<artifactId>org.apache.felix.dependencymanager.test</artifactId>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.2.0-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.1.1-SNAPSHOT</version>
+			<version>3.2.0-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.1.1-SNAPSHOT</version>
+			<version>3.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -149,7 +149,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.5.0</version>
+				<version>2.3.7</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
@@ -174,7 +174,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
-				<version>3.1.1-SNAPSHOT</version>
+				<version>3.2.0-SNAPSHOT</version>
 				<executions>
 					<execution>
 						<goals>

Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java?rev=1610222&r1=1610221&r2=1610222&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
(original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
Sun Jul 13 14:57:58 2014
@@ -72,7 +72,7 @@ public abstract class TestBase implement
     protected static final String TESTBUNDLE_FILE = "project.bundle.file";
     
     // The default bundle jar file name
-    protected static final String TESTBUNDLE_FILE_DEF = "target/org.apache.felix.dependencymanager.test-3.0.1-SNAPSHOT.jar";
+    protected static final String TESTBUNDLE_FILE_DEF = "target/org.apache.felix.dependencymanager.test-3.2.0-SNAPSHOT.jar";
 
     // The name of the system property providing the test bundle symbolic name.
     protected static final String TESTBUNDLE_SN = "project.bundle.symbolicName";
@@ -147,9 +147,9 @@ public abstract class TestBase implement
                 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.1.1-SNAPSHOT"),
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell",
"3.0.2-SNAPSHOT"),
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.runtime",
"3.1.1-SNAPSHOT"),
+                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"),
                 bundle(testBundleFile.toURI().toString()).start(m_startTestBundle));
         final Option option = (paxRunnerVmOption != null) ? vmOption(paxRunnerVmOption) :
null;
         return OptionUtils.combine(base, option);



Mime
View raw message