Author: veithen
Date: Wed Nov 14 21:27:22 2012
New Revision: 1409416
URL: http://svn.apache.org/viewvc?rev=1409416&view=rev
Log:
Merged r1409389 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1409389
Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1409416&r1=1409415&r2=1409416&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Wed Nov 14
21:27:22 2012
@@ -91,7 +91,6 @@
<jalopy.version>1.5rc3</jalopy.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxbri.version>2.1.7</jaxbri.version>
- <jaxen.version>1.1.1</jaxen.version>
<jettison.version>1.3</jettison.version>
<jibx.version>1.2</jibx.version>
<junit.version-jdk1.4>3.8.2</junit.version-jdk1.4>
@@ -692,11 +691,6 @@
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons.httpclient.version}</version>
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/saaj:r1409389
