keycloak-aplcache

KEYCLOAK-6154 Exclude common-logging/codec from keycloak-osgi-thirdparty

1/31/2018 4:49:02 PM

Martin Kanis

Commit: 6b8ec0b

Tree: 61be546

Parents: 179e371

Changes

adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java 1(+0 -1)

distribution/adapters/osgi/thirdparty/pom.xml 10(+10 -0)

Details

adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java 1(+0 -1)

diff --git a/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java b/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
index 61ca06e..a060685 100644
--- a/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
+++ b/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java
@@ -17,7 +17,6 @@
 
 package org.keycloak.adapters.installed;
 
-import org.apache.commons.codec.Charsets;
 import org.keycloak.OAuth2Constants;
 import org.keycloak.OAuthErrorException;
 import org.keycloak.adapters.KeycloakDeployment;

distribution/adapters/osgi/thirdparty/pom.xml 10(+10 -0)

diff --git a/distribution/adapters/osgi/thirdparty/pom.xml b/distribution/adapters/osgi/thirdparty/pom.xml
index f856c6f..3840cfb 100755
--- a/distribution/adapters/osgi/thirdparty/pom.xml
+++ b/distribution/adapters/osgi/thirdparty/pom.xml
@@ -45,6 +45,16 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>