Author: sagara
Date: Thu Jan 12 07:31:12 2012
New Revision: 1230425
URL: http://svn.apache.org/viewvc?rev=1230425&view=rev
Log:
Merged r1230421 to the AXIS2-4318 branch.
Modified:
axis/axis2/java/core/branches/AXIS2-4318/ (props changed)
axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml
Propchange: axis/axis2/java/core/branches/AXIS2-4318/
------------------------------------------------------------------------------
svn:mergeinfo = /axis/axis2/java/core/trunk:1230421
Modified: axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml Thu Jan 12
07:31:12 2012
@@ -117,7 +117,6 @@
org.apache.axiom.*,
org.apache.commons.fileupload.*,
org.apache.commons.httpclient.*,
- org.apache.http.auth.*;resolution:=optional,
org.apache.commons.lang;resolution:=optional,
org.apache.commons.logging,
org.apache.http;resolution:=optional,
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==============================================================================
---
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
(original)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
Thu Jan 12 07:31:12 2012
@@ -19,7 +19,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==============================================================================
---
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
(original)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
Thu Jan 12 07:31:12 2012
@@ -19,7 +19,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==============================================================================
---
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
Thu Jan 12 07:31:12 2012
@@ -19,7 +19,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis2</groupId>
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml
(original)
+++ axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml Thu
Jan 12 07:31:12 2012
@@ -109,16 +109,5 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.1.2</version>
-<!-- <exclusions> -->
-<!-- <exclusion> -->
-<!-- <groupId>org.apache.httpcomponents</groupId> -->
-<!-- <artifactId>httpcore</artifactId> -->
-<!-- </exclusion> -->
-<!-- </exclusions> -->
- </dependency>
</dependencies>
</project>
