Enable KeycloakServer again by re-enabling undertow adapters
--- Quarkus3 branch sync #2 (20.1.2023) Resolved conflicts: keycloak/testsuite/utils/pom.xml - Modified
This commit is contained in:
parent
40c38e0133
commit
ab6ca6e63d
4 changed files with 13 additions and 7 deletions
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue