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

Remove bc dependency from server-spi and server-spi-private (#13319)

Browse source 
Closes #12858
This commit is contained in:
David Anderson 2022-07-26 04:52:16 -05:00 committed by GitHub
parent ee2c5391bd
commit 865a180c00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi-private/main/module.xml
View file

@ -30,7 +30,6 @@
<module name="org.keycloak.keycloak-common"/> <module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/> <module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-server-spi"/> <module name="org.keycloak.keycloak-server-spi"/>
<module name="org.bouncycastle" />
<module name="javax.api"/> <module name="javax.api"/>
<module name="javax.ws.rs.api"/> <module name="javax.ws.rs.api"/>
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents"/>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi/main/module.xml
View file

@ -24,7 +24,6 @@
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.keycloak.keycloak-common"/> <module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/> <module name="org.keycloak.keycloak-core"/>
<module name="org.bouncycastle" />
<module name="javax.api"/> <module name="javax.api"/>
<module name="javax.ws.rs.api"/> <module name="javax.ws.rs.api"/>
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents"/>

1
distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi-private/main/module.xml
View file

@ -30,7 +30,6 @@
<module name="org.keycloak.keycloak-common"/> <module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/> <module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-server-spi"/> <module name="org.keycloak.keycloak-server-spi"/>
<module name="org.bouncycastle" />
<module name="javax.api"/> <module name="javax.api"/>
<module name="javax.ws.rs.api"/> <module name="javax.ws.rs.api"/>
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents"/>

1
distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi/main/module.xml
View file

@ -24,7 +24,6 @@
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.keycloak.keycloak-common"/> <module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/> <module name="org.keycloak.keycloak-core"/>
<module name="org.bouncycastle" />
<module name="javax.api"/> <module name="javax.api"/>
<module name="javax.ws.rs.api"/> <module name="javax.ws.rs.api"/>
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents"/>

10
server-spi-private/pom.xml
View file

@ -46,16 +46,6 @@
<artifactId>resteasy-core</artifactId> <artifactId>resteasy-core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId> <artifactId>keycloak-core</artifactId>

1
server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
View file

@ -17,7 +17,6 @@
package org.keycloak.models.utils; package org.keycloak.models.utils;
import org.bouncycastle.jcajce.BCFKSLoadStoreParameter;
import org.keycloak.Config; import org.keycloak.Config;
import org.keycloak.Config.Scope; import org.keycloak.Config.Scope;
import org.keycloak.broker.social.SocialIdentityProvider; import org.keycloak.broker.social.SocialIdentityProvider;

7
server-spi-private/src/test/java/org/keycloak/models/CredentialModelBackwardsCompatibilityTest.java
View file

@ -18,7 +18,8 @@
package org.keycloak.models; package org.keycloak.models;
import org.bouncycastle.util.Arrays; import java.util.Arrays;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.MultivaluedHashMap;
@ -56,7 +57,7 @@ public class CredentialModelBackwardsCompatibilityTest {
Assert.assertEquals("foo", credential.getValue()); Assert.assertEquals("foo", credential.getValue());
Assert.assertEquals("foo-device", credential.getDevice()); Assert.assertEquals("foo-device", credential.getDevice());
Assert.assertTrue(Arrays.areEqual(new byte[] { 1, 2, 3 }, credential.getSalt())); Assert.assertTrue(Arrays.equals(new byte[] { 1, 2, 3 }, credential.getSalt()));
Assert.assertEquals(15, credential.getCounter()); Assert.assertEquals(15, credential.getCounter());
Assert.assertEquals(20, credential.getHashIterations()); Assert.assertEquals(20, credential.getHashIterations());
Assert.assertEquals(25, credential.getDigits()); Assert.assertEquals(25, credential.getDigits());
@ -115,7 +116,7 @@ public class CredentialModelBackwardsCompatibilityTest {
CredentialModel password = PasswordCredentialModel.createFromValues("foo", salt, 1000, "pass"); CredentialModel password = PasswordCredentialModel.createFromValues("foo", salt, 1000, "pass");
Assert.assertEquals("pass", password.getValue()); Assert.assertEquals("pass", password.getValue());
Assert.assertTrue(Arrays.areEqual(salt, password.getSalt())); Assert.assertTrue(Arrays.equals(salt, password.getSalt()));
Assert.assertEquals(1000, password.getHashIterations()); Assert.assertEquals(1000, password.getHashIterations());
Assert.assertEquals("foo", password.getAlgorithm()); Assert.assertEquals("foo", password.getAlgorithm());

10
server-spi/pom.xml
View file

@ -41,16 +41,6 @@
<artifactId>resteasy-core</artifactId> <artifactId>resteasy-core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId> <artifactId>keycloak-core</artifactId>