You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/08/29 10:02:50 UTC
svn commit: r570683 - in /geronimo/sandbox/gshell/trunk: gshell-assembly/src/main/assembly/bin.xml gshell-bootstrap/pom.xml gshell-cli/pom.xml gshell-core/pom.xml gshell-diet/gshell-diet-classworlds/ gshell-diet/pom.xml

Author: jdillon
Date: Wed Aug 29 01:02:49 2007
New Revision: 570683

URL: http://svn.apache.org/viewvc?rev=570683&view=rev
Log:
Take classworlds off the diet, some crap in plexus is still using the old classes (blah)

Removed:
    geronimo/sandbox/gshell/trunk/gshell-diet/gshell-diet-classworlds/
Modified:
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
    geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml?rev=570683&r1=570682&r2=570683&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Wed Aug 29 01:02:49 2007
@@ -67,16 +67,18 @@
             <outputDirectory>lib</outputDirectory>
             <excludes>
                 <exclude>org.apache.geronimo.gshell:gshell-bootstrap</exclude>
-                <exclude>org.apache.geronimo.gshell:gshell-diet-classworlds</exclude>
+                <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+                <!--
                 <exclude>org.apache.geronimo.gshell:gshell-assembly</exclude>
                 <exclude>xml-apis:xml-apis</exclude>
+                -->
             </excludes>
         </dependencySet>
 
         <dependencySet>
             <outputDirectory>lib/boot</outputDirectory>
             <includes>
-                <include>org.apache.geronimo.gshell:gshell-diet-classworlds</include>
+                <include>org.codehaus.plexus:plexus-classworlds</include>
             </includes>
         </dependencySet>
         

Modified: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml?rev=570683&r1=570682&r2=570683&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml Wed Aug 29 01:02:49 2007
@@ -35,9 +35,8 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-diet-classworlds</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-classworlds</artifactId>
         </dependency>
     </dependencies>
     

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?rev=570683&r1=570682&r2=570683&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Wed Aug 29 01:02:49 2007
@@ -41,9 +41,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-diet-classworlds</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-classworlds</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=570683&r1=570682&r2=570683&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Wed Aug 29 01:02:49 2007
@@ -41,9 +41,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-diet-classworlds</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-classworlds</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml?rev=570683&r1=570682&r2=570683&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml Wed Aug 29 01:02:49 2007
@@ -41,7 +41,6 @@
     <modules>
         <module>gshell-diet-commons-lang</module>
         <module>gshell-diet-plexus-utils</module>
-        <module>gshell-diet-classworlds</module>
         <module>gshell-diet-log4j</module>
     </modules>