KEYCLOAK-9709 Upgrade to Wildfly 16

This commit is contained in:
vramik 2019-03-06 13:21:34 +01:00 committed by Hynek Mlnařík
parent 79c4d797db
commit d7313d91e5
16 changed files with 202 additions and 36 deletions

View file

@ -17,7 +17,7 @@
~ limitations under the License.
-->
<domain xmlns="urn:jboss:domain:9.0">
<domain xmlns="urn:jboss:domain:10.0">
<extensions>
<?EXTENSIONS?>

View file

@ -22,7 +22,7 @@
is also started by this host controller file. The other instance must be started
via host-slave.xml
-->
<host name="master" xmlns="urn:jboss:domain:9.0">
<host name="master" xmlns="urn:jboss:domain:10.0">
<extensions>
<?EXTENSIONS?>
</extensions>

View file

@ -17,7 +17,7 @@
~ limitations under the License.
-->
<host xmlns="urn:jboss:domain:9.0">
<host xmlns="urn:jboss:domain:10.0">
<extensions>
<?EXTENSIONS?>
</extensions>

View file

@ -23,7 +23,7 @@
via host-slave.xml
-->
<host name="master" xmlns="urn:jboss:domain:9.0">
<host name="master" xmlns="urn:jboss:domain:10.0">
<extensions>
<?EXTENSIONS?>
</extensions>

View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns="urn:jboss:domain:9.0">
<server xmlns="urn:jboss:domain:10.0">
<extensions>
<?EXTENSIONS?>

View file

@ -578,4 +578,47 @@ if (outcome == failed) of /profile=$clusteredProfile/subsystem=logging/logger=io
echo
end-if
# Migrate from 5.0.0 to 6.0.0
if (result == NON_XA) of /profile=$clusteredProfile/subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:read-attribute(name=mode)
echo Removing NON_XA transaction mode from infinispan/hibernate/entity
/profile=$clusteredProfile/subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:undefine-attribute(name=mode)
echo
end-if
if (result == false) of /profile=$clusteredProfile/subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ExampleDS datasource
/profile=$clusteredProfile/subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$clusteredProfile/subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to KeycloakDS datasource
/profile=$clusteredProfile/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$clusteredProfile/subsystem=ejb3/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ejb3 subsystem
/profile=$clusteredProfile/subsystem=ejb3/:write-attribute(name=statistics-enabled,value=${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$clusteredProfile/subsystem=transactions/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to transactions subsystem
/profile=$clusteredProfile/subsystem=transactions/:write-attribute(name=statistics-enabled,value=${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$clusteredProfile/subsystem=undertow/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to undertow subsystem
/profile=$clusteredProfile/subsystem=undertow/:write-attribute(name=statistics-enabled,value=${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$clusteredProfile/subsystem=webservices/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to webservices subsystem
/profile=$clusteredProfile/subsystem=webservices/:write-attribute(name=statistics-enabled,value=${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
echo *** End Migration of /profile=$clusteredProfile ***

View file

@ -503,4 +503,47 @@ if (outcome == failed) of /profile=$standaloneProfile/subsystem=logging/logger=i
echo
end-if
# Migrate from 5.0.0 to 6.0.0
if (result == NON_XA) of /profile=$standaloneProfile/subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:read-attribute(name=mode)
echo Removing NON_XA transaction mode from infinispan/hibernate/entity
/profile=$standaloneProfile/subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:undefine-attribute(name=mode)
echo
end-if
if (result == false) of /profile=$standaloneProfile/subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ExampleDS datasource
/profile=$standaloneProfile/subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$standaloneProfile/subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to KeycloakDS datasource
/profile=$standaloneProfile/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$standaloneProfile/subsystem=ejb3/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ejb3 subsystem
/profile=$standaloneProfile/subsystem=ejb3/:write-attribute(name=statistics-enabled,value=${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$standaloneProfile/subsystem=transactions/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to transactions subsystem
/profile=$standaloneProfile/subsystem=transactions/:write-attribute(name=statistics-enabled,value=${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$standaloneProfile/subsystem=undertow/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to undertow subsystem
/profile=$standaloneProfile/subsystem=undertow/:write-attribute(name=statistics-enabled,value=${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /profile=$standaloneProfile/subsystem=webservices/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to webservices subsystem
/profile=$standaloneProfile/subsystem=webservices/:write-attribute(name=statistics-enabled,value=${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
echo *** End Migration of /profile=$standaloneProfile ***

View file

@ -574,4 +574,47 @@ if (outcome == failed) of /subsystem=logging/logger=io.jaegertracing.Configurati
echo
end-if
# Migrate from 5.0.0 to 6.0.0
if (result == NON_XA) of /subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:read-attribute(name=mode)
echo Removing NON_XA transaction mode from infinispan/hibernate/entity
/subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:undefine-attribute(name=mode)
echo
end-if
if (result == false) of /subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ExampleDS datasource
/subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to KeycloakDS datasource
/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=ejb3/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ejb3 subsystem
/subsystem=ejb3/:write-attribute(name=statistics-enabled,value=${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=transactions/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to transactions subsystem
/subsystem=transactions/:write-attribute(name=statistics-enabled,value=${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=undertow/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to undertow subsystem
/subsystem=undertow/:write-attribute(name=statistics-enabled,value=${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=webservices/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to webservices subsystem
/subsystem=webservices/:write-attribute(name=statistics-enabled,value=${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
echo *** End Migration ***

View file

@ -463,4 +463,47 @@ if (outcome == failed) of /subsystem=logging/logger=io.jaegertracing.Configurati
echo
end-if
# Migrate from 5.0.0 to 6.0.0
if (result == NON_XA) of /subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:read-attribute(name=mode)
echo Removing NON_XA transaction mode from infinispan/hibernate/entity
/subsystem=infinispan/cache-container=hibernate/local-cache=entity/component=transaction/:undefine-attribute(name=mode)
echo
end-if
if (result == false) of /subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ExampleDS datasource
/subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to KeycloakDS datasource
/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=ejb3/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to ejb3 subsystem
/subsystem=ejb3/:write-attribute(name=statistics-enabled,value=${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=transactions/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to transactions subsystem
/subsystem=transactions/:write-attribute(name=statistics-enabled,value=${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=undertow/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to undertow subsystem
/subsystem=undertow/:write-attribute(name=statistics-enabled,value=${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
if (result == false) of /subsystem=webservices/:read-attribute(name=statistics-enabled)
echo Adding statistics-enabled expression to webservices subsystem
/subsystem=webservices/:write-attribute(name=statistics-enabled,value=${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}})
echo
end-if
echo *** End Migration ***

View file

@ -46,7 +46,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.3_spec</artifactId>
<version>2.3.5.SP1</version>
<version>2.3.9.SP01</version>
<scope>provided</scope>
</dependency>
<dependency>

30
pom.xml
View file

@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>28</version>
<version>29</version>
</parent>
<name>Keycloak</name>
@ -41,32 +41,32 @@
<product.build-time>${timestamp}</product.build-time>
<wildfly.version>15.0.1.Final</wildfly.version>
<wildfly.version>16.0.0.Final</wildfly.version>
<wildfly.build-tools.version>1.2.10.Final</wildfly.build-tools.version>
<eap.version>7.2.0.GA-redhat-00005</eap.version>
<eap.build-tools.version>1.2.10.Final</eap.build-tools.version>
<wildfly.core.version>7.0.0.Final</wildfly.core.version>
<wildfly.core.version>8.0.0.Final</wildfly.core.version>
<jboss.as.version>7.2.0.Final</jboss.as.version>
<!-- Versions used mostly for Undertow server, aligned with WildFly -->
<jboss.aesh.version>0.66.19</jboss.aesh.version>
<aesh.version>1.8</aesh.version>
<aesh.readline.version>1.11</aesh.readline.version>
<aesh.version>1.11</aesh.version>
<aesh.readline.version>1.14</aesh.readline.version>
<apache.httpcomponents.version>4.5.4</apache.httpcomponents.version>
<apache.httpcomponents.httpcore.version>4.4.5</apache.httpcomponents.httpcore.version>
<apache.mime4j.version>0.6</apache.mime4j.version>
<jboss.dmr.version>1.5.0.Final</jboss.dmr.version>
<bouncycastle.version>1.60</bouncycastle.version>
<cxf.version>3.2.5-jbossorg-1</cxf.version>
<cxf.version>3.2.7</cxf.version>
<dom4j.version>2.1.1</dom4j.version>
<github.relaxng.version>2.3.1</github.relaxng.version>
<h2.version>1.4.193</h2.version>
<javax.persistence.version>2.2</javax.persistence.version>
<hibernate.core.version>5.3.7.Final</hibernate.core.version>
<hibernate.c3p0.version>5.3.7.Final</hibernate.c3p0.version>
<infinispan.version>9.4.3.Final</infinispan.version>
<jackson.version>2.9.5</jackson.version>
<hibernate.core.version>5.3.9.Final</hibernate.core.version>
<hibernate.c3p0.version>5.3.9.Final</hibernate.c3p0.version>
<infinispan.version>9.4.8.Final</infinispan.version>
<jackson.version>2.9.8</jackson.version>
<javax.mail.version>1.6.2</javax.mail.version>
<jboss.logging.version>3.3.2.Final</jboss.logging.version>
<jboss.logging.tools.version>2.1.0.Final</jboss.logging.tools.version>
@ -76,17 +76,17 @@
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>1.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>1.0.3.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version>
<resteasy.version>3.6.2.Final</resteasy.version>
<resteasy.undertow.version>3.6.2.Final</resteasy.undertow.version>
<resteasy.version>3.6.3.Final</resteasy.version>
<resteasy.undertow.version>3.6.3.Final</resteasy.undertow.version>
<owasp.html.sanitizer.version>20180219.1</owasp.html.sanitizer.version>
<slf4j-api.version>1.7.22</slf4j-api.version>
<slf4j.version>1.7.22</slf4j.version>
<sun.istack.version>3.0.7</sun.istack.version>
<sun.jaxb.version>2.3.1</sun.jaxb.version>
<org.glassfish.jaxb.xsom.version>2.3.1</org.glassfish.jaxb.xsom.version>
<undertow.version>2.0.15.Final</undertow.version>
<elytron.version>1.7.0.Final</elytron.version>
<elytron.undertow-server.version>1.3.0.Final</elytron.undertow-server.version>
<undertow.version>2.0.19.Final</undertow.version>
<elytron.version>1.8.0.Final</elytron.version>
<elytron.undertow-server.version>1.4.0.Final</elytron.undertow-server.version>
<jetty81.version>8.1.17.v20150415</jetty81.version>
<jetty91.version>9.1.5.v20140505</jetty91.version>
<jetty92.version>9.2.4.v20141103</jetty92.version>

View file

@ -42,9 +42,9 @@
<app.server>undertow</app.server>
<!-- Wildfly deprecated versions -->
<wildfly.deprecated.version>14.0.1.Final</wildfly.deprecated.version>
<wildfly.deprecated.wildfly.core.version>6.0.2.Final</wildfly.deprecated.wildfly.core.version>
<wildfly.deprecated.arquillian.wildfly.container>2.1.0.Final</wildfly.deprecated.arquillian.wildfly.container>
<wildfly.deprecated.version>15.0.1.Final</wildfly.deprecated.version>
<wildfly.deprecated.wildfly.core.version>7.0.0.Final</wildfly.deprecated.wildfly.core.version>
<wildfly.deprecated.arquillian.wildfly.container>2.1.1.Final</wildfly.deprecated.arquillian.wildfly.container>
<!--component versions-->
<!--

View file

@ -19,14 +19,9 @@ package org.keycloak.wildfly.adduser;
import com.fasterxml.jackson.core.type.TypeReference;
import org.aesh.command.CommandDefinition;
import org.aesh.command.impl.activator.AeshCommandActivatorProvider;
import org.aesh.command.impl.activator.AeshOptionActivatorProvider;
import org.aesh.command.impl.completer.AeshCompleterInvocationProvider;
import org.aesh.command.impl.container.AeshCommandContainerBuilder;
import org.aesh.command.impl.converter.AeshConverterInvocationProvider;
import org.aesh.command.impl.invocation.AeshInvocationProviders;
import org.aesh.command.impl.parser.CommandLineParser;
import org.aesh.command.impl.validator.AeshValidatorInvocationProvider;
import org.aesh.command.invocation.InvocationProviders;
import org.aesh.command.option.Option;
import org.aesh.command.Command;
@ -35,8 +30,8 @@ import org.aesh.command.CommandResult;
import org.aesh.command.container.CommandContainer;
import org.aesh.command.invocation.CommandInvocation;
import org.aesh.command.impl.registry.AeshCommandRegistryBuilder;
import org.aesh.command.parser.CommandLineParserException;
import org.aesh.command.registry.CommandRegistry;
import org.aesh.command.registry.CommandRegistryException;
import org.aesh.command.settings.Settings;
import org.aesh.command.settings.SettingsBuilder;
import org.aesh.readline.AeshContext;
@ -274,7 +269,7 @@ public class AddUser {
return new String(passwordArray);
}
private static void printHelp(Command command) throws CommandNotFoundException, CommandLineParserException {
private static void printHelp(Command command) throws CommandNotFoundException, CommandRegistryException {
CommandRegistry registry = new AeshCommandRegistryBuilder().command(command).create();
CommandContainer commandContainer = registry.getCommand(command.getClass().getAnnotation(CommandDefinition.class).name(), null);
String help = commandContainer.printHelp(null);

View file

@ -21,7 +21,7 @@
<extension-module>org.jboss.as.connector</extension-module>
<subsystem xmlns="urn:jboss:domain:datasources:5.0">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<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>
<driver>h2</driver>
<security>
@ -29,7 +29,7 @@
<password>sa</password>
</security>
</datasource>
<datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
<datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url><?KEYCLOAK_DS_CONNECTION_URL?></connection-url>
<driver>h2</driver>
<security>

View file

@ -19,7 +19,7 @@
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
<config default-supplement="default">
<extension-module>org.jboss.as.clustering.infinispan</extension-module>
<subsystem xmlns="urn:jboss:domain:infinispan:7.0">
<subsystem xmlns="urn:jboss:domain:infinispan:8.0">
<?CACHE-CONTAINERS?>
</subsystem>
<supplement name="default">
@ -71,7 +71,6 @@
</cache-container>
<cache-container name="hibernate" module="org.infinispan.hibernate-cache">
<local-cache name="entity">
<transaction mode="NON_XA"/>
<object-memory size="10000"/>
<expiration max-idle="100000"/>
</local-cache>

View file

@ -24,7 +24,7 @@
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
<config>
<extension-module>org.wildfly.extension.undertow</extension-module>
<subsystem xmlns="urn:jboss:domain:undertow:8.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other">
<subsystem xmlns="urn:jboss:domain:undertow:8.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
<buffer-cache name="default"/>
<server name="default-server">
<?AJP?>