From 526e25abc7dbccf9711a6eaa884205595613deab Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 8 Jan 2015 09:53:43 +0100
Subject: [PATCH] Fixes for commons-io dep issues in KeycloakServer

---
 integration/adapter-core/pom.xml              |  5 ----
 .../KeycloakDeploymentBuilderTest.java        | 27 -------------------
 .../src/test/resources/keycloak.json          |  4 +--
 pom.xml                                       |  6 -----
 testsuite/performance-web/pom.xml             |  6 -----
 5 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml
index 0190268ed7..bda770f32b 100755
--- a/integration/adapter-core/pom.xml
+++ b/integration/adapter-core/pom.xml
@@ -56,11 +56,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
diff --git a/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java b/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java
index 71c03bd581..40390f9968 100644
--- a/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java
+++ b/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java
@@ -1,22 +1,11 @@
 package org.keycloak.adapters;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.bouncycastle.util.encoders.Base64;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 import org.keycloak.enums.SslRequired;
 import org.keycloak.enums.TokenStore;
 import org.keycloak.util.PemUtils;
 
-import javax.net.ssl.SSLSocketFactory;
-import java.io.File;
-import java.io.IOException;
-import java.security.PublicKey;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -25,22 +14,6 @@ import static org.junit.Assert.assertTrue;
  */
 public class KeycloakDeploymentBuilderTest {
 
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder();
-
-    @Before
-    public void before() throws IOException {
-        File dir = folder.newFolder();
-        FileUtils.copyInputStreamToFile(getClass().getResourceAsStream("/cacerts.jks"), new File(dir, "cacerts.jks"));
-        FileUtils.copyInputStreamToFile(getClass().getResourceAsStream("/keystore.jks"), new File(dir, "keystore.jks"));
-        System.setProperty("testResources", dir.getAbsolutePath());
-    }
-
-    @After
-    public void after() {
-        System.getProperties().remove("testResources");
-    }
-
     @Test
     public void load() throws Exception {
         KeycloakDeployment deployment = KeycloakDeploymentBuilder.build(getClass().getResourceAsStream("/keycloak.json"));
diff --git a/integration/adapter-core/src/test/resources/keycloak.json b/integration/adapter-core/src/test/resources/keycloak.json
index 2eb6e1f109..32a8df3371 100644
--- a/integration/adapter-core/src/test/resources/keycloak.json
+++ b/integration/adapter-core/src/test/resources/keycloak.json
@@ -19,9 +19,9 @@
     "connection-pool-size": 20,
     "disable-trust-manager": true,
     "allow-any-hostname": true,
-    "truststore": "${testResources}/cacerts.jks",
+    "truststore": "classpath:/cacerts.jks",
     "truststore-password": "changeit",
-    "client-keystore": "${testResources}/keystore.jks",
+    "client-keystore": "classpath:/keystore.jks",
     "client-keystore-password": "changeit",
     "client-key-password": "password",
     "auth-server-url-for-backend-requests": "https://backend:8443/auth",
diff --git a/pom.xml b/pom.xml
index c99e0b2cef..97b5f6d460 100755
--- a/pom.xml
+++ b/pom.xml
@@ -303,12 +303,6 @@
                 <version>4.11</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <scope>test</scope>
-                <version>2.4</version>
-            </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-all</artifactId>
diff --git a/testsuite/performance-web/pom.xml b/testsuite/performance-web/pom.xml
index c5f0b3707e..40a4897d75 100755
--- a/testsuite/performance-web/pom.xml
+++ b/testsuite/performance-web/pom.xml
@@ -89,12 +89,6 @@
             <artifactId>resteasy-undertow</artifactId>
             <version>${resteasy.version.latest}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_java</artifactId>