You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/06/29 19:11:50 UTC
svn commit: r959038 - in /geronimo/server/trunk: ./ framework/
framework/configs/jsr88-deploymentfactory/
framework/configs/karaf-framework/ framework/configs/online-deployer/
framework/configs/shutdown/ framework/modules/ plugins/
plugins/client/clien...
Author: rickmcguire
Date: Tue Jun 29 17:11:49 2010
New Revision: 959038
URL: http://svn.apache.org/viewvc?rev=959038&view=rev
Log:
Dependency updates
Modified:
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/pom.xml
geronimo/server/trunk/framework/configs/shutdown/pom.xml
geronimo/server/trunk/framework/modules/pom.xml
geronimo/server/trunk/framework/pom.xml
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
geronimo/server/trunk/plugins/cxf/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Tue Jun 29 17:11:49 2010
@@ -151,22 +151,6 @@
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</element>
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-log4j12</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>jcl-over-slf4j</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>log4j</groupId>-->
- <!--<artifactId>log4j</artifactId>-->
- <!--</element>-->
<element>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
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=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Jun 29 17:11:49 2010
@@ -45,7 +45,7 @@
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.fileinstall.version>3.0.0</felix.fileinstall.version>
- <felix.framework.version>2.0.5</felix.framework.version>
+ <felix.framework.version>3.1.0-SNAPSHOT</felix.framework.version>
<felix.gogo.version>0.4.0</felix.gogo.version>
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.1.0</felix.plugin.version>
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=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue Jun 29 17:11:49 2010
@@ -161,22 +161,6 @@
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</element>
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-log4j12</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>jcl-over-slf4j</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>log4j</groupId>-->
- <!--<artifactId>log4j</artifactId>-->
- <!--</element>-->
<element>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Tue Jun 29 17:11:49 2010
@@ -111,22 +111,6 @@
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</element>
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-log4j12</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>jcl-over-slf4j</artifactId>-->
- <!--</element>-->
- <!--<element>-->
- <!--<groupId>log4j</groupId>-->
- <!--<artifactId>log4j</artifactId>-->
- <!--</element>-->
<element>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Tue Jun 29 17:11:49 2010
@@ -41,11 +41,6 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- basic set needed for car-maven-plugin -->
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Jun 29 17:11:49 2010
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>2.0.5</version>
+ <version>3.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Jun 29 17:11:49 2010
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<type>jar</type>
@@ -27,11 +22,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
<type>jar</type>
@@ -63,11 +53,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-core</artifactId>
<type>jar</type>
</dependency>
@@ -78,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-management</artifactId>
<type>jar</type>
</dependency>
@@ -198,11 +178,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-registry</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -263,11 +238,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
@@ -277,16 +247,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Tue Jun 29 17:11:49 2010
@@ -69,13 +69,6 @@
<groupId>${tomcatGroupId}</groupId>
<artifactId>tribes</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Tue Jun 29 17:11:49 2010
@@ -95,12 +95,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml Tue Jun 29 17:11:49 2010
@@ -23,16 +23,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<type>car</type>
</dependency>
@@ -48,50 +38,15 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-registry</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Tue Jun 29 17:11:49 2010
@@ -7,8 +7,8 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -101,4 +101,9 @@
<artifactId>wss4j</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml Tue Jun 29 17:11:49 2010
@@ -72,6 +72,16 @@
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: geronimo/server/trunk/plugins/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/pom.xml Tue Jun 29 17:11:49 2010
@@ -69,7 +69,6 @@
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.4.3</version>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -82,6 +81,12 @@
<!-- geronimo specs,
their versions are not the same with those in root pom -->
+
+ <exclusion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
+
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -163,8 +168,7 @@
<exclusion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- </exclusion>
-
+ </exclusion>
<!-- sun jars -->
<exclusion>
<groupId>com.sun.xml.bind</groupId>
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Tue Jun 29 17:11:49 2010
@@ -27,33 +27,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-registry</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/pom.xml Tue Jun 29 17:11:49 2010
@@ -63,12 +63,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>jcl104-over-slf4j</artifactId>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml Tue Jun 29 17:11:49 2010
@@ -36,4 +36,9 @@
<artifactId>openejb-osgi-core</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Tue Jun 29 17:11:49 2010
@@ -122,11 +122,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Tue Jun 29 17:11:49 2010
@@ -88,12 +88,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${project.version}</version>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Jun 29 17:11:49 2010
@@ -60,12 +60,6 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml Tue Jun 29 17:11:49 2010
@@ -89,12 +89,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
- <!--dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency-->
</dependencies>
<build>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jun 29 17:11:49 2010
@@ -73,10 +73,10 @@
<openejbVersion>3.2-SNAPSHOT</openejbVersion>
<openjpaVersion>2.0.0</openjpaVersion>
<derbyVersion>10.5.3.0_1</derbyVersion>
- <cxfVersion>2.1.4</cxfVersion>
+ <cxfVersion>2.1.10</cxfVersion>
<axis2Version>1.5</axis2Version>
<axiomVersion>1.2.8</axiomVersion>
- <springVersion>2.5.6</springVersion>
+ <springVersion>2.5.6-SEC02</springVersion>
<xbeanVersion>3.7</xbeanVersion>
<jetty>jetty8</jetty>
<txmanagerVersion>3.0</txmanagerVersion>
@@ -84,7 +84,7 @@
<tranqlDerbyVersion>1.6</tranqlDerbyVersion>
<monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
- <pax.logging.version>1.5.0</pax.logging.version>
+ <pax.logging.version>1.5.2</pax.logging.version>
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
@@ -628,35 +628,11 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.5</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>1.5.5</version>
- </dependency>
-
- <dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.version}</version>
@@ -901,6 +877,12 @@
<artifactId>commons-lang</artifactId>
<version>2.5</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.3</version>
+ </dependency>
<dependency>
<groupId>commons-el</groupId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Tue Jun 29 17:11:49 2010
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Tue Jun 29 17:11:49 2010
@@ -48,11 +48,6 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml?rev=959038&r1=959037&r2=959038&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml Tue Jun 29 17:11:49 2010
@@ -57,12 +57,6 @@
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<modules>