From c0a9be95fb8f237dbd8b34ee0d158fa23a0295b4 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 17 Dec 2009 17:12:21 +0000
Subject: [PATCH] commons logging exclusion for openjpa

---
 pom.xml | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index b87496f45..e7da6cc99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,16 +26,6 @@
 		         </exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.aspects</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
-			<version>1.6.5.RELEASE</version>
-		</dependency>		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.orm</artifactId>
@@ -52,6 +42,18 @@
 			<version>${spring.version}</version>
 		</dependency>
 		
+		<!-- AspectJ -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.aspects</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
+			<version>1.6.5.RELEASE</version>
+		</dependency>
+				
 		<!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -129,6 +131,13 @@
 			<artifactId>com.springsource.org.apache.openjpa</artifactId>
 			<version>1.1.0</version>
 			<scope>runtime</scope>
+			<exclusions>
+				<!-- Exclude Commons Logging in favor of SLF4j (see 'Logging' Dependency Config below) -->
+				<exclusion>
+					<groupId>org.apache.commons.logging</groupId>
+					<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+		         </exclusion>
+			</exclusions>			
 		</dependency>
 
 		<!-- Servlet -->
@@ -199,22 +208,22 @@
 	<repositories>
 		<repository>
 			<id>com.springsource.repository.bundles.release</id>
-			<name>SpringSource Enterprise Bundle Repository - SpringSource Releases</name>
+			<name>EBR Spring Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</repository>
 		<repository>
 			<id>com.springsource.repository.bundles.external</id>
-			<name>SpringSource Enterprise Bundle Repository - External Releases</name>
+			<name>EBR External Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/external</url>
 		</repository>
 		<repository>
 			<id>com.springsource.repository.bundles.milestone</id>
-			<name>SpringSource Enterprise Bundle Repository - SpringSource Milestones</name>
+			<name>EBR Spring Milestones</name>
 			<url>http://repository.springsource.com/maven/bundles/milestone</url>
 		</repository>
 		<repository>
 			<id>com.springsource.repository.bundles.snapshot</id>
-			<name>SpringSource Enterprise Bundle Repository - Snapshot Releases</name>
+			<name>EBR Spring Snapshots</name>
 			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
 		</repository>
 	</repositories>