You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/11/03 20:12:52 UTC

svn commit: r1030621 - in /servicemix/smx4/bundles/trunk: ./ ant-1.7.0/ aopalliance-1.0/ bundles-pom/ cglib-2.1_3/ commons-beanutils-1.8.2/ commons-collections-3.2.1/ commons-configuration-1.4/ commons-digester-1.8/ commons-io-1.4/ dozer-5.3.0/ drools-...

Author: gertv
Date: Wed Nov  3 19:12:51 2010
New Revision: 1030621

URL: http://svn.apache.org/viewvc?rev=1030621&view=rev
Log:
Prepare for release: Upgrade to released parent POM and fix Maven 3 warnings

Modified:
    servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml
    servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml
    servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
    servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml
    servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml
    servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml
    servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml
    servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml
    servicemix/smx4/bundles/trunk/hibernate-validator-4.1.0.Final/pom.xml
    servicemix/smx4/bundles/trunk/hsqldb-1.8.0.10/pom.xml
    servicemix/smx4/bundles/trunk/hsqldb-1.8.0.7/pom.xml
    servicemix/smx4/bundles/trunk/jain-sip-ri-1.2.154/pom.xml
    servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml
    servicemix/smx4/bundles/trunk/jaxb-impl-2.1.13/pom.xml
    servicemix/smx4/bundles/trunk/jaxb-xjc-2.1.13/pom.xml
    servicemix/smx4/bundles/trunk/jaxen-1.1.1/pom.xml
    servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml
    servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml
    servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml
    servicemix/smx4/bundles/trunk/mybatis-3.0.2/pom.xml
    servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml
    servicemix/smx4/bundles/trunk/openjpa-2.0.0/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml
    servicemix/smx4/bundles/trunk/protobuf-2.3.0/pom.xml
    servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml
    servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml
    servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml
    servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml
    servicemix/smx4/bundles/trunk/xmlbeans-2.5.0/pom.xml

Modified: servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/bundles-pom/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/bundles-pom/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/bundles-pom/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-pom</artifactId>
-      <version>3</version>
+      <version>5</version>
+      <relativePath>../../servicemix-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -94,7 +95,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>${servicemix.osgi.export}</Export-Package>
                         <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
                         <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>

Modified: servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath> 
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
     
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/hibernate-validator-4.1.0.Final/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hibernate-validator-4.1.0.Final/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hibernate-validator-4.1.0.Final/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hibernate-validator-4.1.0.Final/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
     
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/hsqldb-1.8.0.10/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hsqldb-1.8.0.10/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hsqldb-1.8.0.10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hsqldb-1.8.0.10/pom.xml Wed Nov  3 19:12:51 2010
@@ -25,7 +25,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.hsqldb-1.8.0.10</artifactId>

Modified: servicemix/smx4/bundles/trunk/hsqldb-1.8.0.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hsqldb-1.8.0.7/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hsqldb-1.8.0.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hsqldb-1.8.0.7/pom.xml Wed Nov  3 19:12:51 2010
@@ -25,8 +25,10 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
+    
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.hsqldb-1.8.0.7</artifactId>
     <version>1.8.0.7</version>

Modified: servicemix/smx4/bundles/trunk/jain-sip-ri-1.2.154/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jain-sip-ri-1.2.154/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jain-sip-ri-1.2.154/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jain-sip-ri-1.2.154/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
     
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.1.13/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.1.13/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.1.13/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.1.13/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -80,11 +81,11 @@
     </dependencies>
 
     <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
+       <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven</name>
+            <url>http://download.java.net/maven/2/</url>
+            <layout>default</layout>
             <releases>
                 <enabled>true</enabled>
             </releases>

Modified: servicemix/smx4/bundles/trunk/jaxb-xjc-2.1.13/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-xjc-2.1.13/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-xjc-2.1.13/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-xjc-2.1.13/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -107,11 +108,11 @@
     </dependencies>
 
     <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
+       <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven</name>
+            <url>http://download.java.net/maven/2/</url>
+            <layout>default</layout>
             <releases>
                 <enabled>true</enabled>
             </releases>

Modified: servicemix/smx4/bundles/trunk/jaxen-1.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxen-1.1.1/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxen-1.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxen-1.1.1/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-6.1.25/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
     
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/mybatis-3.0.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/mybatis-3.0.2/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/mybatis-3.0.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/mybatis-3.0.2/pom.xml Wed Nov  3 19:12:51 2010
@@ -24,7 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>4</version>
+        <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
     
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml Wed Nov  3 19:12:51 2010
@@ -78,7 +78,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.apache.openjpa*;version=1.2.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>
                             !org.apache.openjpa*,

Modified: servicemix/smx4/bundles/trunk/openjpa-2.0.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/openjpa-2.0.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/openjpa-2.0.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/openjpa-2.0.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -57,7 +57,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.apache.openjpa*;version=2.0.0;-split-package:=merge-first;noimport:=true</Export-Package>
                         <Import-Package>
                             com.ibm*;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Nov  3 19:12:51 2010
@@ -32,6 +32,7 @@
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-pom</artifactId>
       <version>4</version>
+      <relativePath>../servicemix-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -43,6 +44,7 @@
     <modules>
         <module>ant-1.7.0</module>
         <module>aopalliance-1.0</module>
+        <module>bundles-pom</module>
         <module>cglib-2.1_3</module>
         <module>commons-beanutils-1.8.2</module>
         <module>commons-collections-3.2.1</module>

Modified: servicemix/smx4/bundles/trunk/protobuf-2.3.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/protobuf-2.3.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/protobuf-2.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/protobuf-2.3.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>bundles-pom</artifactId>
-      <version>4</version>
+      <version>5-SNAPSHOT</version>
+      <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>5-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/xmlbeans-2.5.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xmlbeans-2.5.0/pom.xml?rev=1030621&r1=1030620&r2=1030621&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xmlbeans-2.5.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xmlbeans-2.5.0/pom.xml Wed Nov  3 19:12:51 2010
@@ -23,7 +23,8 @@
     <parent>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>bundles-pom</artifactId>
-      <version>4</version>
+      <version>5-SNAPSHOT</version>
+      <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>