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

Upgrade to WildFly 26.1.0.Final (#11094)

Browse source 
Closes #10999
This commit is contained in:
Stian Thorgersen 2022-04-20 08:38:10 +02:00 committed by GitHub
parent 8b1869482d
commit b79f01c72d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/module.xml
View file

@ -38,7 +38,21 @@
<module name="org.jgroups"/> <module name="org.jgroups"/>
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.wildfly.clustering.marshalling.api"/> <module name="org.wildfly.clustering.marshalling.api"/>
<module name="io.netty"/> <module name="io.netty.netty-buffer"/>
<module name="io.netty.netty-codec"/>
<module name="io.netty.netty-codec-dns"/>
<module name="io.netty.netty-codec-http"/>
<module name="io.netty.netty-codec-http2"/>
<module name="io.netty.netty-codec-socks"/>
<module name="io.netty.netty-common"/>
<module name="io.netty.netty-handler"/>
<module name="io.netty.netty-handler-proxy"/>
<module name="io.netty.netty-resolver"/>
<module name="io.netty.netty-resolver-dns"/>
<module name="io.netty.netty-transport"/>
<module name="io.netty.netty-transport-native-epoll"/>
<module name="io.netty.netty-transport-native-kqueue"/>
<module name="io.netty.netty-transport-native-unix-common"/>
<module name="javax.api"/> <module name="javax.api"/>
</dependencies> </dependencies>
</module> </module>

16
distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/module.xml
View file

@ -38,7 +38,21 @@
<module name="org.jgroups"/> <module name="org.jgroups"/>
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.wildfly.clustering.marshalling.api"/> <module name="org.wildfly.clustering.marshalling.api"/>
<module name="io.netty"/> <module name="io.netty.netty-buffer"/>
<module name="io.netty.netty-codec"/>
<module name="io.netty.netty-codec-dns"/>
<module name="io.netty.netty-codec-http"/>
<module name="io.netty.netty-codec-http2"/>
<module name="io.netty.netty-codec-socks"/>
<module name="io.netty.netty-common"/>
<module name="io.netty.netty-handler"/>
<module name="io.netty.netty-handler-proxy"/>
<module name="io.netty.netty-resolver"/>
<module name="io.netty.netty-resolver-dns"/>
<module name="io.netty.netty-transport"/>
<module name="io.netty.netty-transport-native-epoll"/>
<module name="io.netty.netty-transport-native-kqueue"/>
<module name="io.netty.netty-transport-native-unix-common"/>
<module name="javax.api"/> <module name="javax.api"/>
</dependencies> </dependencies>
</module> </module>

6
pom.xml
View file

@ -59,10 +59,10 @@
<product.rhsso.version>7.5.0.GA</product.rhsso.version> <product.rhsso.version>7.5.0.GA</product.rhsso.version>
<product.build-time>${timestamp}</product.build-time> <product.build-time>${timestamp}</product.build-time>
<wildfly.version>26.0.1.Final</wildfly.version> <wildfly.version>26.1.0.Final</wildfly.version>
<wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version> <wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
<eap.version>7.4.0.GA-redhat-00005</eap.version> <eap.version>7.4.0.GA-redhat-00005</eap.version>
<wildfly.core.version>18.0.4.Final</wildfly.core.version> <wildfly.core.version>18.1.0.Final</wildfly.core.version>
<jboss.as.version>7.2.0.Final</jboss.as.version> <jboss.as.version>7.2.0.Final</jboss.as.version>
<jboss.as.subsystem.test.version>7.5.22.Final-redhat-1</jboss.as.subsystem.test.version> <jboss.as.subsystem.test.version>7.5.22.Final-redhat-1</jboss.as.subsystem.test.version>
@ -119,7 +119,7 @@
<woodstox.version>6.0.3</woodstox.version> <woodstox.version>6.0.3</woodstox.version>
<xmlsec.version>2.2.3</xmlsec.version> <xmlsec.version>2.2.3</xmlsec.version>
<glassfish.json.version>1.1.6</glassfish.json.version> <glassfish.json.version>1.1.6</glassfish.json.version>
<wildfly.common.version>1.5.4.Final</wildfly.common.version> <wildfly.common.version>1.6.0.Final</wildfly.common.version>
<ua-parser.version>1.5.2</ua-parser.version> <ua-parser.version>1.5.2</ua-parser.version>
<picketbox.version>5.0.3.Final</picketbox.version> <picketbox.version>5.0.3.Final</picketbox.version>
<google.guava.version>30.1-jre</google.guava.version> <google.guava.version>30.1-jre</google.guava.version>

8
testsuite/integration-arquillian/tests/pom.xml
View file

@ -1102,7 +1102,7 @@
<cache.server.config.dir>${cache.server.home}/standalone/configuration</cache.server.config.dir> <cache.server.config.dir>${cache.server.home}/standalone/configuration</cache.server.config.dir>
<keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern> <keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern>
<keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled> <keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>
<keycloak.connectionsInfinispan.hotrodProtocolVersion>2.9</keycloak.connectionsInfinispan.hotrodProtocolVersion> <keycloak.connectionsInfinispan.hotrodProtocolVersion>PROTOCOL_VERSION_30</keycloak.connectionsInfinispan.hotrodProtocolVersion>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -1173,7 +1173,7 @@
<cache.server.config.dir>${cache.server.home}/standalone/configuration</cache.server.config.dir> <cache.server.config.dir>${cache.server.home}/standalone/configuration</cache.server.config.dir>
<keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern> <keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern>
<keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled> <keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>
<keycloak.connectionsInfinispan.hotrodProtocolVersion>2.9</keycloak.connectionsInfinispan.hotrodProtocolVersion> <keycloak.connectionsInfinispan.hotrodProtocolVersion>PROTOCOL_VERSION_30</keycloak.connectionsInfinispan.hotrodProtocolVersion>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -1244,7 +1244,7 @@
<auth.server.crossdc>true</auth.server.crossdc> <auth.server.crossdc>true</auth.server.crossdc>
<keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern> <keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern>
<keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled> <keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>
<keycloak.connectionsInfinispan.hotrodProtocolVersion>2.9</keycloak.connectionsInfinispan.hotrodProtocolVersion> <keycloak.connectionsInfinispan.hotrodProtocolVersion>PROTOCOL_VERSION_30</keycloak.connectionsInfinispan.hotrodProtocolVersion>
<skip.clean.second.cache>true</skip.clean.second.cache> <skip.clean.second.cache>true</skip.clean.second.cache>
</properties> </properties>
<build> <build>
@ -1341,7 +1341,7 @@
<auth.server.crossdc>true</auth.server.crossdc> <auth.server.crossdc>true</auth.server.crossdc>
<keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern> <keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n</keycloak.testsuite.logging.pattern>
<keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled> <keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>false</keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled>
<keycloak.connectionsInfinispan.hotrodProtocolVersion>2.9</keycloak.connectionsInfinispan.hotrodProtocolVersion> <keycloak.connectionsInfinispan.hotrodProtocolVersion>PROTOCOL_VERSION_30</keycloak.connectionsInfinispan.hotrodProtocolVersion>
<skip.clean.second.cache>true</skip.clean.second.cache> <skip.clean.second.cache>true</skip.clean.second.cache>
</properties> </properties>
<build> <build>

2
wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml
View file

@ -19,7 +19,7 @@
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works --> <!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
<config> <config>
<extension-module>org.jboss.as.connector</extension-module> <extension-module>org.jboss.as.connector</extension-module>
<subsystem xmlns="urn:jboss:domain:datasources:6.0"> <subsystem xmlns="urn:jboss:domain:datasources:7.0">
<datasources> <datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}"> <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url> <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>