From ab6ca6e63d2ff375dbb0dfd6dc1cb6405d1b4e6e Mon Sep 17 00:00:00 2001 From: Stefan Guilhen <sguilhen@redhat.com> Date: Fri, 6 Jan 2023 16:03:43 -0300 Subject: [PATCH] Enable KeycloakServer again by re-enabling undertow adapters --- Quarkus3 branch sync #2 (20.1.2023) Resolved conflicts: keycloak/testsuite/utils/pom.xml - Modified --- adapters/oidc/pom.xml | 4 ++-- adapters/saml/pom.xml | 4 ++-- .../java/org/keycloak/dom/saml/v2/ac/package-info.java | 2 +- testsuite/utils/pom.xml | 10 ++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml index a41e5584d931..f40e1ff77cb6 100755 --- a/adapters/oidc/pom.xml +++ b/adapters/oidc/pom.xml @@ -41,9 +41,9 @@ <module>spring-boot-adapter-core</module> <module>spring-boot-container-bundle</module> <module>spring-security</module> - <module>tomcat</module> + <module>tomcat</module> --> <module>undertow</module> - <module>wildfly</module> + <!-- <module>wildfly</module> <module>wildfly-elytron</module>--> </modules> </project> diff --git a/adapters/saml/pom.xml b/adapters/saml/pom.xml index 26293784a0c4..aafeb291e296 100755 --- a/adapters/saml/pom.xml +++ b/adapters/saml/pom.xml @@ -34,8 +34,8 @@ <module>core-public</module> <module>core</module> <!--<module>jetty</module>--> - <!--<module>undertow</module> - <module>tomcat</module>--> + <module>undertow</module> + <!-- <module>tomcat</module>--> <module>wildfly</module> <module>servlet-filter</module> <module>jakarta-servlet-filter</module> diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java index 5acb6a4d3068..4a0cde97bd76 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java @@ -22,5 +22,5 @@ // Generated on: 2008.12.08 at 05:45:20 PM CST // -@javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:ac", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.keycloak.dom.saml.v2.ac; +@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:ac", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.keycloak.dom.saml.v2.ac; diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index 1792eace8606..4e09e1b7250e 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -58,7 +58,7 @@ </dependency> <dependency> <groupId>org.keycloak</groupId> - <artifactId>keycloak-admin-client</artifactId> + <artifactId>keycloak-admin-client-jakarta</artifactId> </dependency> <dependency> <groupId>org.keycloak</groupId> @@ -116,6 +116,12 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-undertow</artifactId> + <exclusions> + <exclusion> + <groupId>io.undertow</groupId> + <artifactId>undertow-servlet-jakarta</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> @@ -222,7 +228,7 @@ </dependency> <dependency> <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> + <artifactId>infinispan-core-jakarta</artifactId> </dependency> <dependency> <groupId>org.infinispan</groupId>