[PAXSB-49] Do not hardcode own module versions

Dependency versions changed to ${project.version}. POM cleanup to fix m2e warnings.
vivosys · Dec 26, 2011 · 1cba5e7 · 1cba5e7
1 parent 257bebb
commit 1cba5e7
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 16 deletions.
diff --git a/pax-swissbox-bnd/pom.xml b/pax-swissbox-bnd/pom.xml
@@ -11,7 +11,6 @@
 
     <groupId>org.ops4j.pax.swissbox</groupId>
     <artifactId>pax-swissbox-bnd</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>OPS4J Pax Swissbox :: Bnd Utils</name>
@@ -54,7 +53,7 @@
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-optional-jcl</artifactId>
             <scope>provided</scope>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->

diff --git a/pax-swissbox-core/pom.xml b/pax-swissbox-core/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-lifecycle</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.base</groupId>

diff --git a/pax-swissbox-extender/pom.xml b/pax-swissbox-extender/pom.xml
@@ -11,7 +11,6 @@
 
   <groupId>org.ops4j.pax.swissbox</groupId>
   <artifactId>pax-swissbox-extender</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>OPS4J Pax Swissbox :: Extender</name>
@@ -38,12 +37,12 @@
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-lifecycle</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-optional-jcl</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.base</groupId>

diff --git a/pax-swissbox-framework/pom.xml b/pax-swissbox-framework/pom.xml
@@ -9,7 +9,11 @@
     </parent>
     <groupId>org.ops4j.pax.swissbox</groupId>
     <artifactId>pax-swissbox-framework</artifactId>
-    <name>Pax Swissbox Framework Helpers</name>
+
+    <!-- not a bundle, this module is about launching OSGi frameworks from vanilla Java -->
+    <packaging>jar</packaging>
+
+    <name>OPS4J Pax Swissbox :: Framework Helpers</name>
     <dependencies>
         <dependency>
             <groupId>org.ops4j.base</groupId>

diff --git a/pax-swissbox-lifecycle/pom.xml b/pax-swissbox-lifecycle/pom.xml
@@ -11,7 +11,6 @@
 
   <groupId>org.ops4j.pax.swissbox</groupId>
   <artifactId>pax-swissbox-lifecycle</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>OPS4J Pax Swissbox :: Lifecycle</name>

diff --git a/pax-swissbox-optional-jcl/pom.xml b/pax-swissbox-optional-jcl/pom.xml
@@ -11,7 +11,6 @@
 
   <groupId>org.ops4j.pax.swissbox</groupId>
   <artifactId>pax-swissbox-optional-jcl</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>OPS4J Pax Swissbox :: Optional JCL</name>

diff --git a/pax-swissbox-property/pom.xml b/pax-swissbox-property/pom.xml
@@ -11,7 +11,6 @@
 
   <groupId>org.ops4j.pax.swissbox</groupId>
   <artifactId>pax-swissbox-property</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>OPS4J Pax Swissbox :: Property</name>

diff --git a/pax-swissbox-tracker/pom.xml b/pax-swissbox-tracker/pom.xml
@@ -11,7 +11,6 @@
 
   <groupId>org.ops4j.pax.swissbox</groupId>
   <artifactId>pax-swissbox-tracker</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>OPS4J Pax Swissbox :: Tracker</name>
@@ -38,12 +37,12 @@
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-lifecycle</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-optional-jcl</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.base</groupId>

diff --git a/samples/manifest-extender/pom.xml b/samples/manifest-extender/pom.xml
@@ -12,7 +12,6 @@
 
   <groupId>org.ops4j.pax.swissbox.samples</groupId>
   <artifactId>samples-manifest-extender</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>OPS4J Pax Swissbox :: Samples :: Manifest Extender</name>
@@ -38,14 +37,14 @@
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-optional-jcl</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-extender</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>