You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/12/15 16:57:59 UTC

svn commit: r890850 - in /geronimo/server/trunk: plugins/axis2/pom.xml pom.xml

Author: gawor
Date: Tue Dec 15 15:57:59 2009
New Revision: 890850

URL: http://svn.apache.org/viewvc?rev=890850&view=rev
Log:
refactor some axis2 dependencies

Modified:
    geronimo/server/trunk/plugins/axis2/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=890850&r1=890849&r2=890850&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Tue Dec 15 15:57:59 2009
@@ -282,6 +282,29 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+                <version>3.1_4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.0.1_1-SNAPSHOT</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=890850&r1=890849&r2=890850&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 15 15:57:59 2009
@@ -1038,28 +1038,8 @@
 
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-                <version>3.1_5-SNAPSHOT</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.servicemix.bundles</groupId>
-                        <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
-                <version>1.3_3-SNAPSHOT</version>
+                <version>1.3_2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>junit</groupId>
@@ -1516,12 +1496,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>4.0.1_1-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>
                 <version>${axiomVersion}</version>