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/20 23:40:05 UTC
svn commit: r966020 - in /openjpa/trunk: openjpa-all/pom.xml
openjpa-integration/slf4j/pom.xml openjpa-lib/pom.xml openjpa/pom.xml
Author: dwoods
Date: Tue Jul 20 21:40:05 2010
New Revision: 966020
URL: http://svn.apache.org/viewvc?rev=966020&view=rev
Log:
OPENJPA-1735 Mark commons-logging as provided in the build to remove transient maven dependency
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-integration/slf4j/pom.xml
openjpa/trunk/openjpa-lib/pom.xml
openjpa/trunk/openjpa/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=966020&r1=966019&r2=966020&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Tue Jul 20 21:40: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/trunk/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/slf4j/pom.xml?rev=966020&r1=966019&r2=966020&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/slf4j/pom.xml Tue Jul 20 21:40:05 2010
@@ -55,13 +55,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
- <exclusions>
- <!-- remove commons-logging depend during SLF4J testing -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=966020&r1=966019&r2=966020&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Tue Jul 20 21:40: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/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=966020&r1=966019&r2=966020&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Tue Jul 20 21:40:05 2010
@@ -137,7 +137,7 @@
<Bundle-Activator>org.apache.openjpa.persistence.osgi.PersistenceActivator</Bundle-Activator>
<Private-Package />
<Export-Package>org.apache.openjpa.*;version=${project.version}</Export-Package>
- <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,javax.transaction.*;version="[1.1.0,1.2)";resolution:=optional,javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,javax.persistence.*;version="[2.0.0,2.1)",*</Import-Package>
+ <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,org.slf4j.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,javax.transaction.*;version="[1.1.0,1.2)";resolution:=optional,javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,javax.persistence.*;version="[1.1.0,2.1)",*</Import-Package>
<!-- Eclipse metadata -->
<Eclipse-Autostart>false</Eclipse-Autostart>
<Bundle-ClassPath>.</Bundle-ClassPath>