github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependency juggling

pull/516/head
Justin Richer 2013-09-24 15:39:25 -04:00
parent e0f7b54c6c
commit f227724caa
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openid-connect-common/pom.xml
View File

@ -41,6 +41,12 @@
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>
<version>${spring.security.version}</version> <version>${spring.security.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>

40
openid-connect-server-webapp/pom.xml
View File

@ -61,13 +61,25 @@
<artifactId>openid-connect-server</artifactId> <artifactId>openid-connect-server</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.springframework</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>spring-orm</artifactId>
<version>${org.slf4j-version}</version> <version>${org.springframework-version}</version>
<scope>runtime</scope> <exclusions>
</dependency> <!-- Exclude Commons Logging in favor of SLF4j -->
<dependency> <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> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j-version}</version> <version>${org.slf4j-version}</version>
@ -116,17 +128,11 @@
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId> <artifactId>spring-security-taglibs</artifactId>
<version>${spring.security.version}</version> <version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${org.springframework-version}</version>
<exclusions> <exclusions>
<!-- Exclude Commons Logging in favor of SLF4j --> <exclusion>
<exclusion> <groupId>org.springframework</groupId>
<groupId>commons-logging</groupId> <artifactId>*</artifactId>
<artifactId>commons-logging</artifactId> </exclusion>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>