You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2009/01/12 17:37:14 UTC
svn commit: r733834 - in /geronimo/server/branches/2.1: ./
plugins/connector/client-transaction/
plugins/connector/geronimo-connector-builder/
plugins/connector/geronimo-connector/ plugins/connector/transaction/
plugins/jetty/geronimo-jetty6-builder/ p...
Author: linsun
Date: Mon Jan 12 08:36:25 2009
New Revision: 733834
URL: http://svn.apache.org/viewvc?rev=733834&view=rev
Log:
GERONIMO-4506 switch to use txmanager 2.1.2-snapshot in geronimo server 2.1 branch
Modified:
geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml
geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml
geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml
geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml
geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/pom.xml
geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
geronimo/server/branches/2.1/pom.xml
Modified: geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml Mon Jan 12 08:36:25 2009
@@ -83,6 +83,16 @@
<artifactId>geronimo-transformer</artifactId>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml Mon Jan 12 08:36:25 2009
@@ -69,6 +69,12 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml Mon Jan 12 08:36:25 2009
@@ -90,6 +90,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml Mon Jan 12 08:36:25 2009
@@ -95,6 +95,16 @@
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/pom.xml Mon Jan 12 08:36:25 2009
@@ -59,6 +59,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/pom.xml Mon Jan 12 08:36:25 2009
@@ -103,6 +103,12 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/geronimo-timer/pom.xml Mon Jan 12 08:36:25 2009
@@ -58,6 +58,12 @@
<version>${version}</version>
<type>car</type>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Mon Jan 12 08:36:25 2009
@@ -96,6 +96,12 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml Mon Jan 12 08:36:25 2009
@@ -96,6 +96,12 @@
<groupId>org.apache.tomcat.extras</groupId>
<artifactId>juli-adapters</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=733834&r1=733833&r2=733834&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Mon Jan 12 08:36:25 2009
@@ -280,13 +280,13 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -294,7 +294,7 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>