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 2008/06/03 13:32:14 UTC
svn commit: r662746 - in /geronimo/gshell/trunk: gshell-assembly/pom.xml
gshell-diet/
gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
pom.xml
Author: jdillon
Date: Tue Jun 3 04:32:13 2008
New Revision: 662746
URL: http://svn.apache.org/viewvc?rev=662746&view=rev
Log:
Drop the diet muck, don't help much anymore and not worth the build complexity
Removed:
geronimo/gshell/trunk/gshell-diet/
Modified:
geronimo/gshell/trunk/gshell-assembly/pom.xml
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
geronimo/gshell/trunk/pom.xml
Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=662746&r1=662745&r2=662746&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/pom.xml Tue Jun 3 04:32:13 2008
@@ -60,11 +60,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-diet-log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
</dependency>
Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java?rev=662746&r1=662745&r2=662746&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java Tue Jun 3 04:32:13 2008
@@ -263,7 +263,7 @@
excludes.add("gshell-clp");
excludes.add("gshell-api");
excludes.add("gshell-common");
- excludes.add("gshell-diet-log4j");
+ excludes.add("log4j");
excludes.add("gshell-i18n");
excludes.add("gshell-io");
excludes.add("gshell-plugin");
Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=662746&r1=662745&r2=662746&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Tue Jun 3 04:32:13 2008
@@ -70,15 +70,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.0</version>
- <exclusions>
- <!--
- NOTE: Using our *diet* version of Log4j instead to save some pounds of unwanted fat.
- -->
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -91,6 +82,24 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -469,7 +478,6 @@
<modules>
<module>gshell-buildsupport</module>
- <module>gshell-diet</module>
<module>gshell-api</module>
<module>gshell-support</module>
<module>gshell-bootstrap</module>