Author: fmeschbe
Date: Sun Aug 29 09:45:39 2010
New Revision: 990534

URL: http://svn.apache.org/viewvc?rev=990534&view=rev
Log:
SLING-952 plugin dependencies are not recognized since the parent pom already 
has an antrun plugin configuration. As a workaround added the ant dependencies 
as provided dependencies and referring to them as maven.compile.classpath 
reference

Modified:
    sling/trunk/contrib/extensions/dojo/pom.xml

Modified: sling/trunk/contrib/extensions/dojo/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/dojo/pom.xml?rev=990534&r1=990533&r2=990534&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/dojo/pom.xml (original)
+++ sling/trunk/contrib/extensions/dojo/pom.xml Sun Aug 29 09:45:39 2010
@@ -68,6 +68,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>download-dojo</id>
                         <phase>process-resources</phase>
                         <configuration>
                             <tasks>
@@ -75,7 +76,7 @@
                                 <condition property="testProxySetting">
                                     <equals arg1="${settings.activeProxy}" 
arg2="$${settings.activeProxy}"/>
                                 </condition>
-                                <taskdef 
resource="net/sf/antcontrib/antcontrib.properties" 
classpathref="maven.plugin.classpath" />
+                                <taskdef 
resource="net/sf/antcontrib/antcontrib.properties" 
classpathref="maven.compile.classpath" />
                                 <if>
                                     <isfalse value="${testProxySetting}"/>
                                     <then>
@@ -112,24 +113,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                              <exclusions>
-                                <exclusion> 
-                                  <groupId>ant</groupId>
-                                  <artifactId>ant</artifactId>
-                                </exclusion>
-                              </exclusions> 
-                    </dependency>
-                </dependencies>
             </plugin>
             
             <plugin>
@@ -162,4 +145,24 @@
         </plugins>
     </build>
 
+    <dependencies>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-nodeps</artifactId>
+            <version>1.6.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>1.0b3</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion> 
+                    <groupId>ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+            </exclusions> 
+        </dependency>
+    </dependencies>
 </project>


Reply via email to