Skip to content

Commit d337e14

Browse files
praseodymjricher
authored andcommitted
Remove transitive commons-logging dependencies
We use slf4j instead; jcl-over-slf4j needs to be a compile-time dependency because we use it in several classes. Unfortunately Maven does not have a way to exclude commons-logging globally, so we need to figure out which dependencies include it through `mvn dependency:tree` and specify an `<exclusion>` for each of them. Finally, we upgrade to slf4j 1.7.12: http://www.slf4j.org/news.html.
1 parent b89fa70 commit d337e14

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

openid-connect-common/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<dependency>
3232
<groupId>org.springframework</groupId>
3333
<artifactId>spring-core</artifactId>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>commons-logging</groupId>
37+
<artifactId>commons-logging</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541
<dependency>
3642
<groupId>org.springframework</groupId>

openid-connect-server-webapp/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@
9494
<dependency>
9595
<groupId>org.springframework</groupId>
9696
<artifactId>spring-orm</artifactId>
97+
<exclusions>
98+
<exclusion>
99+
<groupId>commons-logging</groupId>
100+
<artifactId>commons-logging</artifactId>
101+
</exclusion>
102+
</exclusions>
97103
</dependency>
98104
<dependency>
99105
<groupId>org.slf4j</groupId>

pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
<properties>
7272
<java-version>1.7</java-version>
73-
<org.slf4j-version>1.7.7</org.slf4j-version>
73+
<org.slf4j-version>1.7.12</org.slf4j-version>
7474
</properties>
7575
<description>A reference implementation of OpenID Connect (http://openid.net/connect/), OAuth 2.0, and UMA built on top of Java, Spring, and Spring Security. The project contains a fully functioning server, client, and utility library.</description>
7676
<url>https://github.com/mitreid-connect</url>
@@ -353,7 +353,6 @@
353353
<groupId>org.slf4j</groupId>
354354
<artifactId>jcl-over-slf4j</artifactId>
355355
<version>${org.slf4j-version}</version>
356-
<scope>runtime</scope>
357356
</dependency>
358357
<dependency>
359358
<groupId>org.slf4j</groupId>
@@ -510,6 +509,10 @@
510509
<groupId>org.slf4j</groupId>
511510
<artifactId>slf4j-jdk14</artifactId>
512511
</dependency>
512+
<dependency>
513+
<groupId>org.slf4j</groupId>
514+
<artifactId>jcl-over-slf4j</artifactId>
515+
</dependency>
513516
<dependency>
514517
<groupId>javax.servlet</groupId>
515518
<artifactId>servlet-api</artifactId>

0 commit comments

Comments
 (0)