geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221388 - in /geronimo/server/trunk: framework/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/ framework/configs/j2ee-system/ framework/configs/rmi-naming...
Date Tue, 20 Dec 2011 18:04:18 GMT
Author: djencks
Date: Tue Dec 20 18:04:18 2011
New Revision: 1221388

URL: http://svn.apache.org/viewvc?rev=1221388&view=rev
Log:
GERONIMO-6240 various dependency changes such as removing sxc and reducing dependency on blueprint
bundles

Modified:
    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/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
    geronimo/server/trunk/plugins/aries/aries/pom.xml
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml
    geronimo/server/trunk/plugins/jetty8/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/wab/web-extender/pom.xml

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=1221388&r1=1221387&r2=1221388&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
Tue Dec 20 18:04:18 2011
@@ -63,14 +63,6 @@
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>

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=1221388&r1=1221387&r2=1221388&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
Tue Dec 20 18:04:18 2011
@@ -70,15 +70,6 @@
             <artifactId>asm-all</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </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=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Dec 20 18:04:18 2011
@@ -70,14 +70,6 @@
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>
@@ -130,16 +122,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Dec 20 18:04:18 2011
@@ -36,6 +36,34 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
             <version>${project.version}</version>
@@ -92,26 +120,26 @@
             <artifactId>xbean-naming</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.aries.blueprint</groupId>-->
+            <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+        <!--</dependency>-->
 
         <!-- aries jmx integration -->
-        <dependency>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.aries.jmx</groupId>-->
+            <!--<artifactId>org.apache.aries.jmx</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.aries.jmx</groupId>-->
+            <!--<artifactId>org.apache.aries.jmx.blueprint</artifactId>-->
+        <!--</dependency>-->
 
         <!-- aries jndi integration -->
-        <dependency>
-            <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.aries.jndi</groupId>-->
+            <!--<artifactId>org.apache.aries.jndi</artifactId>-->
+        <!--</dependency>-->
 
     </dependencies>
 
@@ -121,6 +149,15 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <startupFeatures>
+                        <feature>standard</feature>
+                        <feature>management</feature>
+                        <feature>ssh</feature>
+                        <feature>config</feature>
+                        <feature>kar</feature>
+                        <feature>obr</feature>
+                        <feature>framework</feature>
+                    </startupFeatures>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml Tue Dec 20 18:04:18
2011
@@ -35,10 +35,12 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue Dec 20 18:04:18
2011
@@ -82,14 +82,6 @@
             <artifactId>geronimo-jaspi</artifactId>
         </dependency>
 
-        <dependency>
-           <groupId>org.apache.geronimo.bundles</groupId>
-           <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.geronimo.bundles</groupId>
-           <artifactId>sxc-runtime</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Dec 20 18:04:18 2011
@@ -119,18 +119,6 @@
 -->
 
             <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>sxc-jaxb</artifactId>
-                <version>${sxcVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>sxc-runtime</artifactId>
-                <version>${sxcVersion}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-jexl</artifactId>
                 <version>2.0</version>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml Tue Dec 20 18:04:18
2011
@@ -44,11 +44,11 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-blueprint</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-blueprint</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Tue Dec 20
18:04:18 2011
@@ -72,25 +72,26 @@
             <artifactId>activemq-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.ops4j.pax.logging</groupId>-->
+            <!--<artifactId>pax-logging-api</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activeio-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-blueprint</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.xbean</groupId>-->
+            <!--<artifactId>xbean-blueprint</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>-->
+            <!--<artifactId>org.apache.aries.blueprint.api</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Tue Dec 20 18:04:18 2011
@@ -54,10 +54,10 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>-->
+            <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.apache.aries.application</groupId>

Modified: geronimo/server/trunk/plugins/aries/aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries/pom.xml Tue Dec 20 18:04:18 2011
@@ -41,10 +41,10 @@
             <version>${project.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>-->
+            <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+        <!--</dependency>-->
                 
         <dependency>
             <groupId>org.apache.aries.application</groupId>

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Tue Dec 20 18:04:18 2011
@@ -44,7 +44,7 @@
         <module>farming</module>
         <module>plugin-farm</module>
         <module>plugin-farm-member</module>
-        <module>geronimo-plugin-farm-node</module>
+        <!--<module>geronimo-plugin-farm-node</module>-->
         <module>plugin-farm-datasource</module>
     </modules>
 

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml Tue Dec 20 18:04:18
2011
@@ -97,10 +97,11 @@
             <artifactId>org.apache.servicemix.bundles.howl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>-->
+            <!--<artifactId>org.apache.aries.blueprint.api</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>

Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Tue Dec 20 18:04:18 2011
@@ -35,6 +35,18 @@
         Geronimo Administration Console Plugin provides the base console portlets.
     </description>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>jetty8</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml Tue Dec 20 18:04:18 2011
@@ -84,11 +84,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${project.version}</version>
@@ -106,6 +101,11 @@
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jaspi</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Tue Dec 20 18:04:18 2011
@@ -35,6 +35,7 @@
 
     <properties>
         <jettyVersion>8.0.0.M2</jettyVersion>
+        <jetty.version>8.0.0.M2</jetty.version>
     </properties>
 
     <dependencyManagement>
@@ -85,6 +86,12 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-webapp</artifactId>
                 <version>${jettyVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-xml</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -97,6 +104,11 @@
                 <artifactId>jetty-jaspi</artifactId>
                 <version>${jettyVersion}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jettyVersion}</version>
+            </dependency>
             <!-- for JAASLoginModule which we probably don't want -->
             <!--<dependency>-->
             <!--<groupId>org.eclipse.jetty</groupId>-->

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Tue Dec 20 18:04:18
2011
@@ -35,6 +35,18 @@
         Geronimo Administration Console System Database Portlet Plugin allows users to view
information about the internal database and run SQL scripts.
     </description>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>jetty8</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/wab/web-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/pom.xml?rev=1221388&r1=1221387&r2=1221388&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/pom.xml Tue Dec 20 18:04:18 2011
@@ -42,10 +42,10 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-              <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
+        <!--<dependency>-->
+              <!--<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>-->
+            <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.aries.web</groupId>



Mime
View raw message