You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/12/10 18:29:17 UTC
svn commit: r725352 - in /geronimo/server/trunk:
framework/configs/j2ee-security/pom.xml plugins/concurrent/pom.xml
plugins/connector-1_6/pom.xml plugins/connector/pom.xml pom.xml
Author: dwoods
Date: Wed Dec 10 09:29:17 2008
New Revision: 725352
URL: http://svn.apache.org/viewvc?rev=725352&view=rev
Log:
fixed commons-logging-1.0.4 from being pulled into the builds by org.apache.geronimo.components.geronimo-transaction-2.1.1
Modified:
geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
geronimo/server/trunk/plugins/concurrent/pom.xml
geronimo/server/trunk/plugins/connector-1_6/pom.xml
geronimo/server/trunk/plugins/connector/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=725352&r1=725351&r2=725352&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Wed Dec 10 09:29:17 2008
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Modified: geronimo/server/trunk/plugins/concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/pom.xml?rev=725352&r1=725351&r2=725352&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/pom.xml Wed Dec 10 09:29:17 2008
@@ -47,15 +47,4 @@
<module>concurrent-deployer</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${txmanagerVersion}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
</project>
Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=725352&r1=725351&r2=725352&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Wed Dec 10 09:29:17 2008
@@ -44,29 +44,5 @@
<module>geronimo-transaction-1_6</module>
<module>transaction-1_6</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.2-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.2-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
</project>
Modified: geronimo/server/trunk/plugins/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/pom.xml?rev=725352&r1=725351&r2=725352&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/pom.xml Wed Dec 10 09:29:17 2008
@@ -45,35 +45,4 @@
<module>transaction</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.1.1</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
</project>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=725352&r1=725351&r2=725352&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Dec 10 09:29:17 2008
@@ -315,6 +315,29 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${txmanagerVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${txmanagerVersion}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${txmanagerVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>