dependency juggling

Author: Justin Richer

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>

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>