Integ: ant 1.10.1, antlr 2.7.7 (#22054)

Author: SAMEER PANDIT

appserver/ant-tasks/pom.xml

@@ -65,8 +65,9 @@
 
     <dependencies>
        <dependency>
-           <groupId>org.apache.ant</groupId>
+           <groupId>org.glassfish.external</groupId>
            <artifactId>ant</artifactId>
+           <version>${ant.version}</version>
            <optional>true</optional>
        </dependency>
 

appserver/packager/external/ant/pom.xml

@@ -65,7 +65,6 @@
     </properties>
 
     <modules>
-        <module>ant</module>
         <module>javadb</module>    
 	<module>jmsra</module>
         <module>jaxr_ra</module>

appserver/packager/external/pom.xml

@@ -131,9 +131,9 @@
             <artifactId>dbschema-repackaged</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.external</groupId>
-            <artifactId>antlr-repackaged</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr.version}</version>
         </dependency>
     </dependencies>
 </project>

appserver/packager/glassfish-cmp/pom.xml

@@ -109,9 +109,9 @@
            <version>${project.version}</version>
        </dependency> 
        <dependency>
-           <groupId>org.glassfish.main.external</groupId>
+           <groupId>org.glassfish.external</groupId>
            <artifactId>ant</artifactId>
-           <version>${project.version}</version>
+           <version>${ant.version}</version>
        </dependency>
        <!--
        The following dependencies are for batch (JSR 352). This is a temporary solution

appserver/packager/glassfish-common-full/pom.xml

@@ -133,9 +133,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.external</groupId>
-            <artifactId>antlr-repackaged</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr.version}</version>
         </dependency>
         <dependency> 
         <!-- We depend on repackaged antlr, but antlr-maven-plugin checks for this dependency to be present -->

appserver/persistence/cmp/support-ejb/pom.xml

@@ -117,9 +117,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.external</groupId>
-            <artifactId>antlr-repackaged</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr.version}</version>
         </dependency>
         <dependency> 
         <!-- We depend on repackaged antlr, but antlr-maven-plugin checks for this dependency to be present -->

appserver/persistence/cmp/support-sqlstore/pom.xml

@@ -174,7 +174,7 @@
               we can remove this.
             <groupId>org.glassfish.external</groupId>
             <artifactId>ant</artifactId>
-            <version>${project.version}</version>
+            <version>${ant.version}</version>
         </dependency>
             -->