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

Enable KeycloakServer again by re-enabling undertow adapters

Browse source 
---
Quarkus3 branch sync #2 (20.1.2023)
Resolved conflicts:
keycloak/testsuite/utils/pom.xml - Modified
This commit is contained in:
Stefan Guilhen 2023-01-06 16:03:43 -03:00 committed by Václav Muzikář
parent 40c38e0133
commit ab6ca6e63d
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapters/oidc/pom.xml
View file

@ -41,9 +41,9 @@
<module>spring-boot-adapter-core</module> <module>spring-boot-adapter-core</module>
<module>spring-boot-container-bundle</module> <module>spring-boot-container-bundle</module>
<module>spring-security</module> <module>spring-security</module>
<module>tomcat</module> <module>tomcat</module> -->
<module>undertow</module> <module>undertow</module>
<module>wildfly</module> <!-- <module>wildfly</module>
<module>wildfly-elytron</module>--> <module>wildfly-elytron</module>-->
</modules> </modules>
</project> </project>

4
adapters/saml/pom.xml
View file

@ -34,8 +34,8 @@
<module>core-public</module> <module>core-public</module>
<module>core</module> <module>core</module>
<!--<module>jetty</module>--> <!--<module>jetty</module>-->
<!--<module>undertow</module> <module>undertow</module>
<module>tomcat</module>--> <!-- <module>tomcat</module>-->
<module>wildfly</module> <module>wildfly</module>
<module>servlet-filter</module> <module>servlet-filter</module>
<module>jakarta-servlet-filter</module> <module>jakarta-servlet-filter</module>

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

@ -22,5 +22,5 @@
// Generated on: 2008.12.08 at 05:45:20 PM CST // 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;

10
testsuite/utils/pom.xml
View file

@ -58,7 +58,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId> <artifactId>keycloak-admin-client-jakarta</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
@ -116,6 +116,12 @@
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId> <artifactId>resteasy-undertow</artifactId>
<exclusions>
<exclusion>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet-jakarta</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
@ -222,7 +228,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId> <artifactId>infinispan-core-jakarta</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>