Skip to content

Commit ab6ca6e

Browse files
sguilhenvmuzikar
authored andcommitted
Enable KeycloakServer again by re-enabling undertow adapters
--- Quarkus3 branch sync amdev74#2 (20.1.2023) Resolved conflicts: keycloak/testsuite/utils/pom.xml - Modified
1 parent 40c38e0 commit ab6ca6e

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

adapters/oidc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<module>spring-boot-adapter-core</module>
4242
<module>spring-boot-container-bundle</module>
4343
<module>spring-security</module>
44-
<module>tomcat</module>
44+
<module>tomcat</module> -->
4545
<module>undertow</module>
46-
<module>wildfly</module>
46+
<!-- <module>wildfly</module>
4747
<module>wildfly-elytron</module>-->
4848
</modules>
4949
</project>

adapters/saml/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<module>core-public</module>
3535
<module>core</module>
3636
<!--<module>jetty</module>-->
37-
<!--<module>undertow</module>
38-
<module>tomcat</module>-->
37+
<module>undertow</module>
38+
<!-- <module>tomcat</module>-->
3939
<module>wildfly</module>
4040
<module>servlet-filter</module>
4141
<module>jakarta-servlet-filter</module>

saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
// Generated on: 2008.12.08 at 05:45:20 PM CST
2323
//
2424

25-
@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;
25+
@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;
2626

testsuite/utils/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</dependency>
5959
<dependency>
6060
<groupId>org.keycloak</groupId>
61-
<artifactId>keycloak-admin-client</artifactId>
61+
<artifactId>keycloak-admin-client-jakarta</artifactId>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.keycloak</groupId>
@@ -116,6 +116,12 @@
116116
<dependency>
117117
<groupId>org.jboss.resteasy</groupId>
118118
<artifactId>resteasy-undertow</artifactId>
119+
<exclusions>
120+
<exclusion>
121+
<groupId>io.undertow</groupId>
122+
<artifactId>undertow-servlet-jakarta</artifactId>
123+
</exclusion>
124+
</exclusions>
119125
</dependency>
120126
<dependency>
121127
<groupId>org.jboss.resteasy</groupId>
@@ -222,7 +228,7 @@
222228
</dependency>
223229
<dependency>
224230
<groupId>org.infinispan</groupId>
225-
<artifactId>infinispan-core</artifactId>
231+
<artifactId>infinispan-core-jakarta</artifactId>
226232
</dependency>
227233
<dependency>
228234
<groupId>org.infinispan</groupId>

0 commit comments

Comments
 (0)