Author: veithen
Date: Wed Jul 21 20:25:30 2010
New Revision: 966401
URL: http://svn.apache.org/viewvc?rev=966401&view=rev
Log:
Use the standard way to specify the versions of the AAR/MAR plugins, i.e. a
pluginManagement entry instead of properties.
Modified:
axis/axis2/java/core/trunk/modules/addressing/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml
axis/axis2/java/core/trunk/modules/mex/pom.xml
axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/ping/pom.xml
axis/axis2/java/core/trunk/modules/samples/version/pom.xml
axis/axis2/java/core/trunk/modules/scripting/pom.xml
axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
Modified: axis/axis2/java/core/trunk/modules/addressing/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/addressing/pom.xml Wed Jul 21 20:25:30
2010
@@ -84,7 +84,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-mar/pom.xml Wed Jul 21 20:25:30
2010
@@ -99,7 +99,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/trunk/modules/mex/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mex/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/mex/pom.xml Wed Jul 21 20:25:30 2010
@@ -85,7 +85,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
Modified: axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml Wed Jul 21
20:25:30 2010
@@ -83,7 +83,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Wed Jul 21 20:25:30 2010
@@ -78,17 +78,6 @@
<xmlschema.version>1.4.6</xmlschema.version>
<woden.version>1.0-SNAPSHOT</woden.version>
- <!-- Unfortunately we can't use the 1.5.1 versions here because this
would result
- in corruption of the local Maven repository. The reason is that
- the POMs of the 1.5.1 plugins refer to an incorrect java.net
- repository. When Maven loads one of these plugins, it will
- load dependencies using this repository and these artifacts
- are corrupted (they are replaced by an HTML page). Note that we
may
- later use 1.5.2 (once that version is released) here to avoid
- the chicken and egg problem. -->
- <mar.plugin.version>1.5.2-SNAPSHOT</mar.plugin.version>
- <aar.plugin.version>1.5.2-SNAPSHOT</aar.plugin.version>
-
<!-- Use released versions for these projects -->
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.7</antlr.version>
@@ -1254,6 +1243,25 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
</plugin>
+
+ <!-- Unfortunately we can't use the 1.5.1 versions here
because this would result
+ in corruption of the local Maven repository. The reason
is that
+ the POMs of the 1.5.1 plugins refer to an incorrect
java.net
+ repository. When Maven loads one of these plugins, it will
+ load dependencies using this repository and these
artifacts
+ are corrupted (they are replaced by an HTML page). Note
that we may
+ later use 1.5.2 (once that version is released) here to
avoid
+ the chicken and egg problem. -->
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-aar-maven-plugin</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: axis/axis2/java/core/trunk/modules/ping/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/ping/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/ping/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/ping/pom.xml Wed Jul 21 20:25:30 2010
@@ -85,7 +85,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/trunk/modules/samples/version/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/version/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/version/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/version/pom.xml Wed Jul 21
20:25:30 2010
@@ -58,7 +58,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-aar-maven-plugin</artifactId>
- <version>${aar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<servicesXmlFile>${basedir}/src/sample/axisversion/META-INF/services.xml</servicesXmlFile>
Modified: axis/axis2/java/core/trunk/modules/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/scripting/pom.xml Wed Jul 21 20:25:30
2010
@@ -110,7 +110,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml?rev=966401&r1=966400&r2=966401&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml Wed Jul 21
20:25:30 2010
@@ -64,7 +64,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${mar.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
