Author: sagara
Date: Tue May 1 08:08:52 2012
New Revision: 1332558
URL: http://svn.apache.org/viewvc?rev=1332558&view=rev
Log:
Merged r1332545 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1332545
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml?rev=1332558&r1=1332557&r2=1332558&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml Tue May 1
08:08:52 2012
@@ -90,7 +90,6 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
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=1332558&r1=1332557&r2=1332558&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 Tue May 1
08:08:52 2012
@@ -122,6 +122,7 @@
<failIfNoTests>false</failIfNoTests>
<m2Repository>'${settings.localRepository}'</m2Repository>
<geronimo-spec.jta.version>1.1</geronimo-spec.jta.version>
+ <jsr311.api.version>1.1.1</jsr311.api.version>
</properties>
<mailingLists>
<mailingList>
@@ -725,6 +726,11 @@
<artifactId>woden-impl-dom</artifactId>
<version>${woden.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311.api.version}</version>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
