Author: veithen
Date: Tue Mar 13 20:32:18 2012
New Revision: 1300339
URL: http://svn.apache.org/viewvc?rev=1300339&view=rev
Log:
Removed the patched shade plugin because the patch for MSHADE-105 has now been
applied.
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/PluginXmlResourceTransformer.java
webservices/commons/trunk/modules/axiom/modules/shade-plugin-patched/
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml?rev=1300339&r1=1300338&r2=1300339&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml Tue Mar
13 20:32:18 2012
@@ -62,9 +62,7 @@
<build>
<plugins>
<plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>shade-plugin-patched</artifactId>
- <version>${project.version}</version>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml?rev=1300339&r1=1300338&r2=1300339&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
Tue Mar 13 20:32:18 2012
@@ -43,7 +43,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${shade.plugin.version}</version>
- <!-- This avoids conflicts with our patched version of the plugin
-->
<scope>provided</scope>
</dependency>
<dependency>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=1300339&r1=1300338&r2=1300339&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Tue Mar
13 20:32:18 2012
@@ -133,9 +133,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>shade-plugin-patched</artifactId>
- <version>${project.version}</version>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=1300339&r1=1300338&r2=1300339&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Tue Mar
13 20:32:18 2012
@@ -131,9 +131,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>shade-plugin-patched</artifactId>
- <version>${project.version}</version>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml?rev=1300339&r1=1300338&r2=1300339&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml Tue
Mar 13 20:32:18 2012
@@ -489,6 +489,6 @@
<stax.impl.artifact>stax</stax.impl.artifact>
<stax.impl.version>1.2.0</stax.impl.version>
-->
- <shade.plugin.version>1.4</shade.plugin.version>
+ <shade.plugin.version>1.6-SNAPSHOT</shade.plugin.version>
</properties>
</project>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=1300339&r1=1300338&r2=1300339&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Tue Mar 13 20:32:18 2012
@@ -530,7 +530,6 @@
<modules>
<module>modules/axiom-parent</module>
<module>modules/axiom-buildutils</module>
- <module>modules/shade-plugin-patched</module>
<module>modules/axiom-testutils</module>
<module>modules/axiom-jaxen-testsuite</module>
<module>modules/axiom-dom-testsuite</module>
