keycloak-aplcache
Changes
integration/adapter-core/pom.xml 5(+0 -5)
integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java 27(+0 -27)
pom.xml 6(+0 -6)
testsuite/performance-web/pom.xml 6(+0 -6)
Details
integration/adapter-core/pom.xml 5(+0 -5)
diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml
index 0190268..bda770f 100755
--- a/integration/adapter-core/pom.xml
+++ b/integration/adapter-core/pom.xml
@@ -57,11 +57,6 @@
<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>
<version>${keycloak.apache.httpcomponents.version}</version>
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 71c03bd..40390f9 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 2eb6e1f..32a8df3 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",
pom.xml 6(+0 -6)
diff --git a/pom.xml b/pom.xml
index c99e0b2..97b5f6d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -304,12 +304,6 @@
<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>
<version>1.3</version>
testsuite/performance-web/pom.xml 6(+0 -6)
diff --git a/testsuite/performance-web/pom.xml b/testsuite/performance-web/pom.xml
index c5f0b37..40a4897 100755
--- a/testsuite/performance-web/pom.xml
+++ b/testsuite/performance-web/pom.xml
@@ -90,12 +90,6 @@
<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>
<exclusions>