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

Fix dependencies in testsuite, adapters and Quarkus module

Browse source 
---
Quarkus3 branch sync no. 11 (24.3.2023)
Resolved conflicts:
keycloak/adapters/oidc/spring-security/pom.xml - Modified
This commit is contained in:
Martin Bartoš 2023-01-06 16:49:04 +01:00 committed by Václav Muzikář
parent 384d7c17f7
commit 40c38e0133
25 changed files with 58 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapters/oidc/jaxrs-oauth-client/pom.xml
View file

@ -71,8 +71,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
adapters/oidc/servlet-filter/pom.xml
View file

@ -88,8 +88,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
adapters/oidc/spring-security/pom.xml
View file

@ -55,8 +55,8 @@
<artifactId>keycloak-policy-enforcer</artifactId> <artifactId>keycloak-policy-enforcer</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
adapters/oidc/undertow/pom.xml
View file

@ -84,8 +84,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
adapters/oidc/wildfly-elytron/pom.xml
View file

@ -85,8 +85,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
adapters/saml/undertow/pom.xml
View file

@ -67,8 +67,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
adapters/spi/jboss-adapter-core/pom.xml
View file

@ -65,8 +65,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
adapters/spi/undertow-adapter-spi/pom.xml
View file

@ -56,8 +56,8 @@
<artifactId>keycloak-common</artifactId> <artifactId>keycloak-common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
examples/kerberos/pom.xml
View file

@ -35,8 +35,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
examples/ldap/pom.xml
View file

@ -33,8 +33,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

14
pom.xml
View file

@ -168,7 +168,7 @@
<oracle-jdbc.version>21.5.0.0</oracle-jdbc.version> <oracle-jdbc.version>21.5.0.0</oracle-jdbc.version>
<!-- Test --> <!-- Test -->
<greenmail.version>1.3.1b</greenmail.version> <greenmail.version>2.0.0-alpha-3</greenmail.version>
<hamcrest.version>2.2</hamcrest.version> <hamcrest.version>2.2</hamcrest.version>
<jmeter.version>2.10</jmeter.version> <jmeter.version>2.10</jmeter.version>
<junit.version>4.13.2</junit.version> <junit.version>4.13.2</junit.version>
@ -545,16 +545,6 @@
<artifactId>jackson-jaxrs-base</artifactId> <artifactId>jackson-jaxrs-base</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>${servlet.api.30.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId>
<version>${servlet.api.40.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.picketlink</groupId> <groupId>org.picketlink</groupId>
<artifactId>picketlink-wildfly-common</artifactId> <artifactId>picketlink-wildfly-common</artifactId>
@ -1039,7 +1029,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-query-jakarta</artifactId> <artifactId>infinispan-query-dsl</artifactId>
<version>${infinispan.version}</version> <version>${infinispan.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>

2
quarkus/pom.xml
View file

@ -78,7 +78,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId> <artifactId>infinispan-server-hotrod-jakarta</artifactId>
<version>${infinispan.version}</version> <version>${infinispan.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
quarkus/runtime/pom.xml
View file

@ -481,7 +481,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId> <artifactId>infinispan-server-hotrod-jakarta</artifactId>
<version>${infinispan.version}</version> <version>${infinispan.version}</version>
</dependency> </dependency>
<dependency> <dependency>

5
testsuite/db-allocator-plugin/pom.xml
View file

@ -56,6 +56,11 @@
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId> <artifactId>resteasy-client</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

4
testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml
View file

@ -20,8 +20,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml
View file

@ -38,8 +38,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/pom.xml
View file

@ -23,8 +23,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
testsuite/integration-arquillian/test-apps/pom.xml
View file

@ -23,6 +23,6 @@
<module>servlets</module> <module>servlets</module>
<module>app-profile-jee</module> <module>app-profile-jee</module>
<module>cors</module> <module>cors</module>
<module>spring-boot-adapter-app</module> <!--<module>spring-boot-adapter-app</module>-->
</modules> </modules>
</project> </project>

4
testsuite/integration-arquillian/test-apps/servlet-authz/pom.xml
View file

@ -30,8 +30,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

6
testsuite/integration-arquillian/test-apps/servlets/pom.xml
View file

@ -14,10 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<!-- wherever this is being deployed, the Servlet API spec should already be there.
Therefore, make this provided to avoid mixing APIs on the target -->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

6
testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
View file

@ -49,6 +49,12 @@
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-boot-2-adapter</artifactId> <artifactId>keycloak-spring-boot-2-adapter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java
View file

@ -41,7 +41,7 @@ import org.keycloak.testsuite.util.KeystoreUtils;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import static io.smallrye.common.constraint.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.keycloak.common.util.KeystoreUtil.KeystoreFormat.PKCS12; import static org.keycloak.common.util.KeystoreUtil.KeystoreFormat.PKCS12;

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java
View file

@ -63,7 +63,7 @@ public class MailServer {
log.info("-------------------------------------------------------"); log.info("-------------------------------------------------------");
} }
} }
} catch (IOException | InterruptedException | MessagingException ex) { } catch (IOException | MessagingException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
} }

7
testsuite/integration-arquillian/util/pom.xml
View file

@ -60,7 +60,7 @@
<!-- Ability to compile/run jsp on undertow --> <!-- Ability to compile/run jsp on undertow -->
<groupId>io.undertow.jastow</groupId> <groupId>io.undertow.jastow</groupId>
<artifactId>jastow</artifactId> <artifactId>jastow</artifactId>
<version>2.1.0.Final</version> <version>2.2.5.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@ -92,5 +92,10 @@
<artifactId>sshd-core</artifactId> <artifactId>sshd-core</artifactId>
<version>2.7.0</version> <version>2.7.0</version>
</dependency> </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
testsuite/utils/pom.xml
View file

@ -35,6 +35,10 @@
<dependencies> <dependencies>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>