geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1082831 - in /geronimo/bundles/trunk: axiom-all/pom.xml axis2-saaj/pom.xml axis2/pom.xml
Date Fri, 18 Mar 2011 07:01:03 GMT
Author: xuhaihong
Date: Fri Mar 18 07:01:02 2011
New Revision: 1082831

URL: http://svn.apache.org/viewvc?rev=1082831&view=rev
Log:
Update Axis2 and Axiom version to fix some JAXWS cases

Modified:
    geronimo/bundles/trunk/axiom-all/pom.xml
    geronimo/bundles/trunk/axis2-saaj/pom.xml
    geronimo/bundles/trunk/axis2/pom.xml

Modified: geronimo/bundles/trunk/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axiom-all/pom.xml?rev=1082831&r1=1082830&r2=1082831&view=diff
==============================================================================
--- geronimo/bundles/trunk/axiom-all/pom.xml (original)
+++ geronimo/bundles/trunk/axiom-all/pom.xml Fri Mar 18 07:01:02 2011
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>1.2.10_1-SNAPSHOT</version>
+    <version>1.2.11_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -44,7 +44,7 @@
     <properties>
         <pkgGroupId>org.apache.ws.commons.axiom</pkgGroupId>
         <pkgArtifactId>axiom-all</pkgArtifactId>
-        <pkgVersion>1.2.10</pkgVersion>
+        <pkgVersion>1.2.11</pkgVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/bundles/trunk/axis2-saaj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2-saaj/pom.xml?rev=1082831&r1=1082830&r2=1082831&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2-saaj/pom.xml (original)
+++ geronimo/bundles/trunk/axis2-saaj/pom.xml Fri Mar 18 07:01:02 2011
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>1.5.4_1-SNAPSHOT</version>
+    <version>1.6.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -44,7 +44,7 @@
     <properties>
         <pkgGroupId>org.apache.axis2</pkgGroupId>
         <pkgArtifactId>axis2-saaj</pkgArtifactId>
-        <pkgVersion>1.5.4</pkgVersion>
+        <pkgVersion>1.6.0-SNAPSHOT</pkgVersion>
     </properties>
 
     <dependencies>

Modified: geronimo/bundles/trunk/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/pom.xml?rev=1082831&r1=1082830&r2=1082831&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/pom.xml (original)
+++ geronimo/bundles/trunk/axis2/pom.xml Fri Mar 18 07:01:02 2011
@@ -26,13 +26,13 @@
     </parent>
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>axis2</artifactId>
-    <version>1.5.4_1-SNAPSHOT</version>
+    <version>1.6.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: Axis2-${pkgVersion}</name>
     <description> This bundle simply wraps all required Axis2 components </description>
     <properties>
         <pkgGroupId>org.apache.axis2</pkgGroupId>
-        <pkgVersion>1.5.4</pkgVersion>
+        <pkgVersion>1.6.0-SNAPSHOT</pkgVersion>
     </properties>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/axis2</connection>
@@ -217,6 +217,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Import-Package>javax.ws.rs;resolution:=optional,*</Import-Package>
                         <Export-Package> org.apache.axis2*;version="${pkgVersion}";-split-package:=merge-first
</Export-Package>
                         <Embed-Dependency> *;inline=META-INF/services/**|META-INF/*.xml|*.xml|org/apache/axis2**</Embed-Dependency>
                         <SPI-Provider>true</SPI-Provider>



Mime
View raw message