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/09/13 11:04:42 UTC
svn commit: r575230 - in /geronimo/sandbox/gshell/trunk/gshell-assembly:
pom.xml src/main/assembly/bin.xml
Author: jdillon
Date: Thu Sep 13 02:04:42 2007
New Revision: 575230
URL: http://svn.apache.org/viewvc?rev=575230&view=rev
Log:
Use the gshell-embeddable in the assembly
Modified:
geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=575230&r1=575229&r2=575230&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Thu Sep 13 02:04:42 2007
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-core</artifactId>
+ <artifactId>gshell-embeddable</artifactId>
<version>${version}</version>
</dependency>
@@ -57,17 +57,13 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.commands</groupId>
- <artifactId>gshell-builtins</artifactId>
- <version>${version}</version>
- </dependency>
-
+ <!--
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-optional</artifactId>
<version>${version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.slf4j</groupId>
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=575230&r1=575229&r2=575230&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 Thu Sep 13 02:04:42 2007
@@ -65,30 +65,28 @@
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>org.apache.geronimo.gshell:gshell-bootstrap</exclude>
- <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
-
- <!--
- FIXME: Why is this making it in here?
- -->
- <exclude>junit:junit</exclude>
- </excludes>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.apache.geronimo.gshell:gshell-embeddable</include>
+ <include>org.apache.geronimo.gshell:gshell-cli</include>
+ <include>org.slf4j:jcl104-over-slf4j</include>
+ <include>org.slf4j:slf4j-log4j12</include>
+ <include>org.apache.geronimo.gshell:gshell-diet-log4j</include>
+ </includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib/boot</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.codehaus.plexus:plexus-classworlds</include>
</includes>
</dependencySet>
- <!--
- NOTE: Strip off the version number to keep platform scripts simpler.
- -->
<dependencySet>
<outputDirectory>lib/boot</outputDirectory>
<outputFileNameMapping>gshell-bootstrap.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.geronimo.gshell:gshell-bootstrap</include>
</includes>