You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/07/21 23:32:07 UTC
svn commit: r966426 - in /openjpa/branches/2.0.x: openjpa-all/pom.xml
openjpa-lib/pom.xml openjpa-project/assembly.xml openjpa-project/pom.xml
Author: dwoods
Date: Wed Jul 21 21:32:05 2010
New Revision: 966426
URL: http://svn.apache.org/viewvc?rev=966426&view=rev
Log:
OPENJPA-1735 Mark commons-logging as provided in the build to remove transient maven dependency
Modified:
openjpa/branches/2.0.x/openjpa-all/pom.xml
openjpa/branches/2.0.x/openjpa-lib/pom.xml
openjpa/branches/2.0.x/openjpa-project/assembly.xml
openjpa/branches/2.0.x/openjpa-project/pom.xml
Modified: openjpa/branches/2.0.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-all/pom.xml?rev=966426&r1=966425&r2=966426&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-all/pom.xml Wed Jul 21 21:32:05 2010
@@ -98,7 +98,7 @@
<dependencies>
<!--
- Only include openjpa.jar here, as the maven-shade-plugin will
+ Start with openjpa.jar and let the maven-shade-plugin
determine the transitive dependencies to include from it.
-->
<dependency>
@@ -106,5 +106,10 @@
<artifactId>openjpa</artifactId>
<version>${pom.version}</version>
</dependency>
+ <!-- include commons-logging -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: openjpa/branches/2.0.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-lib/pom.xml?rev=966426&r1=966425&r2=966426&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-lib/pom.xml Wed Jul 21 21:32:05 2010
@@ -42,6 +42,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: openjpa/branches/2.0.x/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/assembly.xml?rev=966426&r1=966425&r2=966426&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/assembly.xml (original)
+++ openjpa/branches/2.0.x/openjpa-project/assembly.xml Wed Jul 21 21:32:05 2010
@@ -94,6 +94,7 @@
<include>commons-lang:commons-lang</include>
<include>commons-collections:commons-collections</include>
<include>commons-pool:commons-pool</include>
+ <include>commons-logging:commons-logging</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec</include>
Modified: openjpa/branches/2.0.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/pom.xml?rev=966426&r1=966425&r2=966426&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-project/pom.xml Wed Jul 21 21:32:05 2010
@@ -428,6 +428,11 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
<!-- excluded optional dependency that user should provide with BV impl
<dependency>
<groupId>org.apache.geronimo.specs</groupId>