geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r918843 - in /geronimo/server/trunk/plugins: jaxws/geronimo-jaxws/pom.xml jaxws/jaxws-deployer/src/main/history/dependencies.xml webservices/webservices-common/pom.xml
Date Thu, 04 Mar 2010 03:40:55 GMT
Author: gawor
Date: Thu Mar  4 03:40:54 2010
New Revision: 918843

URL: http://svn.apache.org/viewvc?rev=918843&view=rev
Log:
some jaxws 2.2 related changes

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=918843&r1=918842&r2=918843&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Thu Mar  4 03:40:54 2010
@@ -53,11 +53,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
@@ -77,13 +72,11 @@
             <!--<version>${version}</version>-->
         <!--</dependency>-->
 
-<!--    part of java 6 now.  Can cause bundle contstraint violations if
-        loaded because the framework has same classes.
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
             <scope>provided</scope>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=918843&r1=918842&r2=918843&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Thu
Mar  4 03:40:54 2010
@@ -31,9 +31,4 @@
         <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=918843&r1=918842&r2=918843&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Thu Mar  4 03:40:54
2010
@@ -64,13 +64,11 @@
         </dependency>
 
 
-<!--    part of java 6 now.  Can cause bundle contstraint violations if
-        loaded because the framework has same classes.
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
             <scope>provided</scope>
-        </dependency>-->
+        </dependency>
 
          <dependency>
             <groupId>org.apache.geronimo.modules</groupId>



Mime
View raw message