You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2007/03/15 13:43:51 UTC
svn commit: r518608 - in /geronimo/server/trunk/modules:
geronimo-activemq-gbean/ geronimo-axis-builder/ geronimo-client/
geronimo-connector/ geronimo-converter/ geronimo-corba-builder/
geronimo-corba/ geronimo-cxf-builder/ geronimo-cxf/ geronimo-deplo...
Author: akulshreshtha
Date: Thu Mar 15 05:43:49 2007
New Revision: 518608
URL: http://svn.apache.org/viewvc?view=rev&rev=518608
Log:
More dependency pruning
Modified:
geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
geronimo/server/trunk/modules/geronimo-client/pom.xml
geronimo/server/trunk/modules/geronimo-connector/pom.xml
geronimo/server/trunk/modules/geronimo-converter/pom.xml
geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml
geronimo/server/trunk/modules/geronimo-corba/pom.xml
geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
geronimo/server/trunk/modules/geronimo-cxf/pom.xml
geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
geronimo/server/trunk/modules/geronimo-jaxws-builder/pom.xml
geronimo/server/trunk/modules/geronimo-jaxws/pom.xml
geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
geronimo/server/trunk/modules/geronimo-mail/pom.xml
geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
geronimo/server/trunk/modules/geronimo-openejb/pom.xml
geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml
geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
geronimo/server/trunk/modules/geronimo-security/pom.xml
geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
geronimo/server/trunk/modules/geronimo-timer/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
geronimo/server/trunk/modules/geronimo-yoko/pom.xml
Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml Thu Mar 15 05:43:49 2007
@@ -39,25 +39,8 @@
<artifactId>geronimo-activemq-gbean-management</artifactId>
<version>${version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
+
+ <!-- g-j2ee comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -33,13 +33,8 @@
<name>Geronimo :: Axis :: Builder</name>
<dependencies>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <version>${version}</version>
- </dependency>
+ <!-- g-webservices-builder comes transitively from this -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-openejb-builder</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client/pom.xml Thu Mar 15 05:43:49 2007
@@ -33,12 +33,6 @@
<name>Geronimo :: Client</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -46,37 +40,18 @@
<version>${version}</version>
</dependency>
+ <!-- g-system comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
+ <!-- g-j2ee, jta spec, connector spec comes transitively from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Thu Mar 15 05:43:49 2007
@@ -49,34 +49,11 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
</dependency>
+ <!-- g-system, g-management come from this via g-j2ee -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-converter/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-converter/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Thu Mar 15 05:43:49 2007
@@ -33,16 +33,11 @@
<name>Geronimo :: Configuration Converter</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
- </dependency>
+ <!-- g-kernel comes transitively from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <artifactId>geronimo-common</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -37,24 +37,13 @@
<version>${version}</version>
</dependency>
+ <!-- g-security-builder, g-naming-builder comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb-builder</artifactId>
<version>${version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${version}</version>
- </dependency>
-
- <!--- TODO this is bad news. needed for default principal xml -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${version}</version>
- </dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/modules/geronimo-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-corba/pom.xml Thu Mar 15 05:43:49 2007
@@ -31,39 +31,18 @@
<artifactId>geronimo-corba</artifactId>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${version}</version>
- </dependency>
+ <!-- g-kernel, g-security, g-transaction, g-management comes transistively -->
+ <!-- from this via g-connector -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
+ <artifactId>geronimo-openejb</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-timer</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -49,16 +49,11 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>${version}</version>
</dependency>
+ <!-- g-j2ee comes from this via g-openejb -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-cxf</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/pom.xml Thu Mar 15 05:43:49 2007
@@ -42,22 +42,11 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jaxws</artifactId>
<version>${version}</version>
</dependency>
+ <!-- g-naming, g-transaction come from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml Thu Mar 15 05:43:49 2007
@@ -39,18 +39,7 @@
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${version}</version>
- </dependency>
-
+ <!-- g-deployment comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
@@ -60,12 +49,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Thu Mar 15 05:43:49 2007
@@ -35,27 +35,11 @@
<description>Provides hot deployment for Geronimo.</description>
<dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
+ <!-- g-deply-jsr88, g-javaee-deployment_1.1MR3_spec comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-jaxws-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jaxws-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -33,21 +33,20 @@
<name>Geronimo :: JAXWS :: Builder</name>
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jaxws</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${version}</version>
- </dependency>
+
+ <!-- g-namimg-builder comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb-builder</artifactId>
<version>${version}</version>
</dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/modules/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jaxws/pom.xml Thu Mar 15 05:43:49 2007
@@ -45,16 +45,10 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-j2ee</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Thu Mar 15 05:43:49 2007
@@ -45,12 +45,7 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
+ <!-- xbean-reflect, g-management come via g-j2ee from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
@@ -62,27 +57,11 @@
<artifactId>geronimo-clustering</artifactId>
<version>${version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-clustering-wadi</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>jetty-plus</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.tomcat.extras</groupId>
Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Thu Mar 15 05:43:49 2007
@@ -33,22 +33,11 @@
<name>Geronimo :: Mail</name>
<dependencies>
-
+
+ <!-- g-kernel, g-management comes transitively from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -42,20 +42,11 @@
<version>${version}</version>
</dependency>
+ <!-- g-jta_1.1_spec comes from this -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -48,6 +48,7 @@
</exclusions>
</dependency>
+ <!-- g-service-builder coming from this via g-naming-builder -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices-builder</artifactId>
@@ -63,18 +64,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/pom.xml Thu Mar 15 05:43:49 2007
@@ -84,46 +84,13 @@
<artifactId>openejb-client</artifactId>
</dependency>
+ <!-- g-transaction, g-security, g-naming come transitively from this -->
+ <!-- g-j2ee, g-kernel come from this via g-management -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
- </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml Thu Mar 15 05:43:49 2007
@@ -35,13 +35,7 @@
<dependencies>
- <!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
-
+ <!-- g-transaction, g-system come from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
@@ -57,12 +51,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Thu Mar 15 05:43:49 2007
@@ -40,15 +40,10 @@
<version>${version}</version>
</dependency>
+ <!-- g-serveice-builder comes from this -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>geronimo-service-builder</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security/pom.xml Thu Mar 15 05:43:49 2007
@@ -45,22 +45,11 @@
<artifactId>geronimo-interceptor</artifactId>
<version>${version}</version>
</dependency>
-
+
+ <!-- g-system and g-management come from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml Thu Mar 15 05:43:49 2007
@@ -35,16 +35,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
<version>${version}</version>
</dependency>
+ <!-- g-javaee-deployment_1.1MR3_spec comes from this via g-deploy-config -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-timer/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Thu Mar 15 05:43:49 2007
@@ -54,40 +54,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Thu Mar 15 05:43:49 2007
@@ -34,6 +34,7 @@
<dependencies>
+ <!-- g-transaction, g-system comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
@@ -48,28 +49,11 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${version}</version>
</dependency>
+ <!-- g-security comes from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml Thu Mar 15 05:43:49 2007
@@ -35,55 +35,10 @@
<dependencies>
- <!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
-
- <!-- thread pool, for timer -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Thu Mar 15 05:43:49 2007
@@ -33,19 +33,8 @@
<name>Geronimo :: Upgrade</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
+
+ <!-- g-kernel, g-common come from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-yoko/pom.xml?view=diff&rev=518608&r1=518607&r2=518608
==============================================================================
--- geronimo/server/trunk/modules/geronimo-yoko/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-yoko/pom.xml Thu Mar 15 05:43:49 2007
@@ -38,6 +38,7 @@
<version>${version}</version>
</dependency>
+ <!-- g-security-builder, g-naming-builder come via g-openejb-builder -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-corba-builder</artifactId>
@@ -45,77 +46,12 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
-
- <!--- TODO this is bad news. needed for default principal xml -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
+ <!-- g-j2ee, g-core come from this -->
+ <!-- g-util comes via g-system -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
<version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</dependency>
<dependency>