aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahrw...@apache.org
Subject svn commit: r1136648 - in /aries/trunk/parent/default-parent: java5-parent/pom.xml pom.xml
Date Thu, 16 Jun 2011 20:18:47 GMT
Author: mahrwald
Date: Thu Jun 16 20:18:47 2011
New Revision: 1136648

URL: http://svn.apache.org/viewvc?rev=1136648&view=rev
Log:
ARIES-679: Fix build failure around animal-sniffer plugin

Modified:
    aries/trunk/parent/default-parent/java5-parent/pom.xml
    aries/trunk/parent/default-parent/pom.xml

Modified: aries/trunk/parent/default-parent/java5-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/java5-parent/pom.xml?rev=1136648&r1=1136647&r2=1136648&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/java5-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/java5-parent/pom.xml Thu Jun 16 20:18:47 2011
@@ -46,13 +46,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <dependencies>
-                  <dependency>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-enforcer-rule</artifactId>
-                    <version>1.6</version>
-                  </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <phase>validate</phase>

Modified: aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/pom.xml?rev=1136648&r1=1136647&r2=1136648&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/pom.xml Thu Jun 16 20:18:47 2011
@@ -391,6 +391,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
+                <!-- this dependency is used in the java5-parent but seemingly maven2
wants it here otherwise it likes to fall over -->
+                <dependencies>
+                  <dependency>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-enforcer-rule</artifactId>
+                    <version>1.6</version>
+                  </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <phase>validate</phase>



Mime
View raw message