From f227724caaeb889dd00e7fcf3f148801a9443fe5 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Tue, 24 Sep 2013 15:39:25 -0400
Subject: [PATCH] dependency juggling

---
 openid-connect-common/pom.xml        |  6 ++++
 openid-connect-server-webapp/pom.xml | 42 ++++++++++++++++------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml
index 517012815..e0e5c919e 100644
--- a/openid-connect-common/pom.xml
+++ b/openid-connect-common/pom.xml
@@ -41,6 +41,12 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
             <version>${spring.security.version}</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.springframework</groupId>
+            		<artifactId>*</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml
index f6892e28b..6c349f115 100644
--- a/openid-connect-server-webapp/pom.xml
+++ b/openid-connect-server-webapp/pom.xml
@@ -61,13 +61,25 @@
   		<artifactId>openid-connect-server</artifactId>
   		<version>1.1.0-SNAPSHOT</version>
   	</dependency>
-     <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>jcl-over-slf4j</artifactId>
-         <version>${org.slf4j-version}</version>
-         <scope>runtime</scope>
-     </dependency>
-     <dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework-version}</version>
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+  	     <dependency>
+	         <groupId>org.slf4j</groupId>
+	         <artifactId>jcl-over-slf4j</artifactId>
+	         <version>${org.slf4j-version}</version>
+	         <scope>runtime</scope>
+	     </dependency>
+	 <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-log4j12</artifactId>
          <version>${org.slf4j-version}</version>
@@ -116,19 +128,13 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
             <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${org.springframework-version}</version>
             <exclusions>
-                <!-- Exclude Commons Logging in favor of SLF4j -->
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
+            	<exclusion>
+            		<groupId>org.springframework</groupId>
+            		<artifactId>*</artifactId>
+            	</exclusion>
             </exclusions>
         </dependency>
-  	
+
   </dependencies>
 </project>