Author: veithen
Date: Sat Jul 23 13:38:10 2011
New Revision: 1150104
URL: http://svn.apache.org/viewvc?rev=1150104&view=rev
Log:
Merged r1145793 to the 1.6 branch to switch to Neethi 3.0.1.
Modified:
axis/axis2/java/sandesha/branches/1_6/ (props changed)
axis/axis2/java/sandesha/branches/1_6/pom.xml
Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 23 13:38:10 2011
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383
+/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793
Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1150104&r1=1150103&r2=1150104&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/pom.xml Sat Jul 23 13:38:10 2011
@@ -287,12 +287,6 @@
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>${neethi.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
@@ -439,7 +433,6 @@
<axis2.version>1.6.1-SNAPSHOT</axis2.version>
<rampart.version>1.6.1-SNAPSHOT</rampart.version>
<axiom.version>1.2.12</axiom.version>
- <neethi.version>3.0.1-SNAPSHOT</neethi.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.2</junit.version>
<log4j.version>1.2.15</log4j.version>
