[jboss-svn-commits] JBL Code SVN: r35591 - in labs/jbossrules/trunk: drools-ant and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-10-20 07:19:32 -0400 (Wed, 20 Oct 2010)
New Revision: 35591

Modified:
   labs/jbossrules/trunk/drools-ant/pom.xml
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2737 Build with maven 3 fails on Guvnor due to maven-antrun-plugin +  JBRULES-2739 Upgrade to ANT 1.8.1

Modified: labs/jbossrules/trunk/drools-ant/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/pom.xml	2010-10-20 11:01:50 UTC (rev 35590)
+++ labs/jbossrules/trunk/drools-ant/pom.xml	2010-10-20 11:19:32 UTC (rev 35591)
@@ -44,11 +44,11 @@
       <artifactId>drools-decisiontables</artifactId>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant-nodeps</artifactId>
     </dependency>
     <dependency>

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2010-10-20 11:01:50 UTC (rev 35590)
+++ labs/jbossrules/trunk/pom.xml	2010-10-20 11:19:32 UTC (rev 35591)
@@ -509,20 +509,10 @@
           <version>1.4</version>
           <dependencies>
             <dependency>
-              <groupId>ant</groupId>
-              <artifactId>ant-nodeps</artifactId>
-              <version>1.6.5</version>
-            </dependency>
-            <dependency>
-              <groupId>ant</groupId>
+              <groupId>org.apache.ant</groupId>
               <artifactId>ant-apache-regexp</artifactId>
-              <version>1.6.5</version>
+              <version>1.8.1</version>
             </dependency>
-            <dependency>
-              <artifactId>jakarta-regexp</artifactId>
-              <groupId>jakarta-regexp</groupId>
-              <version>1.4</version>
-            </dependency>
           </dependencies>
         </plugin>
 
@@ -572,11 +562,6 @@
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.5</version>
           <configuration>
@@ -1845,26 +1830,15 @@
       </dependency>
 
       <dependency>
-        <groupId>ant</groupId>
+        <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
-        <version>1.6.5</version>
+        <version>1.8.1</version>
       </dependency>
-
       <dependency>
-        <groupId>ant</groupId>
+        <groupId>org.apache.ant</groupId>
         <artifactId>ant-nodeps</artifactId>
-        <version>1.6.5</version>
+        <version>1.8.1</version>
       </dependency>
-      <dependency>
-        <groupId>ant</groupId>
-        <artifactId>ant-apache-regexp</artifactId>
-        <version>1.6.5</version>
-      </dependency>
-      <dependency>
-        <artifactId>jakarta-regexp</artifactId>
-        <groupId>jakarta-regexp</groupId>
-        <version>1.4</version>
-      </dependency>
 
       <dependency>
         <groupId>org.codehaus.jettison</groupId>