Author: veithen
Date: Sun Aug 14 20:29:57 2011
New Revision: 1157658
URL: http://svn.apache.org/viewvc?rev=1157658&view=rev
Log:
Merged r1072178 to the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 20:29:57 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616
+/axis/axis2/java/rampart/trunk:1072178,1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616
Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1157658&r1=1157657&r2=1157658&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sun Aug 14 20:29:57 2011
@@ -354,7 +354,7 @@
<module>modules/documentation</module>
<module>modules/distribution</module>
</modules>
- <build>
+ <build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -399,7 +399,7 @@
<axiom.version>1.2.12</axiom.version>
<wss4j.version>1.5.10</wss4j.version>
- <xmlsec.version>1.4.2</xmlsec.version>
+ <xmlsec.version>1.4.2</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
<bcprov.jdk14.version>140</bcprov.jdk14.version>
@@ -415,7 +415,7 @@
</properties>
<distributionManagement>
- <snapshotRepository>
+ <snapshotRepository>
<id>apache.snapshots.https</id>
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
