From 32af1bd3a5ad45638b13f1168e6b6734aad1e0c1 Mon Sep 17 00:00:00 2001 From: Marko Strukelj Date: Thu, 24 Sep 2015 14:22:17 +0200 Subject: [PATCH] KEYCLOAK-2223 Upgrade to WildFly 10.0.0.CR4 --- .../demo-dist/src/main/xslt/standalone.xsl | 6 ++-- .../configuration/domain/subsystems.xml | 23 --------------- .../configuration/domain/template.xml | 28 +++++++++---------- .../standalone/subsystems-ha.xml | 6 ---- .../configuration/standalone/subsystems.xml | 6 ---- .../configuration/standalone/template.xml | 22 ++++++--------- distribution/server-overlay/pom.xml | 2 +- .../cli/keycloak-install-ha.cli | 10 ------- .../assembly.xml | 0 .../cli/keycloak-install.cli | 0 .../{wf9-server-overlay => wildfly}/pom.xml | 0 pom.xml | 6 ++-- testsuite/tomcat6/pom.xml | 5 ---- testsuite/tomcat7/pom.xml | 18 ++++++++---- testsuite/tomcat8/pom.xml | 14 +++++----- 15 files changed, 49 insertions(+), 97 deletions(-) delete mode 100644 distribution/server-overlay/wf9-server-overlay/cli/keycloak-install-ha.cli rename distribution/server-overlay/{wf9-server-overlay => wildfly}/assembly.xml (100%) rename distribution/server-overlay/{wf9-server-overlay => wildfly}/cli/keycloak-install.cli (100%) rename distribution/server-overlay/{wf9-server-overlay => wildfly}/pom.xml (100%) diff --git a/distribution/demo-dist/src/main/xslt/standalone.xsl b/distribution/demo-dist/src/main/xslt/standalone.xsl index 9f52547f68..2110908134 100755 --- a/distribution/demo-dist/src/main/xslt/standalone.xsl +++ b/distribution/demo-dist/src/main/xslt/standalone.xsl @@ -1,7 +1,7 @@ - + jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE h2 diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml index 582aa42e8e..29c6e63889 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml @@ -4,7 +4,6 @@ logging.xml - batch.xml bean-validation.xml keycloak-datasources.xml ee.xml @@ -19,23 +18,17 @@ jsf.xml mail.xml naming.xml - pojo.xml remoting.xml - resource-adapters.xml request-controller.xml - sar.xml security.xml security-manager.xml transactions.xml undertow.xml - webservices.xml - weld.xml keycloak-server.xml logging.xml - batch.xml bean-validation.xml keycloak-datasources.xml ee.xml @@ -52,23 +45,17 @@ mail.xml mod_cluster.xml naming.xml - pojo.xml remoting.xml - resource-adapters.xml request-controller.xml - sar.xml security.xml security-manager.xml transactions.xml undertow.xml - webservices.xml - weld.xml keycloak-server.xml logging.xml - batch.xml bean-validation.xml keycloak-datasources.xml ee.xml @@ -86,23 +73,17 @@ mail.xml messaging.xml naming.xml - pojo.xml remoting.xml - resource-adapters.xml request-controller.xml - sar.xml security.xml security-manager.xml transactions.xml undertow.xml - webservices.xml - weld.xml keycloak-server.xml logging.xml - batch.xml bean-validation.xml keycloak-datasources.xml ee.xml @@ -122,17 +103,13 @@ messaging.xml mod_cluster.xml naming.xml - pojo.xml remoting.xml resource-adapters.xml request-controller.xml - sar.xml security.xml security-manager.xml transactions.xml undertow.xml - webservices.xml - weld.xml keycloak-server.xml diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml index cf3ccccd33..8c4464c591 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml @@ -1,6 +1,6 @@ - + @@ -24,18 +24,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - + @@ -84,4 +80,4 @@ - + \ No newline at end of file diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index 8d89c1385a..728503182f 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -15,7 +15,7 @@ - wf9-server-overlay + wildfly eap6 diff --git a/distribution/server-overlay/wf9-server-overlay/cli/keycloak-install-ha.cli b/distribution/server-overlay/wf9-server-overlay/cli/keycloak-install-ha.cli deleted file mode 100644 index f9a8d29ee1..0000000000 --- a/distribution/server-overlay/wf9-server-overlay/cli/keycloak-install-ha.cli +++ /dev/null @@ -1,10 +0,0 @@ -/subsystem=datasources/data-source=KeycloakDS/:add(connection-url="jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE",driver-name=h2,jndi-name=java:jboss/datasources/KeycloakDS,password=sa,user-name=sa,use-java-context=true) -/subsystem=infinispan/cache-container=keycloak:add(jndi-name="infinispan/Keycloak") -/subsystem=infinispan/cache-container=keycloak/transport=TRANSPORT:add(lock-timeout=60000) -/subsystem=infinispan/cache-container=keycloak/invalidation-cache=realms:add(mode="SYNC") -/subsystem=infinispan/cache-container=keycloak/invalidation-cache=users:add(mode="SYNC") -/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:add(mode="SYNC",owners="1") -/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:add(mode="SYNC",owners="1") -/extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem) -/subsystem=keycloak-server:add(web-context=auth) -:shutdown(restart=true) \ No newline at end of file diff --git a/distribution/server-overlay/wf9-server-overlay/assembly.xml b/distribution/server-overlay/wildfly/assembly.xml similarity index 100% rename from distribution/server-overlay/wf9-server-overlay/assembly.xml rename to distribution/server-overlay/wildfly/assembly.xml diff --git a/distribution/server-overlay/wf9-server-overlay/cli/keycloak-install.cli b/distribution/server-overlay/wildfly/cli/keycloak-install.cli similarity index 100% rename from distribution/server-overlay/wf9-server-overlay/cli/keycloak-install.cli rename to distribution/server-overlay/wildfly/cli/keycloak-install.cli diff --git a/distribution/server-overlay/wf9-server-overlay/pom.xml b/distribution/server-overlay/wildfly/pom.xml similarity index 100% rename from distribution/server-overlay/wf9-server-overlay/pom.xml rename to distribution/server-overlay/wildfly/pom.xml diff --git a/pom.xml b/pom.xml index b074d3f498..b2038aaf6d 100755 --- a/pom.xml +++ b/pom.xml @@ -48,9 +48,9 @@ 1.6.1 1.4.01 1.7.7 - 9.0.2.Final - 1.0.2.Final - 1.0.0.Final + 10.0.0.CR4 + 2.0.1.Final + 1.1.0.Final 7.5.0.Final-redhat-15 diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml index 6a4b45bc43..cc50c0c9b9 100755 --- a/testsuite/tomcat6/pom.xml +++ b/testsuite/tomcat6/pom.xml @@ -184,11 +184,6 @@ org.seleniumhq.selenium selenium-chrome-driver - - org.wildfly - wildfly-undertow - test - org.keycloak keycloak-testsuite-integration diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml index 7ea9b2ec2a..05950a8661 100755 --- a/testsuite/tomcat7/pom.xml +++ b/testsuite/tomcat7/pom.xml @@ -33,6 +33,18 @@ tomcat-embed-core 7.0.59 + + + + io.undertow.jastow + jastow + 2.0.0.Final + + + org.jboss.spec.javax.servlet.jsp + jboss-jsp-api_2.3_spec + 1.0.1.Final + org.keycloak keycloak-dependencies-server-all @@ -204,12 +216,6 @@ org.seleniumhq.selenium selenium-chrome-driver - - org.wildfly - wildfly-undertow - ${wildfly.version} - test - org.keycloak keycloak-testsuite-integration diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml index 7084f09bac..6611d8fa4b 100755 --- a/testsuite/tomcat8/pom.xml +++ b/testsuite/tomcat8/pom.xml @@ -188,12 +188,6 @@ org.seleniumhq.selenium selenium-chrome-driver - - org.wildfly - wildfly-undertow - ${wildfly.version} - test - org.keycloak keycloak-testsuite-integration @@ -222,7 +216,13 @@ ${tomcat.version} - + + + io.undertow.jastow + jastow + 2.0.0.Final + +