You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/10/14 21:56:22 UTC

svn commit: r704648 - in /geronimo/server/branches/2.1: assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf pom.xml repository/org/apache/ant/ repository/pom.xml

Author: gawor
Date: Tue Oct 14 12:56:22 2008
New Revision: 704648

URL: http://svn.apache.org/viewvc?rev=704648&view=rev
Log:
upgrade ant-launcher (GERONIMO-4212)

Removed:
    geronimo/server/branches/2.1/repository/org/apache/ant/
Modified:
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/repository/pom.xml

Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=704648&r1=704647&r2=704648&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Tue Oct 14 12:56:22 2008
@@ -35,7 +35,7 @@
     load ${gshell.home}/repository/commons-jexl/commons-jexl/1.1/commons-jexl-*.jar
     load ${gshell.home}/repository/jline/jline/0.9.94/jline-*.jar
     load ${gshell.home}/repository/org/apache/ant/ant/1.7.0/ant-*.jar
-    load ${gshell.home}/repository/org/apache/ant/ant-launcher/1.7.0-G589756/ant-launcher-*.jar
+    load ${gshell.home}/repository/org/apache/ant/ant-launcher/1.7.1/ant-launcher-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/gshell/gshell-cli/1.0-alpha-1/gshell-cli-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/gshell/gshell-command-api/1.0-alpha-1/gshell-command-api-*.jar
     load ${gshell.home}/repository/org/apache/geronimo/gshell/gshell-core/1.0-alpha-1/gshell-core-*.jar

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=704648&r1=704647&r2=704648&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Oct 14 12:56:22 2008
@@ -1429,7 +1429,7 @@
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-launcher</artifactId>
-                <version>1.7.0-G589756</version>
+                <version>1.7.1</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=704648&r1=704647&r2=704648&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Tue Oct 14 12:56:22 2008
@@ -143,12 +143,6 @@
             <version>8.0-20060801</version>
         </dependency>
 
-        <!-- See GERONIMO-3858 -->
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-launcher</artifactId>
-        </dependency>
-
         <!-- See GERONIMO-4262 -->
         <dependency>
             <groupId>org.apache.activemq</groupId>