commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject svn commit: r1055296 - in /commons/proper/dbcp: branches/DBCP_1_4_x_BRANCH/pom.xml branches/DBCP_1_4_x_BRANCH/src/changes/changes.xml trunk/pom.xml trunk/src/changes/changes.xml
Date Wed, 05 Jan 2011 04:52:56 GMT
Author: psteitz
Date: Wed Jan  5 04:52:56 2011
New Revision: 1055296

URL: http://svn.apache.org/viewvc?rev=1055296&view=rev
Log:
Test transitive dependencies brought in by geronimo-transaction created
version conflicts (commons logging and junit).  These have been explicitly
excluded in the POM.
Reported and patched by Jeremy Whiting

Modified:
    commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/pom.xml
    commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/changes/changes.xml
    commons/proper/dbcp/trunk/pom.xml
    commons/proper/dbcp/trunk/src/changes/changes.xml

Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/pom.xml?rev=1055296&r1=1055295&r2=1055296&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/pom.xml (original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/pom.xml Wed Jan  5 04:52:56 2011
@@ -196,6 +196,16 @@
       <artifactId>geronimo-transaction</artifactId>
        <version>1.2-beta</version>
        <scope>test</scope>
+       <exclusions>
+         <exclusion>
+           <artifactId>junit</artifactId>
+           <groupId>junit</groupId>
+         </exclusion>
+         <exclusion>
+           <artifactId>commons-logging</artifactId>
+           <groupId>commons-logging</groupId>
+         </exclusion>
+       </exclusions>
     </dependency>
   </dependencies>
 

Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/changes/changes.xml?rev=1055296&r1=1055295&r2=1055296&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/changes/changes.xml (original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/changes/changes.xml Wed Jan  5 04:52:56
2011
@@ -39,6 +39,11 @@ The <action> type attribute can be add,u
   </properties>
   <body>
     <release version="1.4.1" date="TBD" description="TBD">
+      <action dev="psteitz" issue="DBCP-344" due-to="Jeremy Whiting">
+        Test transitive dependencies brought in by geronimo-transaction created
+        version conflicts (commons logging and junit).  These have been explicitly
+        excluded in the POM.
+      </action>
       <action dev="psteitz" issue="DBCP-348" due-to="Eiji Takahashi>
         BasicDataSourceFactory incorrectly used "initConnectSqls" in versions
         1.3 and 1.4 of DBCP as the property name for connectionInitSqls.

Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=1055296&r1=1055295&r2=1055296&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Wed Jan  5 04:52:56 2011
@@ -196,6 +196,16 @@
       <artifactId>geronimo-transaction</artifactId>
        <version>1.2-beta</version>
        <scope>test</scope>
+       <exclusions>
+         <exclusion>
+           <artifactId>junit</artifactId>
+           <groupId>junit</groupId>
+         </exclusion>
+         <exclusion>
+           <artifactId>commons-logging</artifactId>
+           <groupId>commons-logging</groupId>
+         </exclusion>
+       </exclusions>
     </dependency>
   </dependencies>
 

Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1055296&r1=1055295&r2=1055296&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Wed Jan  5 04:52:56 2011
@@ -39,6 +39,11 @@ The <action> type attribute can be add,u
   </properties>
   <body>
     <release version="1.4.1" date="TBD" description="TBD">
+      <action dev="psteitz" issue="DBCP-344" due-to="Jeremy Whiting">
+        Test transitive dependencies brought in by geronimo-transaction created
+        version conflicts (commons logging and junit).  These have been explicitly
+        excluded in the POM.
+      </action>
       <action dev="psteitz" issue="DBCP-348" due-to="Eiji Takahashi>
         BasicDataSourceFactory incorrectly used "initConnectSqls" in versions
         1.3 and 1.4 of DBCP as the property name for connectionInitSqls.



Mime
View raw message