libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Fixes for commons-io dep issues in KeycloakServer

Browse source
This commit is contained in:
Stian Thorgersen 2015-01-08 09:53:43 +01:00
parent dc94fac9f5
commit 526e25abc7
5 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
integration/adapter-core/pom.xml
View file

@ -56,11 +56,6 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>

27
integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java
View file

@ -1,22 +1,11 @@
package org.keycloak.adapters; package org.keycloak.adapters;
import org.apache.commons.io.FileUtils;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; 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.Test;
import org.junit.rules.TemporaryFolder;
import org.keycloak.enums.SslRequired; import org.keycloak.enums.SslRequired;
import org.keycloak.enums.TokenStore; import org.keycloak.enums.TokenStore;
import org.keycloak.util.PemUtils; 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.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -25,22 +14,6 @@ import static org.junit.Assert.assertTrue;
*/ */
public class KeycloakDeploymentBuilderTest { 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 @Test
public void load() throws Exception { public void load() throws Exception {
KeycloakDeployment deployment = KeycloakDeploymentBuilder.build(getClass().getResourceAsStream("/keycloak.json")); KeycloakDeployment deployment = KeycloakDeploymentBuilder.build(getClass().getResourceAsStream("/keycloak.json"));

4
integration/adapter-core/src/test/resources/keycloak.json
View file

@ -19,9 +19,9 @@
"connection-pool-size": 20, "connection-pool-size": 20,
"disable-trust-manager": true, "disable-trust-manager": true,
"allow-any-hostname": true, "allow-any-hostname": true,
"truststore": "${testResources}/cacerts.jks", "truststore": "classpath:/cacerts.jks",
"truststore-password": "changeit", "truststore-password": "changeit",
"client-keystore": "${testResources}/keystore.jks", "client-keystore": "classpath:/keystore.jks",
"client-keystore-password": "changeit", "client-keystore-password": "changeit",
"client-key-password": "password", "client-key-password": "password",
"auth-server-url-for-backend-requests": "https://backend:8443/auth", "auth-server-url-for-backend-requests": "https://backend:8443/auth",

6
pom.xml
View file

@ -303,12 +303,6 @@
<version>4.11</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
<version>2.4</version>
</dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId> <artifactId>hamcrest-all</artifactId>

6
testsuite/performance-web/pom.xml
View file

@ -89,12 +89,6 @@
<artifactId>resteasy-undertow</artifactId> <artifactId>resteasy-undertow</artifactId>
<version>${resteasy.version.latest}</version> <version>${resteasy.version.latest}</version>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.jmeter</groupId> <groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_java</artifactId> <artifactId>ApacheJMeter_java</artifactId>