You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/28 17:16:26 UTC
svn commit: r789108 - in /maven/plugins/trunk: maven-assembly-plugin/pom.xml
pom.xml
Author: bentmann
Date: Sun Jun 28 15:16:23 2009
New Revision: 789108
URL: http://svn.apache.org/viewvc?rev=789108&view=rev
Log:
o Used a less subtle workaround for MNG-1323
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=789108&r1=789107&r2=789108&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun Jun 28 15:16:23 2009
@@ -341,27 +341,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <!--
- HACK: The following dependencies are only specified here to work around MNG-1323 which would otherwise
- screw up the Eclipse Plugin's ITs during CI.
- -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
Modified: maven/plugins/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=789108&r1=789107&r2=789108&view=diff
==============================================================================
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Sun Jun 28 15:16:23 2009
@@ -113,6 +113,10 @@
<modules>
<module>maven-ant-plugin</module>
<module>maven-antrun-plugin</module>
+
+ <!-- HACK: Deliberately put before other plugins that employ maven-antrun-plugin to workaround MNG-1323 -->
+ <module>maven-eclipse-plugin</module>
+
<module>maven-assembly-plugin</module>
<module>maven-changelog-plugin</module>
<module>maven-changes-plugin</module>
@@ -124,7 +128,6 @@
<module>maven-doap-plugin</module>
<module>maven-docck-plugin</module>
<module>maven-ear-plugin</module>
- <module>maven-eclipse-plugin</module>
<module>maven-ejb-plugin</module>
<module>maven-gpg-plugin</module>
<module>maven-help-plugin</module>
@@ -138,10 +141,9 @@
<module>maven-patch-plugin</module>
<module>maven-pdf-plugin</module>
<module>maven-pmd-plugin</module>
- <!--Excluded as a workaround for MNG-3814
+ <!--Excluded as a workaround for MNG-3814
<module>maven-project-info-reports-plugin</module>-->
-
- <module>maven-rar-plugin</module>
+ <module>maven-rar-plugin</module>
<module>maven-reactor-plugin</module>
<module>maven-remote-resources-plugin</module>
<module>maven-repository-plugin</module>