Author: veithen
Date: Sun Aug 14 19:56:01 2011
New Revision: 1157619
URL: http://svn.apache.org/viewvc?rev=1157619&view=rev
Log:
Merged r1157613 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 19:56:01 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1157619&r1=1157618&r2=1157619&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Aug 14 19:56:01 2011
@@ -229,11 +229,6 @@
<version>2.7.1</version>
</dependency>
<dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- </dependency>
- <dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml1</artifactId>
<version>1.1</version>
@@ -415,7 +410,6 @@
<axiom.version>1.2.12</axiom.version>
<wss4j.version>1.5.11</wss4j.version>
- <xmlsec.version>1.4.2</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
<bcprov.jdk14.version>140</bcprov.jdk14.version>
