Author: veithen
Date: Sun Jun 19 20:48:28 2011
New Revision: 1137431
URL: http://svn.apache.org/viewvc?rev=1137431&view=rev
Log:
Merged r1072316 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-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
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 Jun 19 20:48:28 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1083686,1130570,1132548,1134683
+/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1137431&r1=1137430&r2=1137431&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Sun Jun
19 20:48:28 2011
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.2</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
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=1137431&r1=1137430&r2=1137431&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:48:28 2011
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.2</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
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=1137431&r1=1137430&r2=1137431&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sun Jun 19 20:48:28 2011
@@ -132,36 +132,6 @@
</repositories>
-
- <pluginRepositories>
-
- <pluginRepository>
- <id>snapshot-apache</id>
- <name>Apache Snapshot repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
-
- <pluginRepository>
- <id>snapshot</id>
- <name>Snapshot repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
-
- </pluginRepositories>
-
-
<build>
<pluginManagement>
<plugins>
@@ -171,6 +141,11 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>1.5.4</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
