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 2011/02/04 03:24:33 UTC
svn commit: r1067063 - in /geronimo/server/trunk/framework: ./
buildsupport/car-maven-plugin/
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
buildsupport/geronimo-osgi-plugin/src/main/resources/
configs/client-system/...
Author: gawor
Date: Fri Feb 4 02:24:32 2011
New Revision: 1067063
URL: http://svn.apache.org/viewvc?rev=1067063&view=rev
Log:
remove some unused dependencies
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
geronimo/server/trunk/framework/configs/client-system/pom.xml
geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/online-deployer/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/shutdown/pom.xml
geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/framework/pom.xml
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Fri Feb 4 02:24:32 2011
@@ -129,6 +129,12 @@
<artifactId>geronimo-transformer</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Fri Feb 4 02:24:32 2011
@@ -847,6 +847,7 @@ public abstract class AbstractCarMojo
"org.apache.commons.jexl;version=\"1.1\"," +
"org.apache.commons.jexl.context;version=\"1.1\"," +
"org.apache.commons.jexl.resolver;version=\"1.1\"," +
+ "org.apache.geronimo.main," +
"org.apache.geronimo.cli," +
"org.apache.geronimo.cli.client," +
"org.apache.geronimo.cli.daemon," +
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile Fri Feb 4 02:24:32 2011
@@ -139,9 +139,10 @@ org.osgi.framework.system.packages = \
org.xml.sax.helpers
org.osgi.framework.system.packages.extra = \
- sun.misc,\
- sun.reflect,\
- org.apache.geronimo.transformer,\
+ sun.misc, \
+ sun.reflect, \
+ org.apache.geronimo.main, \
+ org.apache.geronimo.transformer, \
org.apache.karaf.jaas.boot;version=2.1.2
org.osgi.framework.bootdelegation = \
Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Fri Feb 4 02:24:32 2011
@@ -66,11 +66,6 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -63,11 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<type>jar</type>
</dependency>
@@ -108,11 +103,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -73,11 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Fri Feb 4 02:24:32 2011
@@ -85,10 +85,6 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Fri Feb 4 02:24:32 2011
@@ -85,10 +85,6 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -18,11 +18,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Fri Feb 4 02:24:32 2011
@@ -86,10 +86,6 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -73,11 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-obr</artifactId>
<type>jar</type>
</dependency>
@@ -123,11 +118,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Fri Feb 4 02:24:32 2011
@@ -94,11 +94,6 @@
<!--<artifactId>commons-cli</artifactId>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
-
<!-- used by plugin installer -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -83,11 +83,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<type>jar</type>
</dependency>
@@ -153,11 +148,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -78,11 +78,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Feb 4 02:24:32 2011
@@ -45,7 +45,6 @@
<felix.metatype.version>1.0.2</felix.metatype.version>
<jansi.version>1.2</jansi.version>
<junit.version>4.7_1</junit.version>
- <jline.version>0.9.95.20100209</jline.version>
<log4j.version>1.2.16</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.0-RC1</mina.version>
@@ -332,10 +331,6 @@
<artifactId>mina-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -293,11 +293,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Fri Feb 4 02:24:32 2011
@@ -68,11 +68,6 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -63,11 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<type>jar</type>
</dependency>
@@ -118,11 +113,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Fri Feb 4 02:24:32 2011
@@ -69,11 +69,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Fri Feb 4 02:24:32 2011
@@ -83,11 +83,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<type>jar</type>
</dependency>
@@ -153,11 +148,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Fri Feb 4 02:24:32 2011
@@ -37,6 +37,7 @@
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-main</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Feb 4 02:24:32 2011
@@ -41,6 +41,13 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-main</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${project.version}</version>
</dependency>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1067063&r1=1067062&r2=1067063&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Fri Feb 4 02:24:32 2011
@@ -153,18 +153,6 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
- <version>0.9.94_1</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<version>1.1.4c_3</version>
</dependency>