geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Donald Woods <dwo...@apache.org>
Subject Re: svn commit: r650176 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/assembly/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/ framework/modules/geronimo-commands/
Date Thu, 24 Apr 2008 02:51:18 GMT
Jason, could you explain this change a little.  Does this mean trunk now 
uses a private build of ANT from the groovy project at Codehaus? 
Shouldn't we just be using a ANT trunk-snapshot instead?

I'd like to merge this change in 2.1.2 to fix the Windows problem, but 
I'm a little weary on pulling in beta/snapshot code at this point....


-Donald


jdillon@apache.org wrote:
> Author: jdillon
> Date: Mon Apr 21 08:41:52 2008
> New Revision: 650176
> 
> URL: http://svn.apache.org/viewvc?rev=650176&view=rev
> Log:
> (GERONIMO-3977) Use gmaven's ant 1.7.0 libraries which are compatible with Groovy and
Windows
> 
> Modified:
>     geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
>     geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
>     geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
>     geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
>     geronimo/server/trunk/pom.xml
> 
> Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=650176&r1=650175&r2=650176&view=diff
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Mon Apr 21
08:41:52 2008
> @@ -109,10 +109,17 @@
>          </dependency>
>          
>          <dependency>
> +            <groupId>org.codehaus.groovy.maven.support</groupId>
> +            <artifactId>ant-1.7.0</artifactId>
> +        </dependency>
> +        
> +        <!--
> +        <dependency>
>              <groupId>org.apache.ant</groupId>
>              <artifactId>ant</artifactId>
>          </dependency>
> -
> +        -->
> +        
>          <dependency>
>              <groupId>org.apache.ant</groupId>
>              <artifactId>ant-launcher</artifactId>
> 
> Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=650176&r1=650175&r2=650176&view=diff
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
(original)
> +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
Mon Apr 21 08:41:52 2008
> @@ -138,7 +138,6 @@
>                  <include>org.apache.yoko:yoko-rmi-spec</include>
>              </includes>
>          </dependencySet>
> -
>      </dependencySets>
>  
>  </assembly>
> 
> Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=650176&r1=650175&r2=650176&view=diff
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
(original)
> +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
Mon Apr 21 08:41:52 2008
> @@ -26,7 +26,8 @@
>  [gshell]
>      load ${gshell.home}/etc
>      load ${gshell.home}/lib/gshell/*.jar
> -    load ${gshell.home}/repository/org/apache/ant/ant/1.7.0/ant-*.jar
> +    load ${gshell.home}/repository/org/codehaus/groovy/maven/support/ant-1.7.0/1.0-beta-4-SNAPSHOT/ant-1.7.0-*.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/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-embeddable/1.0-alpha-1/gshell-embeddable-*.jar
> 
> Modified: geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml?rev=650176&r1=650175&r2=650176&view=diff
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml Mon Apr 21 08:41:52
2008
> @@ -72,9 +72,16 @@
>          </dependency>
>          
>          <dependency>
> +            <groupId>org.codehaus.groovy.maven.support</groupId>
> +            <artifactId>ant-1.7.0</artifactId>
> +        </dependency>
> +
> +        <!--
> +        <dependency>
>              <groupId>org.apache.ant</groupId>
>              <artifactId>ant</artifactId>
>          </dependency>
> +        -->
>          
>          <dependency>
>              <groupId>org.apache.geronimo.framework</groupId>
> 
> Modified: geronimo/server/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=650176&r1=650175&r2=650176&view=diff
> ==============================================================================
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Mon Apr 21 08:41:52 2008
> @@ -1684,11 +1684,19 @@
>              </dependency>
>              
>              <dependency>
> +                <groupId>org.codehaus.groovy.maven.support</groupId>
> +                <artifactId>ant-1.7.0</artifactId>
> +                <version>1.0-beta-4-SNAPSHOT</version>
> +            </dependency>
> +            
> +            <!--
> +            <dependency>
>                  <groupId>org.apache.ant</groupId>
>                  <artifactId>ant</artifactId>
>                  <version>1.7.0</version>
>              </dependency>
> -
> +            -->
> +            
>              <dependency>
>                  <groupId>org.apache.ant</groupId>
>                  <artifactId>ant-launcher</artifactId>
> 
> 
> 

Mime
View raw message