Author: veithen
Date: Sun Jun 19 20:36:28 2011
New Revision: 1137430
URL: http://svn.apache.org/viewvc?rev=1137430&view=rev
Log:
Merged r1072313 to the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 19 20:36:28 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072182,1072187,1083686,1130570,1132548,1134683
+/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1083686,1130570,1132548,1134683
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1137430&r1=1137429&r2=1137430&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Sun Jun 19 20:36:28 2011
@@ -58,26 +58,26 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.2</version>
- <extensions>true</extensions>
- <configuration>
- <includeDependencies>false</includeDependencies>
- <moduleXmlFile>module.xml</moduleXmlFile>
- </configuration>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>1.2</version>
+ <extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ <moduleXmlFile>module.xml</moduleXmlFile>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${project.version}</version>
