You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/10/12 16:19:20 UTC
svn commit: r1182389 - in /geronimo/server/trunk/plugins/axis2:
axis2/pom.xml axis2/src/main/history/dependencies.xml
geronimo-axis2/pom.xml pom.xml
Author: xuhaihong
Date: Wed Oct 12 14:19:19 2011
New Revision: 1182389
URL: http://svn.apache.org/viewvc?rev=1182389&view=rev
Log:
Use geronimo customized commons-httpclient
Modified:
geronimo/server/trunk/plugins/axis2/axis2/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
geronimo/server/trunk/plugins/axis2/pom.xml
Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=1182389&r1=1182388&r2=1182389&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Wed Oct 12 14:19:19 2011
@@ -117,8 +117,8 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=1182389&r1=1182388&r2=1182389&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Wed Oct 12 14:19:19 2011
@@ -28,6 +28,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>httpcore</artifactId>
<type>jar</type>
</dependency>
@@ -148,11 +153,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=1182389&r1=1182388&r2=1182389&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Wed Oct 12 14:19:19 2011
@@ -100,8 +100,8 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=1182389&r1=1182388&r2=1182389&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Wed Oct 12 14:19:19 2011
@@ -72,19 +72,9 @@
</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>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1_1-SNAPSHOT</version>
</dependency>
<dependency>