Author: veithen
Date: Tue Jul 6 18:39:32 2010
New Revision: 960976
URL: http://svn.apache.org/viewvc?rev=960976&view=rev
Log:
Use the 1.5 versions of the aar/mar plugins again. These versions may cause
corruption of the local Maven repository, but using SNAPSHOT versions causes
troubles when deploying with uniqueVersion=true.
Modified:
axis/axis2/java/core/trunk/modules/parent/pom.xml
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=960976&r1=960975&r2=960976&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue Jul 6 18:39:32 2010
@@ -88,16 +88,8 @@
<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>SNAPSHOT</mar.plugin.version>
- <aar.plugin.version>SNAPSHOT</aar.plugin.version>
+ <mar.plugin.version>1.5</mar.plugin.version>
+ <aar.plugin.version>1.5</aar.plugin.version>
<!-- Use released versions for these projects -->
<ant.version>1.7.0</ant.version>
@@ -558,18 +550,6 @@
</releases>
</pluginRepository>
<pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
<id>ws-zones</id>
<name>Apache WS Zones Repository</name>
<url>http://ws.zones.apache.org/repository2</url>