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/25 14:15:45 UTC

svn commit: r788339 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

Author: bentmann
Date: Thu Jun 25 12:15:45 2009
New Revision: 788339

URL: http://svn.apache.org/viewvc?rev=788339&view=rev
Log:
o Added workaround for MNG-1323 that affects maven-eclipse-plugin during CI builds on the grid

Modified:
    maven/plugins/trunk/maven-assembly-plugin/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=788339&r1=788338&r2=788339&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Jun 25 12:15:45 2009
@@ -60,9 +60,9 @@
       <version>1.1</version>
     </dependency>
     <dependency>
-    	<groupId>org.codehaus.plexus</groupId>
-    	<artifactId>plexus-interpolation</artifactId>
-    	<version>1.7</version>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -341,6 +341,27 @@
                 </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>