geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r927872 - in /geronimo/server/trunk: ./ framework/bundles/asm-3.1/ framework/bundles/asm-commons-3.1/ framework/bundles/aspectjrt/ framework/bundles/aspectjweaver/ framework/bundles/axis/ framework/bundles/backport-util-concurrent/ framewor...
Date Fri, 26 Mar 2010 14:35:00 GMT
Author: rickmcguire
Date: Fri Mar 26 14:34:59 2010
New Revision: 927872

URL: http://svn.apache.org/viewvc?rev=927872&view=rev
Log:
Standardize the version naming convention for wrappered bundles

Modified:
    geronimo/server/trunk/framework/bundles/asm-3.1/pom.xml
    geronimo/server/trunk/framework/bundles/asm-commons-3.1/pom.xml
    geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
    geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
    geronimo/server/trunk/framework/bundles/axis/pom.xml
    geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml
    geronimo/server/trunk/framework/bundles/castor/pom.xml
    geronimo/server/trunk/framework/bundles/commons-digester/pom.xml
    geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml
    geronimo/server/trunk/framework/bundles/derby-all/pom.xml
    geronimo/server/trunk/framework/bundles/dwr/pom.xml
    geronimo/server/trunk/framework/bundles/httpcore/pom.xml
    geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml
    geronimo/server/trunk/framework/bundles/jstl/pom.xml
    geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
    geronimo/server/trunk/framework/bundles/ldapsdk/pom.xml
    geronimo/server/trunk/framework/bundles/log4j/pom.xml
    geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml
    geronimo/server/trunk/framework/bundles/sxc-runtime/pom.xml
    geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml
    geronimo/server/trunk/framework/bundles/wadi-core/pom.xml
    geronimo/server/trunk/framework/bundles/wadi-group/pom.xml
    geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml
    geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml
    geronimo/server/trunk/framework/bundles/woodstox/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/bundles/asm-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/asm-3.1/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/asm-3.1/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/asm-3.1/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>asm</artifactId>
     <packaging>bundle</packaging>
-    <version>3.1_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.

Modified: geronimo/server/trunk/framework/bundles/asm-commons-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/asm-commons-3.1/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/asm-commons-3.1/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/asm-commons-3.1/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>asm-commons</artifactId>
     <packaging>bundle</packaging>
-    <version>3.1_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.

Modified: geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>aspectjrt</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>aspectjweaver</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/axis/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/axis/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/axis/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>axis</artifactId>
-    <version>1.4_1-SNAPSHOT</version>
+    <version>${pkgVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml Fri Mar 26 14:34:59
2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -52,7 +52,7 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

Modified: geronimo/server/trunk/framework/bundles/castor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/castor/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/castor/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/castor/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>castor</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/commons-digester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/commons-digester/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/commons-digester/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/commons-digester/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -46,7 +46,7 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>            
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -56,10 +56,10 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>                
+                <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.commons.digester*;version=${pkgVersion}</Export-Package>

Modified: geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml Fri Mar 26 14:34:59
2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -51,10 +51,10 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>                
+                <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.commons.discovery*;version=${pkgVersion}</Export-Package>

Modified: geronimo/server/trunk/framework/bundles/derby-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/derby-all/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/derby-all/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/derby-all/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>derby-all</artifactId>
-    <version>${derbyVersion}-SNAPSHOT</version>
+    <version>${derbyVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: Derby-${derbyVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/dwr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/dwr/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/dwr/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/dwr/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>dwr</artifactId>
-    <version>3.0.M1_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -63,7 +63,7 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

Modified: geronimo/server/trunk/framework/bundles/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/httpcore/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/httpcore/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/httpcore/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -53,7 +53,7 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

Modified: geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml Fri Mar 26 14:34:59 2010
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>jaxb-impl</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -38,7 +38,7 @@
     <properties>
         <pkgGroupId>com.sun.xml.bind</pkgGroupId>
         <pkgArtifactId>jaxb-impl</pkgArtifactId>
-        <pkgVersion>2.1.12</pkgVersion>
+        <pkgVersion>2.2</pkgVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/server/trunk/framework/bundles/jstl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/jstl/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/jstl/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/jstl/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -52,7 +52,7 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -60,7 +60,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>*;version=${pkgVersion}</Export-Package>
-                        <Import-Package>com.sun.org.apache*;resolution:=optional,*</Import-Package>
                       
+                        <Import-Package>com.sun.org.apache*;resolution:=optional,*</Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                         <Embed-Dependency>*;scope=provided;inline=true</Embed-Dependency>
                         <Include-Resource>

Modified: geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/karaf-client/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/karaf-client/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/karaf-client/pom.xml Fri Mar 26 14:34:59 2010
@@ -33,18 +33,18 @@
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>karaf-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <name>karaf-client</name>
     <description>
         This bundle simply replaces the leading path of classpath entrys from ../system to
../repository in MANIFEST.MF.
     </description>
-    
+
     <properties>
         <pkgGroupId>org.apache.felix.karaf</pkgGroupId>
         <pkgArtifactId>org.apache.felix.karaf.client</pkgArtifactId>
         <pkgVersion>1.5.0-SNAPSHOT</pkgVersion>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/server/trunk/framework/bundles/ldapsdk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/ldapsdk/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/ldapsdk/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/ldapsdk/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>ldapsdk</artifactId>
-    <version>4.1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/log4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/log4j/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/log4j/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/log4j/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>log4j</artifactId>
-    <version>1.2.15_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>sxc-jaxb</artifactId>
-    <version>0.7.2_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/sxc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/sxc-runtime/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/sxc-runtime/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/sxc-runtime/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>sxc-runtime</artifactId>
-    <version>0.7.2_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>wadi-aop</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/wadi-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-core/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-core/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/wadi-core/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>wadi-core</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/wadi-group/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-group/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-group/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/wadi-group/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>wadi-group</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>wadi-tribes</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml Fri Mar 26 14:34:59 2010
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}_1-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -48,7 +48,7 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>            
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -59,7 +59,7 @@
     </dependencies>
 
     <build>
-        <plugins>           
+        <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -67,12 +67,12 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.woden.internal*;version="1.0.0",org.apache.woden.tool*;version="1.0.0"</Export-Package>
-                        <Import-Package>                           
+                        <Import-Package>
                             org.apache.xerces.parsers*;resolution:=optional,
                             org.apache.xml.serialize*;resolution:=optional,
                             javax.xml.namespace;version="0.0.0",
                             *
-                        </Import-Package>                        
+                        </Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/server/trunk/framework/bundles/woodstox/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/woodstox/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/woodstox/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/woodstox/pom.xml Fri Mar 26 14:34:59 2010
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>woodstox</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${pkgVersion}${bundleVersion}</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Mar 26 14:34:59 2010
@@ -280,7 +280,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf</groupId>
-            <artifactId>org.apache.felix.karaf.client</artifactId>          
                       
+            <artifactId>org.apache.felix.karaf.client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf.deployer</groupId>
@@ -465,7 +465,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-shell-base</artifactId>
             <version>${version}</version>
-        </dependency>    
+        </dependency>
     </dependencies>
     <build>
         <!--<resources>-->

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Fri Mar 26 14:34:59 2010
@@ -72,11 +72,11 @@ org/apache/servicemix/bundles/org.apache
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_4/org.apache.servicemix.bundles.cglib-2.1_3_4.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_1/org.apache.servicemix.bundles.commons-jexl-1.1_1.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_3/org.apache.servicemix.bundles.commons-lang-2.4_3.jar=40
-org/apache/geronimo/bundles/jaxb-impl/2.2-SNAPSHOT/jaxb-impl-2.2-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/jaxb-impl/2.2_1-SNAPSHOT/jaxb-impl-2.2_1-SNAPSHOT.jar=40
 org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.3-SNAPSHOT/geronimo-activation_1.1_spec-1.0.3-SNAPSHOT.jar=40
 org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0-SNAPSHOT/geronimo-jaxb_2.2_spec-1.0-SNAPSHOT.jar=40
 org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.2-SNAPSHOT/geronimo-stax-api_1.0_spec-1.0.2-SNAPSHOT.jar=40
-org/apache/geronimo/bundles/woodstox/1.0-SNAPSHOT/woodstox-1.0-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/woodstox/3.2.9_1-SNAPSHOT/woodstox-3.2.9_1-SNAPSHOT.jar=40
 asm/asm-all/3.2/asm-all-3.2.jar=40
 commons-cli/commons-cli/1.2/commons-cli-1.2.jar=40
 org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1-SNAPSHOT/sxc-jaxb-0.7.2_1-SNAPSHOT.jar=40

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Fri Mar 26 14:34:59 2010
@@ -84,7 +84,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-aop</artifactId>
-                <version>${wadiVersion}-SNAPSHOT</version>
+                <version>${wadiVersion}_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -101,7 +101,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-core</artifactId>
-                <version>${wadiVersion}-SNAPSHOT</version>
+                <version>${wadiVersion}_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -121,7 +121,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-group</artifactId>
-                <version>${wadiVersion}-SNAPSHOT</version>
+                <version>${wadiVersion}_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -133,7 +133,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-tribes</artifactId>
-                <version>${wadiVersion}-SNAPSHOT</version>
+                <version>${wadiVersion}_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>

Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml Fri Mar 26 14:34:59
2010
@@ -27,14 +27,14 @@
         <artifactId>system-database</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-derby</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, System Database :: Derby</name>
-    
+
     <description>Wrapper for using Apache Derby as a bundled database.</description>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=927872&r1=927871&r2=927872&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Mar 26 14:34:59 2010
@@ -56,6 +56,8 @@
 
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
+        <!-- Additional version modifier added to all bundlized jars -->
+        <bundleVersion>_1-SNAPSHOT</bundleVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
         <warnOnDependencyChange>true</warnOnDependencyChange>
@@ -507,13 +509,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjrt</artifactId>
-                <version>1.6.2-SNAPSHOT</version>
+                <version>1.6.2_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjweaver</artifactId>
-                <version>1.6.2-SNAPSHOT</version>
+                <version>1.6.2_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -559,7 +561,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>castor</artifactId>
-                <version>1.0.5-SNAPSHOT</version>
+                <version>1.0.5_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -763,7 +765,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>derby-all</artifactId>
-                <version>${derbyVersion}-SNAPSHOT</version>
+                <version>${derbyVersion}_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -1328,7 +1330,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>woodstox</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>3.2.9_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -1372,7 +1374,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <version>2.2_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>



Mime
View raw message