geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r885886 - in /geronimo/server/trunk: ./ framework/ plugins/jaxws/geronimo-jaxws-builder/ plugins/jaxws/geronimo-jaxws/ plugins/jaxws/jaxws-deployer/ plugins/jaxws/jaxws-deployer/src/main/history/
Date Tue, 01 Dec 2009 19:32:33 GMT
Author: gawor
Date: Tue Dec  1 19:32:32 2009
New Revision: 885886

URL: http://svn.apache.org/viewvc?rev=885886&view=rev
Log:
minor dependency cleanup

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

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=885886&r1=885885&r2=885886&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Dec  1 19:32:32 2009
@@ -238,11 +238,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-                <version>1.2_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
                 <version>1.1.4c_4-SNAPSHOT</version>
             </dependency>
@@ -261,7 +256,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.specs</groupId>
                 <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>1.4.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.specs</groupId>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml?rev=885886&r1=885885&r2=885886&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml Tue Dec  1 19:32:32
2009
@@ -34,12 +34,6 @@
     <name>Geronimo Plugins, JAXWS :: Builder</name>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jaxws</artifactId>
@@ -51,11 +45,6 @@
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

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=885886&r1=885885&r2=885886&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Tue Dec  1 19:32:32 2009
@@ -101,13 +101,13 @@
         </dependency>
 
         <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         </dependency>
 
         <dependency>
-          <groupId>org.apache.geronimo.schema</groupId>
-          <artifactId>geronimo-schema-jee_5</artifactId>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml?rev=885886&r1=885885&r2=885886&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml Tue Dec  1 19:32:32 2009
@@ -70,7 +70,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <useMavenDependencies>
-                        <value>false</value>
+                        <value>true</value>
                     </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>

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=885886&r1=885885&r2=885886&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 Tue
Dec  1 19:32:32 2009
@@ -41,9 +41,4 @@
         <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=885886&r1=885885&r2=885886&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec  1 19:32:32 2009
@@ -804,7 +804,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-                <version>1.6.2_1-SNAPSHOT</version>
+                <version>1.6.2_2</version>
             </dependency>
 
             <!-- org.apache.xml.serialize.XMLSerializer is used by castor, hence this
is still needed -->
@@ -843,6 +843,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+                <version>1.2_1</version>
+            </dependency>
+
+            <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>
                 <version>1.2</version>



Mime
View raw message