From 7a96911a83095386a7017268191b6bf0ca3e1b6c Mon Sep 17 00:00:00 2001 From: vramik Date: Mon, 24 Sep 2018 10:49:47 +0200 Subject: [PATCH] KEYCLOAK-8300 KEYCLOAK-8301 Wildfly 14 upgrade Co-authored-by: Marek Posolda --- .gitignore | 4 +- adapters/oidc/adapter-core/pom.xml | 13 +- .../oidc/as7-eap6/as7-adapter-spi/pom.xml | 14 -- adapters/oidc/as7-eap6/as7-adapter/pom.xml | 13 -- adapters/oidc/as7-eap6/pom.xml | 7 +- adapters/oidc/fuse7/camel-undertow/pom.xml | 12 +- adapters/oidc/fuse7/jetty94/pom.xml | 9 -- adapters/oidc/fuse7/tomcat8/pom.xml | 9 -- adapters/oidc/fuse7/undertow/pom.xml | 12 +- adapters/oidc/installed/pom.xml | 13 -- adapters/oidc/jaxrs-oauth-client/pom.xml | 12 -- adapters/oidc/jetty/jetty-core/pom.xml | 95 +++++------ adapters/oidc/jetty/jetty8.1/pom.xml | 89 +++++------ adapters/oidc/jetty/jetty9.1/pom.xml | 95 ++++++----- adapters/oidc/jetty/jetty9.2/pom.xml | 89 +++++------ adapters/oidc/jetty/jetty9.3/pom.xml | 86 +++++----- adapters/oidc/jetty/jetty9.4/pom.xml | 86 +++++----- adapters/oidc/kcinit/pom.xml | 8 - adapters/oidc/osgi-adapter/pom.xml | 12 +- adapters/oidc/servlet-filter/pom.xml | 10 -- adapters/oidc/servlet-oauth-client/pom.xml | 19 +-- .../oidc/spring-boot-adapter-core/pom.xml | 8 - adapters/oidc/spring-boot/pom.xml | 15 +- adapters/oidc/spring-boot2/pom.xml | 10 -- adapters/oidc/spring-security/pom.xml | 3 - adapters/oidc/tomcat/tomcat-core/pom.xml | 142 ++++++++--------- adapters/oidc/tomcat/tomcat7/pom.xml | 1 - adapters/oidc/tomcat/tomcat8/pom.xml | 100 ++++++------ adapters/oidc/undertow/pom.xml | 13 +- adapters/oidc/wildfly-elytron/pom.xml | 8 +- adapters/oidc/wildfly/wildfly-adapter/pom.xml | 17 +- adapters/saml/as7-eap6/adapter/pom.xml | 13 -- adapters/saml/as7-eap6/pom.xml | 5 + adapters/saml/as7-eap6/subsystem/pom.xml | 10 +- adapters/saml/core-public/pom.xml | 15 +- .../saml/core/nbproject/project.properties | 0 adapters/saml/core/pom.xml | 15 +- adapters/saml/jetty/jetty-core/pom.xml | 67 ++++---- adapters/saml/jetty/jetty9.2/pom.xml | 69 ++++---- adapters/saml/jetty/jetty9.3/pom.xml | 66 ++++---- adapters/saml/jetty/jetty9.4/pom.xml | 66 ++++---- adapters/saml/servlet-filter/pom.xml | 79 +++++---- adapters/saml/tomcat/tomcat-core/pom.xml | 110 ++++++------- adapters/saml/tomcat/tomcat8/pom.xml | 66 ++++---- adapters/saml/undertow/pom.xml | 12 -- adapters/saml/wildfly-elytron/pom.xml | 17 -- adapters/saml/wildfly/wildfly-adapter/pom.xml | 17 +- adapters/spi/adapter-spi/pom.xml | 13 +- adapters/spi/jboss-adapter-core/pom.xml | 20 +-- adapters/spi/jetty-adapter-spi/pom.xml | 61 ++++--- adapters/spi/servlet-adapter-spi/pom.xml | 11 +- adapters/spi/tomcat-adapter-spi/pom.xml | 75 ++++----- adapters/spi/undertow-adapter-spi/pom.xml | 13 +- authz/client/pom.xml | 12 +- authz/policy/pom.xml | 7 +- boms/pom.xml | 2 +- common/pom.xml | 12 +- core/pom.xml | 12 +- dependencies/server-all/pom.xml | 2 - distribution/adapters/osgi/jaas/pom.xml | 5 +- distribution/downloads/pom.xml | 13 -- .../feature-packs/server-feature-pack/pom.xml | 17 -- .../configuration/domain/template.xml | 2 +- .../configuration/host/host-master.xml | 2 +- .../configuration/host/host-slave.xml | 2 +- .../resources/configuration/host/host.xml | 2 +- .../configuration/standalone/template.xml | 2 +- .../content/bin/migrate-domain-clustered.cli | 33 +++- .../content/bin/migrate-domain-standalone.cli | 41 ++++- .../content/bin/migrate-standalone-ha.cli | 43 +++-- .../content/bin/migrate-standalone.cli | 25 +-- .../demo-template/service-account/pom.xml | 2 +- .../demo-template/third-party-cdi/pom.xml | 7 +- examples/multi-tenant/pom.xml | 12 -- examples/providers/authenticator/pom.xml | 8 - federation/kerberos/pom.xml | 16 -- federation/ldap/pom.xml | 32 ---- federation/sssd/pom.xml | 14 -- integration/admin-client/pom.xml | 14 +- integration/client-cli/admin-cli/pom.xml | 8 - .../client-registration-cli/pom.xml | 8 - model/infinispan/pom.xml | 12 -- ...ltInfinispanConnectionProviderFactory.java | 23 ++- .../RemoteCacheSessionsLoader.java | 7 +- model/jpa/pom.xml | 38 +---- .../jpa/entities/PolicyEntity.java | 2 +- .../DefaultJpaConnectionProviderFactory.java | 32 ++-- .../jpa/HibernateStatsReporter.java | 32 ++-- .../connections/jpa/util/JpaUtils.java | 10 +- .../UserConsentClientScopeEntity.java | 2 +- pom.xml | 114 +++++++------ proxy/launcher/pom.xml | 8 - proxy/proxy-server/pom.xml | 12 -- saml-core-api/pom.xml | 13 +- saml-core/pom.xml | 11 +- .../saml/common/util/StaxParserUtil.java | 3 +- server-spi-private/pom.xml | 19 +-- .../models/utils/KeycloakModelUtils.java | 4 +- server-spi/pom.xml | 19 +-- services/pom.xml | 23 +-- .../filters/KeycloakStringEntityFilter.java | 45 ++++++ .../resources/KeycloakApplication.java | 5 + .../integration-arquillian/HOW-TO-RUN.md | 57 +++---- testsuite/integration-arquillian/pom.xml | 15 +- .../jboss/common/ant/configure.xml | 13 +- .../jboss/common/ispn-cache-owners.xsl | 2 +- .../jboss/common/jboss-cli/cross-dc-setup.cli | 21 ++- .../modcluster-simple-load-provider.cli | 7 - .../servers/auth-server/jboss/pom.xml | 19 --- .../main/module.xml | 2 +- .../servers/auth-server/undertow/pom.xml | 15 +- .../cache-server/jboss/infinispan/pom.xml | 22 +++ .../servers/cache-server/jboss/jdg/pom.xml | 28 ++++ .../servers/cache-server/jboss/pom.xml | 31 +--- .../integration-arquillian/servers/pom.xml | 8 +- .../servers/wildfly-balancer/assembly.xml | 46 ------ .../servers/wildfly-balancer/pom.xml | 150 ------------------ .../src/main/scripts/ant/configure.xml | 31 ---- .../scripts/jboss-cli/io-worker-threads.cli | 7 - .../jboss-cli/mod-cluster-balancer.cli | 12 -- .../src/main/scripts/jboss-cli/undertow.cli | 2 - .../test-apps/app-profile-jee/pom.xml | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../integration-arquillian/test-apps/pom.xml | 15 +- .../test-apps/servlets/pom.xml | 4 +- .../integration-arquillian/tests/base/pom.xml | 10 +- .../testsuite/AbstractKeycloakTest.java | 14 ++ .../AbstractPhotozExampleAdapterTest.java | 16 ++ ...PhotozExampleLazyLoadPathsAdapterTest.java | 10 +- ...otozExampleNoLazyLoadPathsAdapterTest.java | 10 +- .../testsuite/admin/PermissionsTest.java | 12 ++ .../testsuite/admin/realm/RealmTest.java | 14 ++ .../exportimport/ExportImportTest.java | 7 +- .../resources/META-INF/keycloak-server.json | 3 +- .../base/src/test/resources/arquillian.xml | 47 +++--- .../tests/other/pom.xml | 2 +- .../integration-arquillian/tests/pom.xml | 86 +++++----- testsuite/integration-deprecated/pom.xml | 67 ++------ testsuite/jetty/jetty92/pom.xml | 34 +--- testsuite/jetty/jetty93/pom.xml | 31 ---- testsuite/jetty/jetty94/pom.xml | 31 ---- testsuite/performance/tests/pom.xml | 3 - testsuite/proxy/pom.xml | 31 ---- testsuite/tomcat7/pom.xml | 33 +--- testsuite/tomcat8/pom.xml | 19 +-- testsuite/utils/pom.xml | 10 -- .../resources/META-INF/keycloak-server.json | 3 +- util/embedded-ldap/pom.xml | 13 -- .../KeycloakServerDeploymentProcessor.java | 6 + .../keycloak-infinispan.xml | 2 +- .../subsystem-templates/keycloak-undertow.xml | 2 +- 151 files changed, 1351 insertions(+), 2309 deletions(-) delete mode 100644 adapters/saml/core/nbproject/project.properties create mode 100644 services/src/main/java/org/keycloak/services/filters/KeycloakStringEntityFilter.java delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/modcluster-simple-load-provider.cli delete mode 100644 testsuite/integration-arquillian/servers/wildfly-balancer/assembly.xml delete mode 100644 testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/ant/configure.xml delete mode 100644 testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/io-worker-threads.cli delete mode 100644 testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/mod-cluster-balancer.cli delete mode 100644 testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/undertow.cli diff --git a/.gitignore b/.gitignore index ec99554f4a..80bdb4578f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ .project .settings .classpath -bin/ +# reverting this as e.g. /distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/ +# should not be ignored +#bin/ .factorypath diff --git a/adapters/oidc/adapter-core/pom.xml b/adapters/oidc/adapter-core/pom.xml index 03535efca8..54bb86a857 100755 --- a/adapters/oidc/adapter-core/pom.xml +++ b/adapters/oidc/adapter-core/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + org.keycloak.adapters.* @@ -61,7 +64,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -107,15 +109,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml b/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml index f883969bf1..d641beccc4 100755 --- a/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml +++ b/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml @@ -47,7 +47,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -86,17 +85,4 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/adapters/oidc/as7-eap6/as7-adapter/pom.xml b/adapters/oidc/as7-eap6/as7-adapter/pom.xml index 05a9d230ee..2a991f578a 100755 --- a/adapters/oidc/as7-eap6/as7-adapter/pom.xml +++ b/adapters/oidc/as7-eap6/as7-adapter/pom.xml @@ -118,17 +118,4 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/adapters/oidc/as7-eap6/pom.xml b/adapters/oidc/as7-eap6/pom.xml index eac7567f8b..da195286ad 100755 --- a/adapters/oidc/as7-eap6/pom.xml +++ b/adapters/oidc/as7-eap6/pom.xml @@ -30,6 +30,11 @@ keycloak-as7-integration-pom pom + + 1.7 + 1.7 + + @@ -47,4 +52,4 @@ as7-adapter as7-subsystem - \ No newline at end of file + diff --git a/adapters/oidc/fuse7/camel-undertow/pom.xml b/adapters/oidc/fuse7/camel-undertow/pom.xml index 694131603d..a4ef48c352 100644 --- a/adapters/oidc/fuse7/camel-undertow/pom.xml +++ b/adapters/oidc/fuse7/camel-undertow/pom.xml @@ -31,6 +31,9 @@ bundle + 1.7 + 1.7 + org.keycloak.adapters.camel.undertow;version="${project.version}" @@ -98,15 +101,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/fuse7/jetty94/pom.xml b/adapters/oidc/fuse7/jetty94/pom.xml index d9caabf92a..d4d7dad73f 100644 --- a/adapters/oidc/fuse7/jetty94/pom.xml +++ b/adapters/oidc/fuse7/jetty94/pom.xml @@ -85,15 +85,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/fuse7/tomcat8/pom.xml b/adapters/oidc/fuse7/tomcat8/pom.xml index 251a1a2390..ac423dfdea 100644 --- a/adapters/oidc/fuse7/tomcat8/pom.xml +++ b/adapters/oidc/fuse7/tomcat8/pom.xml @@ -70,15 +70,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/fuse7/undertow/pom.xml b/adapters/oidc/fuse7/undertow/pom.xml index 453ccb2e91..3122cdb257 100644 --- a/adapters/oidc/fuse7/undertow/pom.xml +++ b/adapters/oidc/fuse7/undertow/pom.xml @@ -31,6 +31,9 @@ bundle + 1.7 + 1.7 + org.keycloak.adapters.osgi.undertow.*;version="${project.version}" @@ -107,15 +110,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/installed/pom.xml b/adapters/oidc/installed/pom.xml index ca82c8aea6..99bb37ac4f 100755 --- a/adapters/oidc/installed/pom.xml +++ b/adapters/oidc/installed/pom.xml @@ -74,17 +74,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/adapters/oidc/jaxrs-oauth-client/pom.xml b/adapters/oidc/jaxrs-oauth-client/pom.xml index 04e271ee7d..2fcb3077ff 100755 --- a/adapters/oidc/jaxrs-oauth-client/pom.xml +++ b/adapters/oidc/jaxrs-oauth-client/pom.xml @@ -87,17 +87,5 @@ provided - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/oidc/jetty/jetty-core/pom.xml b/adapters/oidc/jetty/jetty-core/pom.xml index 3b8191f8b3..ba7e7adf21 100755 --- a/adapters/oidc/jetty/jetty-core/pom.xml +++ b/adapters/oidc/jetty/jetty-core/pom.xml @@ -14,21 +14,24 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-jetty-core - Keycloak Jetty Core Integration + keycloak-jetty-core + Keycloak Jetty Core Integration + 1.7 + 1.7 + 8.1.17.v20150415 org.keycloak.adapters.jetty.core.* @@ -40,18 +43,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - + + org.keycloak + keycloak-core + org.keycloak keycloak-adapter-spi @@ -61,29 +63,29 @@ keycloak-jetty-adapter-spi - org.keycloak - keycloak-adapter-core - - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - + org.keycloak + keycloak-adapter-core + + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + com.fasterxml.jackson.core jackson-core - - + + com.fasterxml.jackson.core jackson-databind - - + + com.fasterxml.jackson.core jackson-annotations - + org.eclipse.jetty jetty-server @@ -105,23 +107,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -154,7 +147,7 @@ - - + + diff --git a/adapters/oidc/jetty/jetty8.1/pom.xml b/adapters/oidc/jetty/jetty8.1/pom.xml index 6220e68076..3e0709af04 100755 --- a/adapters/oidc/jetty/jetty8.1/pom.xml +++ b/adapters/oidc/jetty/jetty8.1/pom.xml @@ -14,21 +14,24 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-jetty81-adapter - Keycloak Jetty 8.1.x Integration + keycloak-jetty81-adapter + Keycloak Jetty 8.1.x Integration + 1.7 + 1.7 + 8.1.17.v20150415 org.keycloak.adapters.jetty.* @@ -39,18 +42,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - + + org.keycloak + keycloak-core + org.keycloak keycloak-adapter-core @@ -63,26 +65,26 @@ org.keycloak keycloak-jetty-core - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + com.fasterxml.jackson.core jackson-core - - + + com.fasterxml.jackson.core jackson-databind - - + + com.fasterxml.jackson.core jackson-annotations - + org.eclipse.jetty jetty-server @@ -104,23 +106,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -153,7 +146,7 @@ - - + + diff --git a/adapters/oidc/jetty/jetty9.1/pom.xml b/adapters/oidc/jetty/jetty9.1/pom.xml index ec49591d22..258eaf751d 100755 --- a/adapters/oidc/jetty/jetty9.1/pom.xml +++ b/adapters/oidc/jetty/jetty9.1/pom.xml @@ -14,20 +14,20 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-jetty91-adapter - Keycloak Jetty 9.1.x Integration + keycloak-jetty91-adapter + Keycloak Jetty 9.1.x Integration 9.1.5.v20140505 @@ -40,18 +40,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - + + org.keycloak + keycloak-core + org.keycloak keycloak-adapter-core @@ -67,33 +66,33 @@ org.eclipse.jetty jetty-util - + org.eclipse.jetty jetty-security - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + com.fasterxml.jackson.core jackson-core - - + + com.fasterxml.jackson.core jackson-databind - - + + com.fasterxml.jackson.core jackson-annotations - + org.eclipse.jetty jetty-server @@ -115,22 +114,22 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - + + junit + junit + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + @@ -164,7 +163,7 @@ - - + + diff --git a/adapters/oidc/jetty/jetty9.2/pom.xml b/adapters/oidc/jetty/jetty9.2/pom.xml index db9736e6b3..f6e4d93fcf 100755 --- a/adapters/oidc/jetty/jetty9.2/pom.xml +++ b/adapters/oidc/jetty/jetty9.2/pom.xml @@ -14,21 +14,24 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-jetty92-adapter - Keycloak Jetty 9.2.x Integration + keycloak-jetty92-adapter + Keycloak Jetty 9.2.x Integration + 1.7 + 1.7 + 9.2.4.v20141103 org.keycloak.adapters.jetty.* @@ -40,18 +43,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - + + org.keycloak + keycloak-core + org.keycloak keycloak-adapter-core @@ -60,26 +62,26 @@ org.keycloak keycloak-jetty-core - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + com.fasterxml.jackson.core jackson-core - - + + com.fasterxml.jackson.core jackson-databind - - + + com.fasterxml.jackson.core jackson-annotations - + org.eclipse.jetty jetty-server @@ -101,23 +103,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -150,7 +143,7 @@ - - + + diff --git a/adapters/oidc/jetty/jetty9.3/pom.xml b/adapters/oidc/jetty/jetty9.3/pom.xml index 898c8a551e..923b251de4 100644 --- a/adapters/oidc/jetty/jetty9.3/pom.xml +++ b/adapters/oidc/jetty/jetty9.3/pom.xml @@ -14,20 +14,20 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-jetty93-adapter - Keycloak Jetty 9.3.x Integration + keycloak-jetty93-adapter + Keycloak Jetty 9.3.x Integration 9.3.9.v20160517 @@ -40,18 +40,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - + + org.keycloak + keycloak-core + org.keycloak keycloak-adapter-core @@ -60,26 +59,26 @@ org.keycloak keycloak-jetty-core - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + com.fasterxml.jackson.core jackson-core - - + + com.fasterxml.jackson.core jackson-databind - - + + com.fasterxml.jackson.core jackson-annotations - + org.eclipse.jetty jetty-server @@ -101,23 +100,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -150,7 +140,7 @@ - - + + diff --git a/adapters/oidc/jetty/jetty9.4/pom.xml b/adapters/oidc/jetty/jetty9.4/pom.xml index 9fa5e7140e..5ecdff894c 100644 --- a/adapters/oidc/jetty/jetty9.4/pom.xml +++ b/adapters/oidc/jetty/jetty9.4/pom.xml @@ -14,20 +14,20 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-jetty94-adapter - Keycloak Jetty 9.4.x Integration + keycloak-jetty94-adapter + Keycloak Jetty 9.4.x Integration 9.4.2.v20170220 @@ -40,18 +40,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - + + org.keycloak + keycloak-core + org.keycloak keycloak-adapter-core @@ -60,26 +59,26 @@ org.keycloak keycloak-jetty-core - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + com.fasterxml.jackson.core jackson-core - - + + com.fasterxml.jackson.core jackson-databind - - + + com.fasterxml.jackson.core jackson-annotations - + org.eclipse.jetty jetty-server @@ -101,23 +100,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -150,7 +140,7 @@ - - + + diff --git a/adapters/oidc/kcinit/pom.xml b/adapters/oidc/kcinit/pom.xml index df85064a1d..fc99f4dafc 100755 --- a/adapters/oidc/kcinit/pom.xml +++ b/adapters/oidc/kcinit/pom.xml @@ -39,14 +39,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.apache.maven.plugins maven-shade-plugin diff --git a/adapters/oidc/osgi-adapter/pom.xml b/adapters/oidc/osgi-adapter/pom.xml index e690e2d4a2..a4089a82c7 100755 --- a/adapters/oidc/osgi-adapter/pom.xml +++ b/adapters/oidc/osgi-adapter/pom.xml @@ -31,6 +31,9 @@ jar + 1.7 + 1.7 + 8.1.17.v20150415 org.keycloak.adapters.osgi.* @@ -104,15 +107,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml index e83cd9a50e..857ca06070 100755 --- a/adapters/oidc/servlet-filter/pom.xml +++ b/adapters/oidc/servlet-filter/pom.xml @@ -45,7 +45,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -97,15 +96,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/servlet-oauth-client/pom.xml b/adapters/oidc/servlet-oauth-client/pom.xml index bd9913c6dd..87cfa1c686 100755 --- a/adapters/oidc/servlet-oauth-client/pom.xml +++ b/adapters/oidc/servlet-oauth-client/pom.xml @@ -30,6 +30,11 @@ Keycloak Servlet OAuth Client + + 1.7 + 1.7 + + org.bouncycastle @@ -74,7 +79,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -83,17 +87,4 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/adapters/oidc/spring-boot-adapter-core/pom.xml b/adapters/oidc/spring-boot-adapter-core/pom.xml index 5ae2065cab..1087574a56 100755 --- a/adapters/oidc/spring-boot-adapter-core/pom.xml +++ b/adapters/oidc/spring-boot-adapter-core/pom.xml @@ -105,12 +105,4 @@ ${spring-boot.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/adapters/oidc/spring-boot/pom.xml b/adapters/oidc/spring-boot/pom.xml index 31d6a0d3be..3b12dea98e 100755 --- a/adapters/oidc/spring-boot/pom.xml +++ b/adapters/oidc/spring-boot/pom.xml @@ -31,6 +31,8 @@ + 1.7 + 1.7 1.4.0.RELEASE 4.1.6.RELEASE 1.9.5 @@ -125,16 +127,5 @@ ${spring-boot.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - - - + diff --git a/adapters/oidc/spring-boot2/pom.xml b/adapters/oidc/spring-boot2/pom.xml index be1d123fd3..388577c771 100755 --- a/adapters/oidc/spring-boot2/pom.xml +++ b/adapters/oidc/spring-boot2/pom.xml @@ -67,13 +67,11 @@ com.fasterxml.jackson.core jackson-databind - 2.9.4 provided com.fasterxml.jackson.core jackson-annotations - 2.9.4 provided @@ -140,12 +138,4 @@ ${spring-boot.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/adapters/oidc/spring-security/pom.xml b/adapters/oidc/spring-security/pom.xml index 76948942c7..79469841e0 100755 --- a/adapters/oidc/spring-security/pom.xml +++ b/adapters/oidc/spring-security/pom.xml @@ -72,19 +72,16 @@ org.slf4j slf4j-api - ${slf4j.version} compile org.jboss.logging jboss-logging - ${jboss.logging.version} compile org.apache.httpcomponents httpclient - ${apache-httpcomponents.version} org.bouncycastle diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml index 24bdc73a6f..815c018d78 100755 --- a/adapters/oidc/tomcat/tomcat-core/pom.xml +++ b/adapters/oidc/tomcat/tomcat-core/pom.xml @@ -14,36 +14,38 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-tomcat-integration-pom - org.keycloak - 4.6.0.Final-SNAPSHOT - ../pom.xml - - 4.0.0 + keycloak-tomcat-integration-pom + org.keycloak + 4.6.0.Final-SNAPSHOT + ../pom.xml + + 4.0.0 - keycloak-tomcat-core-adapter - Keycloak Tomcat Core Integration + keycloak-tomcat-core-adapter + Keycloak Tomcat Core Integration + 1.7 + 1.7 + 6.0.41 - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - - + + org.keycloak + keycloak-core + + org.keycloak keycloak-adapter-spi @@ -51,69 +53,57 @@ org.keycloak keycloak-tomcat-adapter-spi - - org.keycloak - keycloak-adapter-core - - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - + + org.keycloak + keycloak-adapter-core + + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + - - - org.keycloak - keycloak-authz-client - + + + org.keycloak + keycloak-authz-client + - - org.apache.tomcat - catalina + + org.apache.tomcat + tomcat-servlet-api + ${tomcat.version} + compile + + --> + + org.apache.tomcat + catalina ${tomcat.version} - compile - + compile + - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - + + junit + junit + test + + diff --git a/adapters/oidc/tomcat/tomcat7/pom.xml b/adapters/oidc/tomcat/tomcat7/pom.xml index 87bf57f4b2..67e5d80e77 100755 --- a/adapters/oidc/tomcat/tomcat7/pom.xml +++ b/adapters/oidc/tomcat/tomcat7/pom.xml @@ -38,7 +38,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} org.keycloak diff --git a/adapters/oidc/tomcat/tomcat8/pom.xml b/adapters/oidc/tomcat/tomcat8/pom.xml index d39815298c..c9332f9bfc 100755 --- a/adapters/oidc/tomcat/tomcat8/pom.xml +++ b/adapters/oidc/tomcat/tomcat8/pom.xml @@ -14,36 +14,38 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-tomcat-integration-pom - org.keycloak - 4.6.0.Final-SNAPSHOT - ../pom.xml - - 4.0.0 + keycloak-tomcat-integration-pom + org.keycloak + 4.6.0.Final-SNAPSHOT + ../pom.xml + + 4.0.0 - keycloak-tomcat8-adapter - Keycloak Tomcat 8 Integration + keycloak-tomcat8-adapter + Keycloak Tomcat 8 Integration + 1.7 + 1.7 + 8.0.14 - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-core - - + + org.keycloak + keycloak-core + + org.keycloak keycloak-adapter-core @@ -78,43 +80,31 @@ - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + junit + junit + test + + diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml index 0c6c255767..444b60707a 100755 --- a/adapters/oidc/undertow/pom.xml +++ b/adapters/oidc/undertow/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + org.keycloak.adapters.undertow.* @@ -44,7 +47,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -107,15 +109,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/oidc/wildfly-elytron/pom.xml b/adapters/oidc/wildfly-elytron/pom.xml index 55859efd51..7b8ed94ed6 100755 --- a/adapters/oidc/wildfly-elytron/pom.xml +++ b/adapters/oidc/wildfly-elytron/pom.xml @@ -31,11 +31,6 @@ Keycloak Wildfly Elytron OIDC Adapter - - 1.8 - 1.8 - - org.wildfly.common @@ -55,7 +50,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -101,4 +95,4 @@ provided - \ No newline at end of file + diff --git a/adapters/oidc/wildfly/wildfly-adapter/pom.xml b/adapters/oidc/wildfly/wildfly-adapter/pom.xml index 3d893d0929..84a53108a3 100644 --- a/adapters/oidc/wildfly/wildfly-adapter/pom.xml +++ b/adapters/oidc/wildfly/wildfly-adapter/pom.xml @@ -34,7 +34,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -84,7 +83,7 @@ org.picketbox picketbox - 4.0.20.Final + ${picketbox.version} provided @@ -109,17 +108,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - \ No newline at end of file + diff --git a/adapters/saml/as7-eap6/adapter/pom.xml b/adapters/saml/as7-eap6/adapter/pom.xml index 6f157501ff..14670d3d3e 100755 --- a/adapters/saml/as7-eap6/adapter/pom.xml +++ b/adapters/saml/as7-eap6/adapter/pom.xml @@ -63,7 +63,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -114,17 +113,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/saml/as7-eap6/pom.xml b/adapters/saml/as7-eap6/pom.xml index 2e72f02315..58f4c9b8d2 100755 --- a/adapters/saml/as7-eap6/pom.xml +++ b/adapters/saml/as7-eap6/pom.xml @@ -30,6 +30,11 @@ keycloak-saml-eap-integration-pom pom + + 1.7 + 1.7 + + diff --git a/adapters/saml/as7-eap6/subsystem/pom.xml b/adapters/saml/as7-eap6/subsystem/pom.xml index f188aae7ac..a7e835bdad 100755 --- a/adapters/saml/as7-eap6/subsystem/pom.xml +++ b/adapters/saml/as7-eap6/subsystem/pom.xml @@ -30,6 +30,11 @@ jar + + 1.7 + 1.7 + + @@ -64,25 +69,21 @@ org.jboss.as jboss-as-naming - ${jboss.as.version} org.jboss.as jboss-as-server - ${jboss.as.version} org.jboss.as jboss-as-ee - ${jboss.as.version} org.jboss.as jboss-as-web - ${jboss.as.version} @@ -103,7 +104,6 @@ projects that depend on this project.--> org.jboss.as jboss-as-controller - ${jboss.as.version} diff --git a/adapters/saml/core-public/pom.xml b/adapters/saml/core-public/pom.xml index bea8c85008..7a01fc2d79 100755 --- a/adapters/saml/core-public/pom.xml +++ b/adapters/saml/core-public/pom.xml @@ -32,6 +32,9 @@ + 1.7 + 1.7 + ${maven.build.timestamp} yyyy-MM-dd HH:mm @@ -67,17 +70,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/saml/core/nbproject/project.properties b/adapters/saml/core/nbproject/project.properties deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/adapters/saml/core/pom.xml b/adapters/saml/core/pom.xml index b22f4a23c7..998c97ebdc 100755 --- a/adapters/saml/core/pom.xml +++ b/adapters/saml/core/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + ${maven.build.timestamp} yyyy-MM-dd HH:mm @@ -82,17 +85,5 @@ provided - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/saml/jetty/jetty-core/pom.xml b/adapters/saml/jetty/jetty-core/pom.xml index 4efa9dba56..a1a74c9ace 100755 --- a/adapters/saml/jetty/jetty-core/pom.xml +++ b/adapters/saml/jetty/jetty-core/pom.xml @@ -14,21 +14,24 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-saml-jetty-adapter-core - Keycloak Jetty Core SAML Integration + keycloak-saml-jetty-adapter-core + Keycloak Jetty Core SAML Integration + 1.7 + 1.7 + 8.1.17.v20150415 org.keycloak.adapters.jetty.core.* @@ -40,13 +43,12 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} org.keycloak @@ -69,13 +71,13 @@ keycloak-saml-adapter-core - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + org.eclipse.jetty jetty-server @@ -97,23 +99,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -146,7 +139,7 @@ - - + + diff --git a/adapters/saml/jetty/jetty9.2/pom.xml b/adapters/saml/jetty/jetty9.2/pom.xml index 19bcb57816..1e66b286e5 100755 --- a/adapters/saml/jetty/jetty9.2/pom.xml +++ b/adapters/saml/jetty/jetty9.2/pom.xml @@ -14,21 +14,24 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-saml-jetty92-adapter - Keycloak Jetty 9.2.x SAML Integration + keycloak-saml-jetty92-adapter + Keycloak Jetty 9.2.x SAML Integration + 1.7 + 1.7 + 9.2.4.v20141103 org.keycloak.adapters.jetty.* @@ -40,22 +43,21 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-common - - - org.bouncycastle - bcprov-jdk15on - + + org.keycloak + keycloak-common + + + org.bouncycastle + bcprov-jdk15on + org.keycloak keycloak-saml-adapter-api-public @@ -107,23 +109,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -156,7 +149,7 @@ - - + + diff --git a/adapters/saml/jetty/jetty9.3/pom.xml b/adapters/saml/jetty/jetty9.3/pom.xml index 9fd6e66062..1bf6ef71f4 100644 --- a/adapters/saml/jetty/jetty9.3/pom.xml +++ b/adapters/saml/jetty/jetty9.3/pom.xml @@ -14,20 +14,20 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-saml-jetty93-adapter - Keycloak Jetty 9.3.x SAML Integration + keycloak-saml-jetty93-adapter + Keycloak Jetty 9.3.x SAML Integration 9.3.9.v20160517 @@ -40,22 +40,21 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-common - - - org.bouncycastle - bcprov-jdk15on - + + org.keycloak + keycloak-common + + + org.bouncycastle + bcprov-jdk15on + org.keycloak keycloak-saml-adapter-api-public @@ -107,23 +106,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -156,7 +146,7 @@ - - + + diff --git a/adapters/saml/jetty/jetty9.4/pom.xml b/adapters/saml/jetty/jetty9.4/pom.xml index 8337be8bce..ce8d41a07d 100644 --- a/adapters/saml/jetty/jetty9.4/pom.xml +++ b/adapters/saml/jetty/jetty9.4/pom.xml @@ -14,20 +14,20 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../../pom.xml - - 4.0.0 + ../../../../pom.xml + + 4.0.0 - keycloak-saml-jetty94-adapter - Keycloak Jetty 9.4.x SAML Integration + keycloak-saml-jetty94-adapter + Keycloak Jetty 9.4.x SAML Integration 9.4.2.v20170220 @@ -40,22 +40,21 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-common - - - org.bouncycastle - bcprov-jdk15on - + + org.keycloak + keycloak-common + + + org.bouncycastle + bcprov-jdk15on + org.keycloak keycloak-saml-adapter-api-public @@ -107,23 +106,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -156,7 +146,7 @@ - - + + diff --git a/adapters/saml/servlet-filter/pom.xml b/adapters/saml/servlet-filter/pom.xml index 85a76adbcf..0d01825ca6 100755 --- a/adapters/saml/servlet-filter/pom.xml +++ b/adapters/saml/servlet-filter/pom.xml @@ -14,32 +14,37 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak - 4.6.0.Final-SNAPSHOT - ../../../pom.xml - - 4.0.0 + keycloak-parent + org.keycloak + 4.6.0.Final-SNAPSHOT + ../../../pom.xml + + 4.0.0 - keycloak-saml-servlet-filter-adapter - Keycloak SAML Servlet Filter - + keycloak-saml-servlet-filter-adapter + Keycloak SAML Servlet Filter + - + + 1.7 + 1.7 + + + org.jboss.logging jboss-logging - - org.keycloak - keycloak-common - - + + org.keycloak + keycloak-common + + org.keycloak keycloak-adapter-spi @@ -47,19 +52,19 @@ org.keycloak keycloak-servlet-adapter-spi - - org.bouncycastle - bcprov-jdk15on - + + org.bouncycastle + bcprov-jdk15on + org.keycloak keycloak-saml-core - - org.keycloak - keycloak-saml-adapter-api-public - - + + org.keycloak + keycloak-saml-adapter-api-public + + org.keycloak keycloak-saml-adapter-core @@ -68,23 +73,11 @@ jboss-servlet-api_3.0_spec provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - + + junit + junit + test + + diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml index 5528675d06..155b4185f1 100755 --- a/adapters/saml/tomcat/tomcat-core/pom.xml +++ b/adapters/saml/tomcat/tomcat-core/pom.xml @@ -14,38 +14,40 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-saml-tomcat-integration-pom - org.keycloak - 4.6.0.Final-SNAPSHOT - ../pom.xml - - 4.0.0 + keycloak-saml-tomcat-integration-pom + org.keycloak + 4.6.0.Final-SNAPSHOT + ../pom.xml + + 4.0.0 - keycloak-saml-tomcat-adapter-core - Keycloak Tomcat Core SAML Integration + keycloak-saml-tomcat-adapter-core + Keycloak Tomcat Core SAML Integration + 1.7 + 1.7 + 6.0.41 - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-common - - + + org.keycloak + keycloak-common + + org.keycloak keycloak-adapter-spi @@ -53,58 +55,46 @@ org.keycloak keycloak-tomcat-adapter-spi - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + org.keycloak keycloak-saml-core - - org.keycloak - keycloak-saml-adapter-api-public - - + + org.keycloak + keycloak-saml-adapter-api-public + + org.keycloak keycloak-saml-adapter-core - - org.apache.tomcat - catalina + + org.apache.tomcat + tomcat-servlet-api + ${tomcat.version} + compile + + --> + + org.apache.tomcat + catalina ${tomcat.version} - compile - + compile + - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - + + junit + junit + test + + diff --git a/adapters/saml/tomcat/tomcat8/pom.xml b/adapters/saml/tomcat/tomcat8/pom.xml index 7011ff3d1c..9a3da15939 100755 --- a/adapters/saml/tomcat/tomcat8/pom.xml +++ b/adapters/saml/tomcat/tomcat8/pom.xml @@ -14,30 +14,32 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-saml-tomcat-integration-pom - org.keycloak - 4.6.0.Final-SNAPSHOT - ../pom.xml - - 4.0.0 + keycloak-saml-tomcat-integration-pom + org.keycloak + 4.6.0.Final-SNAPSHOT + ../pom.xml + + 4.0.0 - keycloak-saml-tomcat8-adapter - Keycloak Tomcat 8 SAML Integration + keycloak-saml-tomcat8-adapter + Keycloak Tomcat 8 SAML Integration + 1.7 + 1.7 + 8.0.14 - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} org.apache.tomcat @@ -70,31 +72,19 @@ - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - + + org.apache.httpcomponents + httpclient + + + org.bouncycastle + bcprov-jdk15on + + + junit + junit + test + + diff --git a/adapters/saml/undertow/pom.xml b/adapters/saml/undertow/pom.xml index fbc3688b01..45b6dd906b 100755 --- a/adapters/saml/undertow/pom.xml +++ b/adapters/saml/undertow/pom.xml @@ -87,17 +87,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/saml/wildfly-elytron/pom.xml b/adapters/saml/wildfly-elytron/pom.xml index 27d68ee8c3..b1781f6ba1 100755 --- a/adapters/saml/wildfly-elytron/pom.xml +++ b/adapters/saml/wildfly-elytron/pom.xml @@ -30,11 +30,6 @@ Keycloak WildFly Elytron SAML Adapter - - 1.8 - 1.8 - - org.keycloak @@ -86,17 +81,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/saml/wildfly/wildfly-adapter/pom.xml b/adapters/saml/wildfly/wildfly-adapter/pom.xml index ffc572ae76..52812973d8 100755 --- a/adapters/saml/wildfly/wildfly-adapter/pom.xml +++ b/adapters/saml/wildfly/wildfly-adapter/pom.xml @@ -34,7 +34,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -77,7 +76,7 @@ org.picketbox picketbox - 4.0.20.Final + ${picketbox.version} provided @@ -102,17 +101,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - \ No newline at end of file + diff --git a/adapters/spi/adapter-spi/pom.xml b/adapters/spi/adapter-spi/pom.xml index 20c6ae1cd6..189d348693 100755 --- a/adapters/spi/adapter-spi/pom.xml +++ b/adapters/spi/adapter-spi/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + org.keycloak.adapters.spi.* @@ -49,7 +52,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -60,15 +62,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml index 1a3e8c1d79..36249157a9 100755 --- a/adapters/spi/jboss-adapter-core/pom.xml +++ b/adapters/spi/jboss-adapter-core/pom.xml @@ -30,11 +30,15 @@ Common JBoss/Wildfly Core Classes + + 1.7 + 1.7 + + org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -73,22 +77,10 @@ org.picketbox picketbox - 4.0.20.Final + ${picketbox.version} provided - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/adapters/spi/jetty-adapter-spi/pom.xml b/adapters/spi/jetty-adapter-spi/pom.xml index 245992fa0d..0b93066ae6 100755 --- a/adapters/spi/jetty-adapter-spi/pom.xml +++ b/adapters/spi/jetty-adapter-spi/pom.xml @@ -14,21 +14,24 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> - keycloak-parent - org.keycloak + keycloak-parent + org.keycloak 4.6.0.Final-SNAPSHOT - ../../../pom.xml - - 4.0.0 + ../../../pom.xml + + 4.0.0 - keycloak-jetty-adapter-spi - Keycloak Jetty Adapter SPI + keycloak-jetty-adapter-spi + Keycloak Jetty Adapter SPI + 1.7 + 1.7 + 8.1.17.v20150415 org.keycloak.adapters.jetty.spi.* @@ -40,18 +43,17 @@ *;resolution:=optional - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - - org.keycloak - keycloak-common - + + org.keycloak + keycloak-common + org.keycloak keycloak-adapter-spi @@ -77,23 +79,14 @@ provided - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - + + junit + junit + test + + + + maven-jar-plugin @@ -126,7 +119,7 @@ - - + + diff --git a/adapters/spi/servlet-adapter-spi/pom.xml b/adapters/spi/servlet-adapter-spi/pom.xml index 1aa5c6aece..e64c71bd09 100755 --- a/adapters/spi/servlet-adapter-spi/pom.xml +++ b/adapters/spi/servlet-adapter-spi/pom.xml @@ -14,7 +14,7 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> +--> @@ -66,15 +66,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/adapters/spi/tomcat-adapter-spi/pom.xml b/adapters/spi/tomcat-adapter-spi/pom.xml index d5d9517521..2dd0ff4ef6 100755 --- a/adapters/spi/tomcat-adapter-spi/pom.xml +++ b/adapters/spi/tomcat-adapter-spi/pom.xml @@ -19,29 +19,31 @@ - keycloak-parent - org.keycloak - 4.6.0.Final-SNAPSHOT - ../../../pom.xml - - 4.0.0 + keycloak-parent + org.keycloak + 4.6.0.Final-SNAPSHOT + ../../../pom.xml + + 4.0.0 - keycloak-tomcat-adapter-spi - Keycloak Tomcat Adapter SPI + keycloak-tomcat-adapter-spi + Keycloak Tomcat Adapter SPI + 1.7 + 1.7 + 6.0.41 - + - + org.jboss.logging jboss-logging - ${jboss.logging.version} - + org.keycloak keycloak-adapter-spi @@ -50,37 +52,24 @@ keycloak-common - - org.apache.tomcat - catalina + + org.apache.tomcat + tomcat-servlet-api + ${tomcat.version} + compile + + --> + + org.apache.tomcat + catalina ${tomcat.version} - compile - - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - + compile + + + junit + junit + test + + diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml index 29f50c8ea4..96c2a19e23 100755 --- a/adapters/spi/undertow-adapter-spi/pom.xml +++ b/adapters/spi/undertow-adapter-spi/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + org.keycloak.adapters.undertow.* @@ -45,7 +48,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} provided @@ -79,15 +81,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/authz/client/pom.xml b/authz/client/pom.xml index 7c30700bf9..68598bc771 100644 --- a/authz/client/pom.xml +++ b/authz/client/pom.xml @@ -18,6 +18,9 @@ KeyCloak AuthZ: Client API + 1.7 + 1.7 + org.keycloak.authorization.client.* @@ -45,7 +48,6 @@ org.jboss.logging jboss-logging - ${jboss.logging.version} @@ -72,14 +74,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - maven-jar-plugin diff --git a/authz/policy/pom.xml b/authz/policy/pom.xml index 64e2945e28..62abc9e473 100644 --- a/authz/policy/pom.xml +++ b/authz/policy/pom.xml @@ -17,14 +17,9 @@ KeyCloak AuthZ: Provider Parent KeyCloak AuthZ: Provider Parent - - 1.8 - 1.8 - - common drools - \ No newline at end of file + diff --git a/boms/pom.xml b/boms/pom.xml index 6988989d4f..c0a624ee14 100644 --- a/boms/pom.xml +++ b/boms/pom.xml @@ -21,7 +21,7 @@ org.jboss jboss-parent - 19 + 28 org.keycloak.bom diff --git a/common/pom.xml b/common/pom.xml index 9df751277b..1256aa8697 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -32,6 +32,9 @@ Common library and dependencies shared with server and all adapters + 1.7 + 1.7 + ${maven.build.timestamp} yyyy-MM-dd HH:mm @@ -69,15 +72,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/core/pom.xml b/core/pom.xml index 0e4331f933..fa5614a5a4 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -32,6 +32,9 @@ + 1.7 + 1.7 + ${maven.build.timestamp} yyyy-MM-dd HH:mm @@ -76,15 +79,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - maven-jar-plugin diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml index c73de87f00..c568a73afd 100755 --- a/dependencies/server-all/pom.xml +++ b/dependencies/server-all/pom.xml @@ -99,14 +99,12 @@ org.keycloak keycloak-authz-policy-common - ${project.version} org.keycloak keycloak-authz-policy-drools - ${project.version} diff --git a/distribution/adapters/osgi/jaas/pom.xml b/distribution/adapters/osgi/jaas/pom.xml index 40785d8c35..abb9180fb2 100755 --- a/distribution/adapters/osgi/jaas/pom.xml +++ b/distribution/adapters/osgi/jaas/pom.xml @@ -32,6 +32,9 @@ bundle + 1.7 + 1.7 + @@ -81,4 +84,4 @@ - \ No newline at end of file + diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml index d5359eb977..e6aa006155 100755 --- a/distribution/downloads/pom.xml +++ b/distribution/downloads/pom.xml @@ -29,11 +29,6 @@ Keycloak Release Downloads - - 1.8 - 1.8 - - community @@ -44,14 +39,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.apache.maven.plugins maven-deploy-plugin diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml index c070e54851..221418361b 100644 --- a/distribution/feature-packs/server-feature-pack/pom.xml +++ b/distribution/feature-packs/server-feature-pack/pom.xml @@ -673,16 +673,6 @@ - - org.kie.soup - kie-soup-maven-support - - - * - * - - - org.kie.soup kie-soup-maven-integration @@ -818,13 +808,6 @@ - - - - - org.apache.maven.plugins - maven-dependency-plugin - unpack-cli validate 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 47f05e5b1c..40be86964c 100755 --- 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 @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml index 166e2207fb..0035e0352b 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml @@ -22,7 +22,7 @@ is also started by this host controller file. The other instance must be started via host-slave.xml --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml index 2cc9a3bc08..bb6dbc14ad 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml index 07c65adc1e..c7afbf016c 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml @@ -23,7 +23,7 @@ via host-slave.xml --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml index 5c2cb0e6f3..4d78f99eb9 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml @@ -1,6 +1,6 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-clustered.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-clustered.cli index 9b9729cd83..5dfe0719f3 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-clustered.cli +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-clustered.cli @@ -540,4 +540,35 @@ if (outcome == success) of /socket-binding-group=$clusteredProfile-sockets/socke /profile=$clusteredProfile/socket-binding-group=$clusteredProfile-sockets/socket-binding=modcluster:undefine-attribute(name=port) end-if -echo *** End Migration of /profile=$clusteredProfile *** \ No newline at end of file +# Migrate from 4.5.0 to 4.6.0 +if (outcome == success) of /profile=$clusteredProfile/subsystem=elytron/http-authentication-factory=application-http-authentication/:read-resource + echo Removing application-http-authentication from elytron subsystem + /profile=$clusteredProfile/subsystem=elytron/http-authentication-factory=application-http-authentication:remove + echo +end-if + +if (result == undefined) of /profile=$clusteredProfile/subsystem=transactions/:read-attribute(name=node-identifier,include-defaults=false) + echo Setting node-identifier attribute of core-environment element in transactions subsystem + /profile=$clusteredProfile/subsystem=transactions/:write-attribute(name=node-identifier,value=expression "${jboss.tx.node.id:1}") + echo +end-if + +if (outcome == success) of /profile=$clusteredProfile/subsystem=jgroups/stack=udp/transport=UDP/property=port_range:read-attribute(name=value) + try + /profile=$clusteredProfile/subsystem=jgroups/stack=udp/transport=UDP/property=port_range:remove + echo Remove port_range property from UDP transport type of udp stack + catch + echo + end-try +end-if + +if (outcome == success) of /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/transport=TCP/property=port_range:read-attribute(name=value) + try + /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/transport=TCP/property=port_range:remove + echo Remove port_range property from TCP transport type of tcp stack + catch + echo + end-try +end-if + +echo *** End Migration of /profile=$clusteredProfile *** diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-standalone.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-standalone.cli index 49de7ae400..e61d43d891 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-standalone.cli +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-domain-standalone.cli @@ -239,7 +239,7 @@ if (outcome == failed) of /profile=$standaloneProfile/subsystem=core-management/ /extension=org.wildfly.extension.core-management/:add echo catch - echo Wasn't able to add core-management extension, it should be already added by migrate-domain-clustered.cli + echo Wasn't able to add core-management extension, it should be already added by migrate-domain-standalone.cli echo end-try echo Adding subsystem core-management @@ -253,7 +253,7 @@ if (outcome == failed) of /profile=$standaloneProfile/subsystem=elytron/:read-re /extension=org.wildfly.extension.elytron/:add echo catch - echo Wasn't able to add elytron extension, it should be already added by migrate-domain-clustered.cli + echo Wasn't able to add elytron extension, it should be already added by migrate-domain-standalone.cli echo end-try echo Adding subsystem elytron @@ -360,7 +360,7 @@ if (outcome == success) of /profile=$standaloneProfile/subsystem=jdr/:read-resou /extension=org.jboss.as.jdr/:remove echo catch - echo Wasn't able to remove jdr extension, it should be removed by migrate-domain-clustered.cli + echo Wasn't able to remove jdr extension, it should be removed by migrate-domain-standalone.cli echo end-try end-if @@ -374,7 +374,7 @@ if (outcome == success) of /profile=$standaloneProfile/subsystem=jsf/:read-resou /extension=org.jboss.as.jsf/:remove echo catch - echo Wasn't able to remove jsf extension, Should be removed by migrate-domain-clustered.cli + echo Wasn't able to remove jsf extension, Should be removed by migrate-domain-standalone.cli echo end-try end-if @@ -465,4 +465,35 @@ if (outcome == success) of /profile=$standaloneProfile/subsystem=keycloak-server echo end-if -echo *** End Migration of /profile=$standaloneProfile *** \ No newline at end of file +# Migrate from 4.5.0 to 4.6.0 +if (outcome == success) of /profile=$standaloneProfile/subsystem=elytron/http-authentication-factory=application-http-authentication/:read-resource + echo Removing application-http-authentication from elytron subsystem + /profile=$standaloneProfile/subsystem=elytron/http-authentication-factory=application-http-authentication:remove + echo +end-if + +if (result == undefined) of /profile=$standaloneProfile/subsystem=transactions/:read-attribute(name=node-identifier,include-defaults=false) + echo Setting node-identifier attribute of core-environment element in transactions subsystem + /profile=$standaloneProfile/subsystem=transactions/:write-attribute(name=node-identifier,value=expression "${jboss.tx.node.id:1}") + echo +end-if + +if (outcome == success) of /profile=$standaloneProfile/subsystem=jgroups/stack=udp/transport=UDP/property=port_range:read-attribute(name=value) + try + /profile=$standaloneProfile/subsystem=jgroups/stack=udp/transport=UDP/property=port_range:remove + echo Remove port_range property from UDP transport type of udp stack + catch + echo + end-try +end-if + +if (outcome == success) of /profile=$standaloneProfile/subsystem=jgroups/stack=tcp/transport=TCP/property=port_range:read-attribute(name=value) + try + /profile=$standaloneProfile/subsystem=jgroups/stack=tcp/transport=TCP/property=port_range:remove + echo Remove port_range property from TCP transport type of tcp stack + catch + echo + end-try +end-if + +echo *** End Migration of /profile=$standaloneProfile *** diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli index ddcde93e31..bc54a70ddb 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli @@ -529,17 +529,42 @@ end-if # Migrate from 4.4.0 to 4.5.0 if (outcome == failed) of /subsystem=core-management/:read-resource - try - echo Trying to add core-management extension - /extension=org.wildfly.extension.core-management/:add - echo - catch - echo Wasn't able to add core-management extension, it should be already added by migrate-domain-standalone.cli - echo - end-try + echo Adding core-management extension + /extension=org.wildfly.extension.core-management/:add echo Adding subsystem core-management /subsystem=core-management/:add echo end-if -echo *** End Migration *** \ No newline at end of file +# Migrate from 4.5.0 to 4.6.0 +if (outcome == success) of /subsystem=elytron/http-authentication-factory=application-http-authentication/:read-resource + echo Removing application-http-authentication from elytron subsystem + /subsystem=elytron/http-authentication-factory=application-http-authentication:remove + echo +end-if + +if (result == undefined) of /subsystem=transactions/:read-attribute(name=node-identifier,include-defaults=false) + echo Setting node-identifier attribute of core-environment element in transactions subsystem + /subsystem=transactions/:write-attribute(name=node-identifier,value=expression "${jboss.tx.node.id:1}") + echo +end-if + +if (outcome == success) of /subsystem=jgroups/stack=udp/transport=UDP/property=port_range:read-attribute(name=value) + try + /subsystem=jgroups/stack=udp/transport=UDP/property=port_range:remove + echo Remove port_range property from UDP transport type of udp stack + catch + echo + end-try +end-if + +if (outcome == success) of /subsystem=jgroups/stack=tcp/transport=TCP/property=port_range:read-attribute(name=value) + try + /subsystem=jgroups/stack=tcp/transport=TCP/property=port_range:remove + echo Remove port_range property from TCP transport type of tcp stack + catch + echo + end-try +end-if + +echo *** End Migration *** diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli index a34fb56e57..13e9a6f248 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli @@ -436,17 +436,24 @@ end-if # Migrate from 4.4.0 to 4.5.0 if (outcome == failed) of /subsystem=core-management/:read-resource - try - echo Trying to add core-management extension - /extension=org.wildfly.extension.core-management/:add - echo - catch - echo Wasn't able to add core-management extension, it should be already added by migrate-domain-standalone.cli - echo - end-try + echo Adding core-management extension + /extension=org.wildfly.extension.core-management/:add echo Adding subsystem core-management /subsystem=core-management/:add echo end-if -echo *** End Migration *** \ No newline at end of file +# Migrate from 4.5.0 to 4.6.0 +if (outcome == success) of /subsystem=elytron/http-authentication-factory=application-http-authentication/:read-resource + echo Removing application-http-authentication from elytron subsystem + /subsystem=elytron/http-authentication-factory=application-http-authentication:remove + echo +end-if + +if (result == undefined) of /subsystem=transactions/:read-attribute(name=node-identifier,include-defaults=false) + echo Setting node-identifier attribute of core-environment element in transactions subsystem + /subsystem=transactions/:write-attribute(name=node-identifier,value=expression "${jboss.tx.node.id:1}") + echo +end-if + +echo *** End Migration *** diff --git a/examples/demo-template/service-account/pom.xml b/examples/demo-template/service-account/pom.xml index 9298b21b69..e7df237f0d 100755 --- a/examples/demo-template/service-account/pom.xml +++ b/examples/demo-template/service-account/pom.xml @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml index c4b55f28c0..28a2bc78b8 100755 --- a/examples/demo-template/third-party-cdi/pom.xml +++ b/examples/demo-template/third-party-cdi/pom.xml @@ -40,19 +40,18 @@ javax.enterprise cdi-api - 1.0-SP4 + 2.0.SP1 provided org.jboss.spec.javax.faces - jboss-jsf-api_2.1_spec - 2.0.1.Final + jboss-jsf-api_2.3_spec + 2.3.5.SP1 provided org.jboss.logging jboss-logging - ${jboss.logging.version} provided diff --git a/examples/multi-tenant/pom.xml b/examples/multi-tenant/pom.xml index a46024f71e..3554d6d0d2 100755 --- a/examples/multi-tenant/pom.xml +++ b/examples/multi-tenant/pom.xml @@ -32,18 +32,6 @@ Keycloak Multi Tenants Example - - - - org.wildfly.bom - jboss-javaee-7.0-with-all - 8.0.0.Final - pom - import - - - - org.jboss.spec.javax.servlet diff --git a/examples/providers/authenticator/pom.xml b/examples/providers/authenticator/pom.xml index 23bd58b8a1..d9ece039fb 100755 --- a/examples/providers/authenticator/pom.xml +++ b/examples/providers/authenticator/pom.xml @@ -61,14 +61,6 @@ authenticator-required-action-example - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - org.wildfly.plugins wildfly-maven-plugin diff --git a/federation/kerberos/pom.xml b/federation/kerberos/pom.xml index 12e7c7542d..56ba63424c 100755 --- a/federation/kerberos/pom.xml +++ b/federation/kerberos/pom.xml @@ -28,10 +28,6 @@ keycloak-kerberos-federation Keycloak Kerberos Federation - - 1.8 - 1.8 - @@ -56,16 +52,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml index 38de0cd2d3..47e25db142 100755 --- a/federation/ldap/pom.xml +++ b/federation/ldap/pom.xml @@ -29,11 +29,6 @@ Keycloak LDAP UserStoreProvider - - 1.8 - 1.8 - - org.keycloak @@ -59,20 +54,6 @@ org.jboss.resteasy resteasy-jaxrs provided - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - org.jboss.logging @@ -91,17 +72,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/federation/sssd/pom.xml b/federation/sssd/pom.xml index ada7aefb2a..24c2095e8a 100644 --- a/federation/sssd/pom.xml +++ b/federation/sssd/pom.xml @@ -13,22 +13,8 @@ Keycloak SSSD Federation - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.apache.maven.plugins maven-shade-plugin diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml index 21e05c38fc..c3484a7187 100755 --- a/integration/admin-client/pom.xml +++ b/integration/admin-client/pom.xml @@ -67,16 +67,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - \ No newline at end of file + diff --git a/integration/client-cli/admin-cli/pom.xml b/integration/client-cli/admin-cli/pom.xml index 4cac88e6d9..dfcc7a0baa 100755 --- a/integration/client-cli/admin-cli/pom.xml +++ b/integration/client-cli/admin-cli/pom.xml @@ -165,14 +165,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - diff --git a/integration/client-cli/client-registration-cli/pom.xml b/integration/client-cli/client-registration-cli/pom.xml index fadec3377c..43dc8f13ea 100755 --- a/integration/client-cli/client-registration-cli/pom.xml +++ b/integration/client-cli/client-registration-cli/pom.xml @@ -130,14 +130,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml index 9d3227267c..6a93c8d7b2 100755 --- a/model/infinispan/pom.xml +++ b/model/infinispan/pom.xml @@ -58,16 +58,4 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java index e3dfc3626d..467b03fa3e 100755 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java @@ -17,7 +17,6 @@ package org.keycloak.connections.infinispan; -import java.security.SecureRandom; import java.util.concurrent.TimeUnit; import org.infinispan.client.hotrod.ProtocolVersion; @@ -31,7 +30,6 @@ import org.infinispan.eviction.EvictionStrategy; import org.infinispan.eviction.EvictionType; import org.infinispan.manager.DefaultCacheManager; import org.infinispan.manager.EmbeddedCacheManager; -import org.infinispan.remoting.transport.Transport; import org.infinispan.remoting.transport.jgroups.JGroupsTransport; import org.infinispan.transaction.LockingMode; import org.infinispan.transaction.TransactionMode; @@ -202,11 +200,14 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon throw new RuntimeException("Invalid value for sessionsMode"); } + int owners = config.getInt("sessionsOwners", 2); + logger.debugf("Session owners: %d", owners); + int l1Lifespan = config.getInt("l1Lifespan", 600000); boolean l1Enabled = l1Lifespan > 0; sessionConfigBuilder.clustering() .hash() - .numOwners(config.getInt("sessionsOwners", 2)) + .numOwners(owners) .numSegments(config.getInt("sessionsSegments", 60)) .l1() .enabled(l1Enabled) @@ -354,7 +355,7 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon .rawValues(true) .forceReturnValues(false) .marshaller(KeycloakHotRodMarshallerFactory.class.getName()) - //.protocolVersion(ProtocolVersion.PROTOCOL_VERSION_26) + .protocolVersion(getHotrodVersion()) .addServer() .host(jdgServer) .port(jdgPort) @@ -382,7 +383,7 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon .rawValues(true) .forceReturnValues(false) .marshaller(KeycloakHotRodMarshallerFactory.class.getName()) - //.protocolVersion(ProtocolVersion.PROTOCOL_VERSION_26) + .protocolVersion(getHotrodVersion()) .addServer() .host(jdgServer) .port(jdgPort) @@ -391,6 +392,18 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon } + private ProtocolVersion getHotrodVersion() { + String hotrodVersionStr = config.get("hotrodProtocolVersion", ProtocolVersion.DEFAULT_PROTOCOL_VERSION.toString()); + ProtocolVersion hotrodVersion = ProtocolVersion.parseVersion(hotrodVersionStr); + if (hotrodVersion == null) { + hotrodVersion = ProtocolVersion.DEFAULT_PROTOCOL_VERSION; + } + + logger.debugf("HotRod protocol version: %s", hotrodVersion); + + return hotrodVersion; + } + protected Configuration getKeysCacheConfig() { ConfigurationBuilder cb = new ConfigurationBuilder(); diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java index 0ff1a901c2..233a58a572 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheSessionsLoader.java @@ -18,7 +18,6 @@ package org.keycloak.models.sessions.infinispan.remotestore; import java.io.Serializable; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -29,15 +28,11 @@ import org.infinispan.client.hotrod.impl.RemoteCacheImpl; import org.infinispan.client.hotrod.impl.operations.IterationStartOperation; import org.infinispan.client.hotrod.impl.operations.IterationStartResponse; import org.infinispan.client.hotrod.impl.operations.OperationsFactory; -import org.infinispan.commons.marshall.Marshaller; import org.infinispan.commons.util.CloseableIterator; import org.infinispan.context.Flag; import org.jboss.logging.Logger; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.connections.infinispan.RemoteCacheProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; import org.keycloak.models.sessions.infinispan.initializer.BaseCacheInitializer; import org.keycloak.models.sessions.infinispan.initializer.OfflinePersistentUserSessionLoader; import org.keycloak.models.sessions.infinispan.initializer.SessionLoader; @@ -80,7 +75,7 @@ public class RemoteCacheSessionsLoader implements SessionLoaderKeycloak Model JPA - - 1.8 - 1.8 - - org.bouncycastle @@ -71,30 +66,17 @@ h2 - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api org.hibernate - hibernate-entitymanager + hibernate-core org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - + provided com.fasterxml.jackson.core @@ -112,17 +94,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java index 96408a61ae..1b0137a5d2 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java @@ -58,7 +58,7 @@ import org.keycloak.representations.idm.authorization.Logic; @NamedQuery(name="findPolicyIdByName", query="select p from PolicyEntity p left join fetch p.associatedPolicies a where p.resourceServer.id = :serverId and p.name = :name"), @NamedQuery(name="findPolicyIdByResource", query="select p from PolicyEntity p inner join fetch p.resources r left join fetch p.scopes s inner join fetch p.associatedPolicies a where p.resourceServer.id = :serverId and (r.resourceServer.id = :serverId and r.id = :resourceId)"), @NamedQuery(name="findPolicyIdByScope", query="select pe from PolicyEntity pe left join fetch pe.resources r inner join fetch pe.scopes s inner join fetch pe.associatedPolicies a where pe.resourceServer.id = :serverId and exists (select p.id from ScopeEntity s inner join s.policies p where s.resourceServer.id = :serverId and (p.resourceServer.id = :serverId and p.type = 'scope' and s.id in (:scopeIds) and p.id = pe.id))"), - @NamedQuery(name="findPolicyIdByResourceScope", query="select pe from PolicyEntity pe inner join fetch pe.resources r inner join fetch pe.scopes s inner join fetch pe.associatedPolicies a where pe.resourceServer.id = :serverId and exists (select p.id from ScopeEntity s inner join s.policies p where s.resourceServer.id = :serverId and (p.resourceServer.id = :serverId and p.type = 'scope' and s.id in (:scopeIds) and p.id = pe.id)) and exists (select p.id from ResourceEntity r inner join r.policies p where r.resourceServer.id = :serverId and (p.resourceServer.id = :serverId and p.id = pe.id and p.type = 'scope' and r.id in (:resourceId))))"), + @NamedQuery(name="findPolicyIdByResourceScope", query="select pe from PolicyEntity pe inner join fetch pe.resources r inner join fetch pe.scopes s inner join fetch pe.associatedPolicies a where pe.resourceServer.id = :serverId and exists (select p.id from ScopeEntity s inner join s.policies p where s.resourceServer.id = :serverId and (p.resourceServer.id = :serverId and p.type = 'scope' and s.id in (:scopeIds) and p.id = pe.id)) and exists (select p.id from ResourceEntity r inner join r.policies p where r.resourceServer.id = :serverId and (p.resourceServer.id = :serverId and p.id = pe.id and p.type = 'scope' and r.id in (:resourceId)))"), @NamedQuery(name="findPolicyIdByNullResourceScope", query="select pe from PolicyEntity pe left join fetch pe.resources r inner join fetch pe.scopes s inner join fetch pe.associatedPolicies a where pe.resourceServer.id = :serverId and exists (select p.id from ScopeEntity s inner join s.policies p where s.resourceServer.id = :serverId and (p.resourceServer.id = :serverId and p.id = pe.id and p.type = 'scope' and s.id in (:scopeIds))) and pe.resources is empty"), @NamedQuery(name="findPolicyIdByType", query="select p.id from PolicyEntity p where p.resourceServer.id = :serverId and p.type = :type"), @NamedQuery(name="findPolicyIdByResourceType", query="select p from PolicyEntity p inner join p.config c inner join fetch p.associatedPolicies a where p.resourceServer.id = :serverId and KEY(c) = 'defaultResourceType' and c like :type"), diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java index 64a12fc013..83c25b6fd2 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java @@ -17,7 +17,7 @@ package org.keycloak.connections.jpa; -import org.hibernate.ejb.AvailableSettings; +import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; import org.jboss.logging.Logger; import org.keycloak.Config; @@ -46,6 +46,8 @@ import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -77,7 +79,7 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide logger.trace("Create JpaConnectionProvider"); lazyInit(session); - EntityManager em = null; + EntityManager em; if (!jtaEnabled) { logger.trace("enlisting EntityManager in JpaKeycloakTransaction"); em = emf.createEntityManager(); @@ -130,28 +132,28 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide KeycloakModelUtils.suspendJtaTransaction(session.getKeycloakSessionFactory(), () -> { logger.debug("Initializing JPA connections"); - Map properties = new HashMap(); + Map properties = new HashMap<>(); String unitName = "keycloak-default"; String dataSource = config.get("dataSource"); if (dataSource != null) { if (config.getBoolean("jta", jtaEnabled)) { - properties.put(AvailableSettings.JTA_DATASOURCE, dataSource); + properties.put(AvailableSettings.JPA_JTA_DATASOURCE, dataSource); } else { - properties.put(AvailableSettings.NON_JTA_DATASOURCE, dataSource); + properties.put(AvailableSettings.JPA_NON_JTA_DATASOURCE, dataSource); } } else { - properties.put(AvailableSettings.JDBC_URL, config.get("url")); - properties.put(AvailableSettings.JDBC_DRIVER, config.get("driver")); + properties.put(AvailableSettings.JPA_JDBC_URL, config.get("url")); + properties.put(AvailableSettings.JPA_JDBC_DRIVER, config.get("driver")); String user = config.get("user"); if (user != null) { - properties.put(AvailableSettings.JDBC_USER, user); + properties.put(AvailableSettings.JPA_JDBC_USER, user); } String password = config.get("password"); if (password != null) { - properties.put(AvailableSettings.JDBC_PASSWORD, password); + properties.put(AvailableSettings.JPA_JDBC_PASSWORD, password); } } @@ -186,7 +188,7 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide logger.trace("Creating EntityManagerFactory"); logger.tracev("***** create EMF jtaEnabled {0} ", jtaEnabled); if (jtaEnabled) { - properties.put(org.hibernate.cfg.AvailableSettings.JTA_PLATFORM, new AbstractJtaPlatform() { + properties.put(AvailableSettings.JTA_PLATFORM, new AbstractJtaPlatform() { @Override protected TransactionManager locateTransactionManager() { return jtaLookup.getTransactionManager(); @@ -198,7 +200,13 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide } }); } - emf = JpaUtils.createEntityManagerFactory(session, unitName, properties, getClass().getClassLoader(), jtaEnabled); + Collection classLoaders = new ArrayList<>(); + if (properties.containsKey(AvailableSettings.CLASSLOADERS)) { + classLoaders.addAll((Collection) properties.get(AvailableSettings.CLASSLOADERS)); + } + classLoaders.add(getClass().getClassLoader()); + properties.put(AvailableSettings.CLASSLOADERS, classLoaders); + emf = JpaUtils.createEntityManagerFactory(session, unitName, properties, jtaEnabled); logger.trace("EntityManagerFactory created"); if (globalStatsInterval != -1) { @@ -281,7 +289,7 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide timer.scheduleTask(new HibernateStatsReporter(emf), globalStatsIntervalSecs * 1000, "ReportHibernateGlobalStats"); } - public void migration(MigrationStrategy strategy, boolean initializeEmpty, String schema, File databaseUpdateFile, Connection connection, KeycloakSession session) { + void migration(MigrationStrategy strategy, boolean initializeEmpty, String schema, File databaseUpdateFile, Connection connection, KeycloakSession session) { JpaUpdaterProvider updater = session.getProvider(JpaUpdaterProvider.class); JpaUpdaterProvider.Status status = updater.validate(connection, schema); diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java index 569f00b2ef..ee99455ec0 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java @@ -18,7 +18,7 @@ package org.keycloak.connections.jpa; import org.hibernate.SessionFactory; -import org.hibernate.jpa.internal.EntityManagerFactoryImpl; +import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.stat.CollectionStatistics; import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.QueryStatistics; @@ -46,7 +46,7 @@ public class HibernateStatsReporter implements ScheduledTask { @Override public void run(KeycloakSession session) { - SessionFactory sessionFactory = ((EntityManagerFactoryImpl) emf).getSessionFactory(); + SessionFactory sessionFactory = ((SessionFactoryImpl) emf); Statistics stats = sessionFactory.getStatistics(); logStats(stats); @@ -72,12 +72,12 @@ public class HibernateStatsReporter implements ScheduledTask { for (String entity : stats.getEntityNames()) { EntityStatistics entityStats = stats.getEntityStatistics(entity); if (entityStats.getInsertCount() > LIMIT || entityStats.getDeleteCount() > LIMIT || entityStats.getUpdateCount() > LIMIT || entityStats.getLoadCount() > LIMIT || entityStats.getFetchCount() > LIMIT) { - builder.append(entity + " - ") - .append("inserted: " + entityStats.getInsertCount()) - .append(", updated: " + entityStats.getUpdateCount()) - .append(", removed: " + entityStats.getDeleteCount()) - .append(", loaded: " + entityStats.getLoadCount()) - .append(", fetched: " + entityStats.getFetchCount()) + builder.append(entity).append(" - ") + .append("inserted: ").append(entityStats.getInsertCount()) + .append(", updated: ").append(entityStats.getUpdateCount()) + .append(", removed: ").append(entityStats.getDeleteCount()) + .append(", loaded: ").append(entityStats.getLoadCount()) + .append(", fetched: ").append(entityStats.getFetchCount()) .append(lineSep); } } @@ -91,12 +91,12 @@ public class HibernateStatsReporter implements ScheduledTask { CollectionStatistics collectionStats = stats.getCollectionStatistics(col); if (collectionStats.getRecreateCount() > LIMIT || collectionStats.getUpdateCount() > LIMIT || collectionStats.getRemoveCount() > LIMIT || collectionStats.getLoadCount() > LIMIT || collectionStats.getFetchCount() > LIMIT) { - builder.append(col + " - ") - .append("recreated: " + collectionStats.getRecreateCount()) - .append(", updated: " + collectionStats.getUpdateCount()) - .append(", removed: " + collectionStats.getRemoveCount()) - .append(", loaded: " + collectionStats.getLoadCount()) - .append(", fetched: " + collectionStats.getFetchCount()) + builder.append(col).append(" - ") + .append("recreated: ").append(collectionStats.getRecreateCount()) + .append(", updated: ").append(collectionStats.getUpdateCount()) + .append(", removed: ").append(collectionStats.getRemoveCount()) + .append(", loaded: ").append(collectionStats.getLoadCount()) + .append(", fetched: ").append(collectionStats.getFetchCount()) .append(lineSep); } } @@ -111,8 +111,8 @@ public class HibernateStatsReporter implements ScheduledTask { if (queryStats.getExecutionCount() > LIMIT || (queryStats.getExecutionCount() * queryStats.getExecutionAvgTime() > LIMIT)) { builder.append(query).append(lineSep) - .append("executionCount=" + queryStats.getExecutionCount()).append(lineSep) - .append("executionAvgTime=" + queryStats.getExecutionAvgTime()).append(" ms").append(lineSep) + .append("executionCount=").append(queryStats.getExecutionCount()).append(lineSep) + .append("executionAvgTime=").append(queryStats.getExecutionAvgTime()).append(" ms").append(lineSep) .append(lineSep) .append(lineSep); } diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java index 290ec158ef..e534af2cd9 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java @@ -17,7 +17,6 @@ package org.keycloak.connections.jpa.util; -import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.hibernate.jpa.boot.internal.PersistenceXmlParser; import org.hibernate.jpa.boot.spi.Bootstrap; @@ -45,10 +44,9 @@ public class JpaUtils { return (schema==null) ? tableName : schema + "." + tableName; } - public static EntityManagerFactory createEntityManagerFactory(KeycloakSession session, String unitName, Map properties, ClassLoader classLoader, boolean jta) { + public static EntityManagerFactory createEntityManagerFactory(KeycloakSession session, String unitName, Map properties, boolean jta) { PersistenceUnitTransactionType txType = jta ? PersistenceUnitTransactionType.JTA : PersistenceUnitTransactionType.RESOURCE_LOCAL; - PersistenceXmlParser parser = new PersistenceXmlParser(new ClassLoaderServiceImpl(classLoader), txType); - List persistenceUnits = parser.doResolve(properties); + List persistenceUnits = PersistenceXmlParser.locatePersistenceUnits(properties); for (ParsedPersistenceXmlDescriptor persistenceUnit : persistenceUnits) { if (persistenceUnit.getName().equals(unitName)) { List> providedEntities = getProvidedEntities(session); @@ -57,10 +55,10 @@ public class JpaUtils { persistenceUnit.addClasses(entityClass.getName()); } // Now build the entity manager factory, supplying a proxy classloader, so Hibernate will be able - // to find and load the extra provided entities. Set the provided classloader as parent classloader. + // to find and load the extra provided entities. persistenceUnit.setTransactionType(txType); return Bootstrap.getEntityManagerFactoryBuilder(persistenceUnit, properties, - new ProxyClassLoader(providedEntities, classLoader)).build(); + new ProxyClassLoader(providedEntities)).build(); } } throw new RuntimeException("Persistence unit '" + unitName + "' not found"); diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java index 735b7e8ace..fdccc09962 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java @@ -37,7 +37,7 @@ import javax.persistence.Table; @NamedQuery(name="deleteUserConsentClientScopesByRealm", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.userConsent IN (select consent from UserConsentEntity consent where consent.user IN (select user from UserEntity user where user.realmId = :realmId))"), @NamedQuery(name="deleteUserConsentClientScopesByRealmAndLink", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.userConsent IN (select consent from UserConsentEntity consent where consent.user IN (select u from UserEntity u where u.realmId=:realmId and u.federationLink=:link))"), @NamedQuery(name="deleteUserConsentClientScopesByUser", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.userConsent IN (select consent from UserConsentEntity consent where consent.user = :user)"), - @NamedQuery(name="deleteUserConsentClientScopesByClientScope", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.scopeId = :scopeId)"), + @NamedQuery(name="deleteUserConsentClientScopesByClientScope", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.scopeId = :scopeId"), @NamedQuery(name="deleteUserConsentClientScopesByClient", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.userConsent IN (select consent from UserConsentEntity consent where consent.clientId = :clientId)"), @NamedQuery(name="deleteUserConsentClientScopesByExternalClient", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.userConsent IN (select consent from UserConsentEntity consent where consent.clientStorageProvider = :clientStorageProvider and consent.externalClientId = :externalClientId)"), @NamedQuery(name="deleteUserConsentClientScopesByClientStorageProvider", query="delete from UserConsentClientScopeEntity grantedScope where grantedScope.userConsent IN (select consent from UserConsentEntity consent where consent.clientStorageProvider = :clientStorageProvider)"), diff --git a/pom.xml b/pom.xml index 9b11ace91a..e8285adfd0 100755 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.jboss jboss-parent - 19 + 28 Keycloak @@ -41,56 +41,52 @@ ${timestamp} - 1.7 - 1.7 - - 13.0.0.Final + 14.0.1.Final 1.2.10.Final - 7.2.0.CD13-redhat-4 + 7.2.0.CD14-redhat-00002 1.2.10.Final - 5.0.0.Final - 2.0.10.Final + 6.0.2.Final 7.2.0.Final 0.66.19 - 1.4 - 1.7 + 1.7 + 1.10 4.5.2 4.4.4 0.6 - 1.4.1.Final - 1.56 + 1.5.0.Final + 1.60 3.2.0 1.6.1 2011.1 1.4.193 - 5.1.15.Final - 1.0.0.Final - 9.2.4.Final - 2.8.11 - 2.8.11.1 - 1.5.6 - 3.3.1.Final + 2.2 + 5.3.6.Final + 9.3.1.Final + 2.9.5 + 1.6.1 + 3.3.2.Final 2.1.0.Final 1.2.0.Final - 1.0.0.Final - 1.0.1.Final - 1.0.4.Final + 1.0.1.Final + 1.1.1.Final + 1.0.1.Final 1.2.17 - 3.5.1.Final + 3.6.1.Final 20180219.1 1.7.22 - 2.21 - 2.2.11 + 3.0.5 + 2.3.0 20140925 - 2.0.9.Final - 1.3.3.Final - 1.0.1.Final + 2.0.13.Final + 1.6.0.Final + 1.2.3.Final 5.0.3 - 2.0.9 - 1.0.4 + 2.1.2 + 1.1.2 1.4.0.Final + 5.0.3.Final 7.11.0.Final @@ -102,7 +98,7 @@ 2.3.26-incubating - 20.0 + 25.0-jre 9.1.0.v20131115 3.5.5 @@ -112,6 +108,7 @@ 9.3-1100-jdbc41 1.3.7 1.0.2.Final + 1.0.0.Final 4.0.4 4.1.0 @@ -270,6 +267,20 @@ org.jboss.resteasy resteasy-jaxrs ${resteasy.version} + + + log4j + log4j + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + + org.jboss.resteasy @@ -290,11 +301,21 @@ org.jboss.resteasy resteasy-undertow ${resteasy.version} + + + io.undertow + undertow-servlet + + + io.undertow + undertow-core + + org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.2_spec - ${jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version} + jboss-jaxb-api_2.3_spec + ${jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version} org.keycloak @@ -319,7 +340,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.databind.version} + ${jackson.version} com.fasterxml.jackson.core @@ -346,6 +367,11 @@ jboss-servlet-api_3.0_spec ${servlet.api.30.version} + + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec + ${servlet.api.40.version} + org.picketlink picketlink-wildfly-common @@ -391,9 +417,9 @@ test - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate.javax.persistence.version} + javax.persistence + javax.persistence-api + ${javax.persistence.version} com.h2database @@ -403,13 +429,13 @@ org.hibernate - hibernate-entitymanager - ${hibernate.entitymanager.version} + hibernate-core + ${hibernate.core.version} org.hibernate hibernate-c3p0 - ${hibernate.entitymanager.version} + ${hibernate.core.version} test @@ -423,12 +449,8 @@ ${xmlsec.version} - javax.servlet - servlet-api - - - org.codehaus.woodstox - woodstox-core-asl + com.fasterxml.woodstox + woodstox-core diff --git a/proxy/launcher/pom.xml b/proxy/launcher/pom.xml index 130c71027e..9e8f9b835d 100755 --- a/proxy/launcher/pom.xml +++ b/proxy/launcher/pom.xml @@ -46,14 +46,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - diff --git a/proxy/proxy-server/pom.xml b/proxy/proxy-server/pom.xml index d797137bb2..567bb0b01f 100755 --- a/proxy/proxy-server/pom.xml +++ b/proxy/proxy-server/pom.xml @@ -77,17 +77,5 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - diff --git a/saml-core-api/pom.xml b/saml-core-api/pom.xml index beaaeb46d7..a1d2466fce 100755 --- a/saml-core-api/pom.xml +++ b/saml-core-api/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + ${maven.build.timestamp} yyyy-MM-dd HH:mm @@ -57,16 +60,6 @@ true - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - diff --git a/saml-core/pom.xml b/saml-core/pom.xml index 0f6c4a909a..a802f29cd9 100755 --- a/saml-core/pom.xml +++ b/saml-core/pom.xml @@ -31,6 +31,9 @@ + 1.7 + 1.7 + ${maven.build.timestamp} true yyyy-MM-dd HH:mm @@ -79,14 +82,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.apache.maven.plugins maven-surefire-plugin diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java index aee809104a..857d7ca9d0 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java @@ -76,7 +76,8 @@ public class StaxParserUtil { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = factory.newSchema(new StreamSource(sch)); Validator validator = schema.newValidator(); - validator.validate(new StAXSource(xmlEventReader)); + StAXSource stAXSource = new StAXSource(xmlEventReader); + validator.validate(stAXSource); } catch (Exception e) { throw logger.parserException(e); } diff --git a/server-spi-private/pom.xml b/server-spi-private/pom.xml index 79c49bbfab..0b059b56d3 100755 --- a/server-spi-private/pom.xml +++ b/server-spi-private/pom.xml @@ -30,11 +30,6 @@ Keycloak Server Private SPI - - 1.8 - 1.8 - - org.keycloak @@ -91,18 +86,6 @@ hamcrest-all test - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - + diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java index 377136330e..417d41b95d 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java @@ -613,9 +613,7 @@ public final class KeycloakModelUtils { if (suspended != null) { try { lookup.getTransactionManager().resume(suspended); - } catch (InvalidTransactionException e) { - throw new RuntimeException(e); - } catch (SystemException e) { + } catch (InvalidTransactionException | SystemException e) { throw new RuntimeException(e); } } diff --git a/server-spi/pom.xml b/server-spi/pom.xml index 308b2663a5..d8dbe684a0 100755 --- a/server-spi/pom.xml +++ b/server-spi/pom.xml @@ -30,11 +30,6 @@ Keycloak Server SPI - - 1.8 - 1.8 - - org.jboss.spec.javax.transaction @@ -76,18 +71,6 @@ junit test - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - + diff --git a/services/pom.xml b/services/pom.xml index 80d46d5e68..17f80a8ae8 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,8 +32,6 @@ 1.1.2 - 1.8 - 1.8 @@ -79,7 +77,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_4.0_spec org.twitter4j @@ -109,20 +107,7 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - + provided org.jboss.spec.javax.ws.rs @@ -200,8 +185,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.source} - ${maven.compiler.target} -AgeneratedTranslationFilesPath=${project.build.directory}/generated-translation-files @@ -240,6 +223,8 @@ org.apache.maven.plugins maven-javadoc-plugin + + 2.10.3 generate-service-docs diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakStringEntityFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakStringEntityFilter.java new file mode 100644 index 0000000000..a39d3ed8aa --- /dev/null +++ b/services/src/main/java/org/keycloak/services/filters/KeycloakStringEntityFilter.java @@ -0,0 +1,45 @@ +/* + * Copyright 2017 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.keycloak.services.filters; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerResponseContext; +import javax.ws.rs.container.ContainerResponseFilter; + +/** + * Workaround for KEYCLOAK-8461 + * + * @author Marek Posolda + */ +public class KeycloakStringEntityFilter implements ContainerResponseFilter { + + @Override + public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException { + if (responseContext.getStatus() == 400 && responseContext.hasEntity()) { + Object entity = responseContext.getEntity(); + if (entity instanceof String) { + // Need to convert String to bytes, so that RestEasy won't escape it + responseContext.setEntity(responseContext.getEntity().toString().getBytes(StandardCharsets.UTF_8)); + } + } + } + +} diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java index cd6daf56c3..23d42852ae 100644 --- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java +++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java @@ -43,6 +43,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.DefaultKeycloakSessionFactory; import org.keycloak.services.ServicesLogger; import org.keycloak.services.error.KeycloakErrorHandler; +import org.keycloak.services.filters.KeycloakStringEntityFilter; import org.keycloak.services.filters.KeycloakTransactionCommitter; import org.keycloak.services.managers.ApplianceBootstrap; import org.keycloak.services.managers.RealmManager; @@ -127,6 +128,10 @@ public class KeycloakApplication extends Application { classes.add(JsResource.class); classes.add(KeycloakTransactionCommitter.class); + + // Workaround for KEYCLOAK-8461. TODO: Remove it once corresponding issue is fixed in Wildfly/Resteasy + classes.add(KeycloakStringEntityFilter.class); + classes.add(KeycloakErrorHandler.class); singletons.add(new ObjectMapperResolver(Boolean.parseBoolean(System.getProperty("keycloak.jsonPrettyPrint", "false")))); diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index ea7fd50d48..a50043c6df 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -511,7 +511,7 @@ To run the Mutual TLS test for the client: ## Cluster tests -Cluster tests use 2 backend servers (Keycloak on Wildfly/EAP) and 1 frontend loadbalancer server node. Invalidation tests don't use loadbalancer. +Cluster tests use 2 backend servers (Keycloak on Wildfly/EAP or Keycloak on Undertow), 1 frontend loadbalancer server node and one shared DB. Invalidation tests don't use loadbalancer. The browser usually communicates directly with the backend node1 and after doing some change here (eg. updating user), it verifies that the change is visible on node2 and user is updated here as well. Failover tests use loadbalancer and they require the setup with the distributed infinispan caches switched to have 2 owners (default value is 1 owner). Otherwise failover won't reliably work. @@ -519,16 +519,13 @@ Failover tests use loadbalancer and they require the setup with the distributed The setup includes: -* a `mod_cluster` load balancer on Wildfly -* two clustered nodes of Keycloak server on Wildfly/EAP +* a load balancer on embedded Undertow (SimpleUndertowLoadBalancer) +* two clustered nodes of Keycloak server on Wildfly/EAP or on embedded undertow +* shared DB -Clustering tests require MULTICAST to be enabled on machine's `loopback` network interface. -This can be done by running the following commands under root privileges: +### Cluster tests with Keycloak on Wildfly - route add -net 224.0.0.0 netmask 240.0.0.0 dev lo - ifconfig lo multicast - -Then after build the sources, distribution and setup of clean shared database (replace command according your DB), you can use this command to setup servers: +After build the sources, distribution and setup of clean shared database (replace command according your DB), you can use this command to setup servers: export DB_HOST=localhost mvn -f testsuite/integration-arquillian/servers/pom.xml \ @@ -553,9 +550,21 @@ And then this to run the cluster tests: -Dtest=org.keycloak.testsuite.cluster.**.*Test clean install -### Cluster tests with embedded undertow +### Cluster tests with Keycloak on embedded undertow -#### Run cluster tests from IDE + mvn -f testsuite/integration-arquillian/tests/base/pom.xml \ + -Pauth-server-cluster-undertow \ + -Dsession.cache.owners=2 \ + -Dkeycloak.connectionsInfinispan.sessionsOwners=2 \ + -Dbackends.console.output=true \ + -Dauth.server.log.check=false \ + -Dfrontend.console.output=true \ + -Dkeycloak.connectionsJpa.url=jdbc:mysql://$DB_HOST/keycloak \ + -Dkeycloak.connectionsJpa.user=keycloak \ + -Dkeycloak.connectionsJpa.password=keycloak \ + -Dtest=org.keycloak.testsuite.cluster.**.*Test clean install + +#### Run cluster tests from IDE on embedded undertow The test uses Undertow loadbalancer on `http://localhost:8180` and two embedded backend Undertow servers with Keycloak on `http://localhost:8181` and `http://localhost:8182` . You can use any cluster test (eg. AuthenticationSessionFailoverClusterTest) and run from IDE with those system properties (replace with your DB settings): @@ -642,33 +651,7 @@ b2) For **JBoss-based** Keycloak backend containers, you can run the tests like For **JBoss-based** Keycloak backend containers on real DB, the previous commands from (a2) and (b2) can be "squashed" into one. E.g.: `mvn -f testsuite/integration-arquillian clean install -Dtest=*.crossdc.* -Djdbc.mvn.groupId=org.mariadb.jdbc -Djdbc.mvn.artifactId=mariadb-java-client -Djdbc.mvn.version=2.0.3 -Dkeycloak.connectionsJpa.url=jdbc:mariadb://localhost:3306/keycloak -Dkeycloak.connectionsJpa.password=keycloak -Dkeycloak.connectionsJpa.user=keycloak -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly,jpa clean install` - -#### Run "Manual" Cross-DC Tests from Maven - -Tests from package "manual" uses manual lifecycle for all servers, so needs to be executed manually. - -First prepare the environment and do the step (a) from previous paragraph. - -c1) For **Undertow** Keycloak backend containers, you can run the test using following command: - - `mvn -Pcache-server-infinispan,auth-servers-crossdc-undertow -Dtest=*.crossdc.manual.* -Dmanual.mode=true -Drun.h2=true -Dkeycloak.connectionsJpa.url.crossdc="jdbc:h2:tcp://localhost:9092/mem:keycloak-dc-shared;DB_CLOSE_DELAY=-1" -pl testsuite/integration-arquillian/tests/base clean install` - -*note: As you can see, there is a need to run TCP-Based H2 for this test. In-memory H2 won't work due the data need -to persist the stop of all the Keycloak servers.* - -If you want to test with real DB like MySQL, you can run them with: - - `mvn -Pcache-server-infinispan,auth-servers-crossdc-undertow -Dtest=*.crossdc.manual.* -Dmanual.mode=true -Dkeycloak.connectionsJpa.url.crossdc=jdbc:mysql://localhost/keycloak -Dkeycloak.connectionsJpa.driver.crossdc=com.mysql.jdbc.Driver -Dkeycloak.connectionsJpa.user=keycloak -Dkeycloak.connectionsJpa.password=keycloak -pl testsuite/integration-arquillian/tests/base clean install` - -c2) For **JBoss-based** Keycloak backend containers, you can run the tests like this: - - `mvn -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly -Dtest=*.crossdc.manual.* -Dmanual.mode=true -pl testsuite/integration-arquillian/tests/base clean install` - -*note: TCP-based H2 is used by default when running cross-dc tests on JBoss-based Keycloak container. -So no need to explicitly specify it like in (c1) for undertow.* - - #### Run Cross-DC Tests from Intellij IDEA diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 90d4cf86e1..a560dcaa05 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -42,9 +42,8 @@ undertow - 11.0.0.Final - 3.0.8.Final - 8.2.8.Final + 13.0.0.Final + 5.0.0.Final 2.1.0.Final @@ -73,11 +72,6 @@ 1.9.8.Final 2.5.5.Final 3.4.3.Final - - 23.0 - - 1.8 - 1.8 @@ -249,6 +243,11 @@ directory-maven-plugin 0.3.1 + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.4.1 + diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml index 981b6d8538..050e2fa48c 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml @@ -1,8 +1,6 @@ - - modcluster-configured: ${modcluster-configured} crossdc-configured: ${crossdc-configured} @@ -24,16 +22,7 @@ - - - - - - - - - - + diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/ispn-cache-owners.xsl b/testsuite/integration-arquillian/servers/auth-server/jboss/common/ispn-cache-owners.xsl index bac1141458..727e32ece4 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/ispn-cache-owners.xsl +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/ispn-cache-owners.xsl @@ -1,6 +1,6 @@ diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli index 2e50470580..362018fcc4 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli @@ -22,7 +22,8 @@ echo ** Update replicated-cache work element ** cache=work, \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) @@ -39,7 +40,8 @@ echo ** Update distributed-cache sessions element ** cache=sessions, \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) /subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:write-attribute(name=statistics-enabled,value=true) @@ -55,7 +57,8 @@ echo ** Update distributed-cache offlineSessions element ** cache=offlineSessions, \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) /subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:write-attribute(name=statistics-enabled,value=true) @@ -71,7 +74,8 @@ echo ** Update distributed-cache clientSessions element ** cache=clientSessions, \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) /subsystem=infinispan/cache-container=keycloak/distributed-cache=clientSessions:write-attribute(name=statistics-enabled,value=true) @@ -87,7 +91,8 @@ echo ** Update distributed-cache offlineClientSessions element ** cache=offlineClientSessions, \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) /subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineClientSessions:write-attribute(name=statistics-enabled,value=true) @@ -103,7 +108,8 @@ echo ** Update distributed-cache loginFailures element ** cache=loginFailures, \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) /subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:write-attribute(name=statistics-enabled,value=true) @@ -119,7 +125,8 @@ echo ** Update distributed-cache actionTokens element ** remote-servers=["remote-cache"], \ properties={ \ rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory \ + marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ + protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ } \ ) /subsystem=infinispan/cache-container=keycloak/distributed-cache=actionTokens:write-attribute(name=statistics-enabled,value=true) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/modcluster-simple-load-provider.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/modcluster-simple-load-provider.cli deleted file mode 100644 index be7ac21c21..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/modcluster-simple-load-provider.cli +++ /dev/null @@ -1,7 +0,0 @@ -embed-server --server-config=standalone-ha.xml - -# remove dynamic-load-provider -/subsystem=modcluster/mod-cluster-config=configuration/dynamic-load-provider=configuration:remove - -# add simple-load-provider with factor=1 to assure round-robin balancing -/subsystem=modcluster/mod-cluster-config=configuration:write-attribute(name=simple-load-provider, value=1) \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml index 80ad8bc7d6..83adba69cf 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml @@ -776,25 +776,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - configure-modcluster - process-resources - - run - - - - - - - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml index abf6faea72..a0c8d55035 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - + diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml b/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml index 08a68fcd48..3326be4877 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml @@ -50,20 +50,7 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - + provided org.jboss.resteasy diff --git a/testsuite/integration-arquillian/servers/cache-server/jboss/infinispan/pom.xml b/testsuite/integration-arquillian/servers/cache-server/jboss/infinispan/pom.xml index eee3c6f09d..97ced202d8 100644 --- a/testsuite/integration-arquillian/servers/cache-server/jboss/infinispan/pom.xml +++ b/testsuite/integration-arquillian/servers/cache-server/jboss/infinispan/pom.xml @@ -45,4 +45,26 @@ ${cache.default.worker.task-max-threads} + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-infinispan-server + generate-resources + + wget + + + http://downloads.jboss.org/infinispan/${cache.server.jboss.version}/infinispan-server-${cache.server.jboss.version}.zip + true + ${containers.home} + + + + + + diff --git a/testsuite/integration-arquillian/servers/cache-server/jboss/jdg/pom.xml b/testsuite/integration-arquillian/servers/cache-server/jboss/jdg/pom.xml index 7b1b99257d..e57d4f922c 100644 --- a/testsuite/integration-arquillian/servers/cache-server/jboss/jdg/pom.xml +++ b/testsuite/integration-arquillian/servers/cache-server/jboss/jdg/pom.xml @@ -45,4 +45,32 @@ ${cache.default.worker.task-max-threads} + + + + maven-dependency-plugin + + + unpack-cache-server + generate-resources + + unpack + + + + + ${cache.server.jboss.groupId} + ${cache.server.jboss.artifactId} + ${cache.server.jboss.version} + zip + bin + ${containers.home} + + + + + + + + diff --git a/testsuite/integration-arquillian/servers/cache-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/cache-server/jboss/pom.xml index 2ef56e32dc..bd2b402777 100644 --- a/testsuite/integration-arquillian/servers/cache-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/cache-server/jboss/pom.xml @@ -39,7 +39,7 @@ - + cache-server-jboss-submodules @@ -49,7 +49,7 @@ - + maven-enforcer-plugin @@ -72,32 +72,7 @@ - - - maven-dependency-plugin - - - unpack-cache-server - generate-resources - - unpack - - - - - ${cache.server.jboss.groupId} - ${cache.server.jboss.artifactId} - ${cache.server.jboss.version} - zip - bin - ${containers.home} - - - - - - - + org.codehaus.mojo xml-maven-plugin diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml index 077c3ca095..8c1169de5e 100644 --- a/testsuite/integration-arquillian/servers/pom.xml +++ b/testsuite/integration-arquillian/servers/pom.xml @@ -46,7 +46,7 @@ - 8.5.0.Final-redhat-9 + 8.5.3.Final-redhat-00002 16 128 @@ -65,12 +65,6 @@ - - auth-server-cluster - - wildfly-balancer - - auth-server-migration diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/assembly.xml b/testsuite/integration-arquillian/servers/wildfly-balancer/assembly.xml deleted file mode 100644 index 50238d4f7d..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly-balancer/assembly.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - balancer-wildfly - - - zip - - - false - - - - ${wildfly.balancer.home} - balancer-wildfly - - **/*.sh - - - - ${wildfly.balancer.home} - balancer-wildfly - - **/*.sh - - 0755 - - - - diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml b/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml deleted file mode 100644 index e48cd2a67a..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers - 4.6.0.Final-SNAPSHOT - - 4.0.0 - - integration-arquillian-server-wildfly-balancer - pom - Wildfly Load Balancer - - - ${project.build.directory}/unpacked/wildfly-${wildfly.version} - ${jboss.default.worker.io-threads} - ${jboss.default.worker.task-max-threads} - ${jboss.default.http.max-connections} - - ${project.build.scriptSourceDirectory} - - - - - - - maven-dependency-plugin - - - unpack-wildfly - generate-resources - - unpack - - - - - org.wildfly - wildfly-dist - ${wildfly.version} - zip - ${project.build.directory}/unpacked - - - - - - - - maven-resources-plugin - - - copy-resources - generate-resources - - copy-resources - - - ${wildfly.balancer.home}/bin - - - ${script.sources.dir}/jboss-cli - true - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - configure-wildfly-modcluster - process-resources - - run - - - - - - - - - - - - maven-assembly-plugin - - - create-zip - package - - single - - - - assembly.xml - - false - - - - - - - - - - community - - - !product - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - - diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/ant/configure.xml b/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/ant/configure.xml deleted file mode 100644 index 2c6ab241fa..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/ant/configure.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - wildfly-modcluster-configured: ${wildfly-modcluster-configured} - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/io-worker-threads.cli b/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/io-worker-threads.cli deleted file mode 100644 index d81d541623..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/io-worker-threads.cli +++ /dev/null @@ -1,7 +0,0 @@ -embed-server --server-config=standalone.xml - -# default is cpuCount * 2 -/subsystem=io/worker=default:write-attribute(name=io-threads,value=${wildfly.balancer.worker.io-threads}) - -# default is cpuCount * 16 -/subsystem=io/worker=default:write-attribute(name=task-max-threads,value=${jboss.default.worker.task-max-threads}) diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/mod-cluster-balancer.cli b/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/mod-cluster-balancer.cli deleted file mode 100644 index 5f89a470b2..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/mod-cluster-balancer.cli +++ /dev/null @@ -1,12 +0,0 @@ -embed-server --server-config=standalone.xml - -/interface=private:add(inet-address=${jboss.bind.address.private:127.0.0.1}) - -/socket-binding-group=standard-sockets/socket-binding=modcluster-advertise:add(interface=private, multicast-port=23364, multicast-address=${jboss.default.multicast.address:224.0.1.105}) -/socket-binding-group=standard-sockets/socket-binding=modcluster-management:add(interface=private, port=6666) - -/extension=org.jboss.as.modcluster/:add -/subsystem=undertow/configuration=filter/mod-cluster=modcluster:add(advertise-socket-binding=modcluster-advertise, advertise-frequency=${modcluster.advertise-frequency:2000}, management-socket-binding=modcluster-management, enable-http2=true) -/subsystem=undertow/server=default-server/host=default-host/filter-ref=modcluster:add -/subsystem=undertow/server=default-server/http-listener=modcluster:add(socket-binding=modcluster-management, enable-http2=true) - diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/undertow.cli b/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/undertow.cli deleted file mode 100644 index 9a557ef9cb..0000000000 --- a/testsuite/integration-arquillian/servers/wildfly-balancer/src/main/scripts/jboss-cli/undertow.cli +++ /dev/null @@ -1,2 +0,0 @@ -embed-server --server-config=standalone.xml -/subsystem=undertow/server=default-server/http-listener=default:write-attribute(name=max-connections,value=${wildfly.balancer.http.max-connections}) diff --git a/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml b/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml index 88b4c30999..8f28e846fe 100644 --- a/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml +++ b/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml @@ -21,7 +21,7 @@ org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jboss-servlet-api_4.0_spec provided diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/resources/META-INF/persistence.xml b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/resources/META-INF/persistence.xml index 369d82100d..702554f61c 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/resources/META-INF/persistence.xml +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/resources/META-INF/persistence.xml @@ -5,7 +5,7 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - org.hibernate.ejb.HibernatePersistence + org.hibernate.jpa.HibernatePersistenceProvider org.keycloak.example.photoz.entity.Album org.keycloak.example.photoz.entity.Photo diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml index 7fd547eff5..1c1785c103 100644 --- a/testsuite/integration-arquillian/test-apps/pom.xml +++ b/testsuite/integration-arquillian/test-apps/pom.xml @@ -26,15 +26,8 @@ fuse - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - + + 1.7 + 1.7 + diff --git a/testsuite/integration-arquillian/test-apps/servlets/pom.xml b/testsuite/integration-arquillian/test-apps/servlets/pom.xml index 727890de43..8dde59e252 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/pom.xml +++ b/testsuite/integration-arquillian/test-apps/servlets/pom.xml @@ -14,8 +14,8 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec junit diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 3833996fca..db9afcaf4f 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -376,7 +376,6 @@ false ${wildfly.deprecated.arquillian.wildfly.container} - ${wildfly.deprecated.infinispan.version} @@ -464,7 +463,7 @@ org.wildfly.core wildfly-cli test - ${wildfly.core.version} + 3.0.10.Final @@ -490,7 +489,8 @@ false 2.0.0.Final - 8.2.5.Final + + remote 10199 @@ -509,7 +509,7 @@ org.wildfly.core wildfly-cli test - ${wildfly10.core.version} + 2.0.10.Final @@ -648,6 +648,7 @@ false - + -Xms512m -Xmx1024m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m @@ -656,6 +657,7 @@ false false - + -Xms512m -Xmx1024m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java index 2ccd04c4be..600e80d671 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java @@ -81,6 +81,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; import static org.keycloak.testsuite.admin.Users.setPasswordFor; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; @@ -365,6 +368,17 @@ public abstract class AbstractKeycloakTest { } } + + protected void removeAllRealmsDespiteMaster() { + // remove all realms (accidentally left by other tests) except for master + adminClient.realms().findAll().stream() + .map(RealmRepresentation::getRealm) + .filter(realmName -> ! realmName.equals("master")) + .forEach(this::removeRealm); + assertThat(adminClient.realms().findAll().size(), is(equalTo(1))); + } + + private UserRepresentation createAdminUserRepresentation() { UserRepresentation adminUserRep = new UserRepresentation(); adminUserRep.setUsername(ADMIN); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java index 262825e546..344d68ef1c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/AbstractPhotozExampleAdapterTest.java @@ -24,6 +24,8 @@ import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.arquillian.graphene.page.Page; import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -60,6 +62,7 @@ import org.keycloak.testsuite.auth.page.login.OIDCLogin; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.JavascriptBrowser; +import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; @@ -90,6 +93,7 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; import javax.ws.rs.core.Response; +import org.keycloak.testsuite.arquillian.AppServerTestEnricher; /** * @author Pedro Igor @@ -155,6 +159,18 @@ public abstract class AbstractPhotozExampleAdapterTest extends AbstractExampleAd importResourceServerSettings(); } + //revert provider in persistence.xml for EAP6 backward compatibility + protected static void updatePersistenceXml(WebArchive war) { + //double check app server is eap6 + if (AppServerTestEnricher.isEAP6AppServer()) { + String persistanceXmlPath = "/WEB-INF/classes/META-INF/persistence.xml"; + org.w3c.dom.Document persistenceXml = IOUtil.loadXML(war.get(persistanceXmlPath).getAsset().openStream()); + IOUtil.modifyDocElementValue(persistenceXml, "provider", + "org.hibernate.jpa.HibernatePersistenceProvider", "org.hibernate.ejb.HibernatePersistence"); + war.add(new StringAsset((IOUtil.documentToString(persistenceXml))), persistanceXmlPath); + } + } + private List getResourcesOfUser(String username) throws FileNotFoundException { return getAuthorizationResource().resources().resources().stream().filter(resource -> resource.getOwner().getName().equals(username)).collect(Collectors.toList()); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java index a4eef0ea92..0b8f51dc76 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.keycloak.testsuite.adapter.page.PhotozClientAuthzTestApp; +import org.keycloak.testsuite.arquillian.AppServerTestEnricher; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.arquillian.containers.ContainerConstants; @@ -42,8 +43,15 @@ public class PhotozExampleLazyLoadPathsAdapterTest extends AbstractPhotozExample @Deployment(name = RESOURCE_SERVER_ID, managed = false, testable = false) public static WebArchive deploymentResourceServer() throws IOException { - return exampleDeployment(RESOURCE_SERVER_ID) + WebArchive war = exampleDeployment(RESOURCE_SERVER_ID) .addAsWebInfResource(new File(TEST_APPS_HOME_DIR + "/photoz/keycloak-lazy-load-path-authz-service.json"), "keycloak.json"); + + // cannot use EAP6DeploymentArchiveProcessor because the deployment is marked + // as non managed by arquillian + if (AppServerTestEnricher.isEAP6AppServer()) { + updatePersistenceXml(war); + } + return war; } } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java index 68aad30e02..b416d99049 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.keycloak.testsuite.adapter.page.PhotozClientAuthzTestApp; +import org.keycloak.testsuite.arquillian.AppServerTestEnricher; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.arquillian.containers.ContainerConstants; @@ -41,7 +42,14 @@ public class PhotozExampleNoLazyLoadPathsAdapterTest extends AbstractPhotozExamp @Deployment(name = RESOURCE_SERVER_ID, managed = false, testable = false) public static WebArchive deploymentResourceServer() throws IOException { - return exampleDeployment(RESOURCE_SERVER_ID); + WebArchive war = exampleDeployment(RESOURCE_SERVER_ID); + + // cannot use EAP6DeploymentArchiveProcessor because the deployment is marked + // as non managed by arquillian + if (AppServerTestEnricher.isEAP6AppServer()) { + updatePersistenceXml(war); + } + return war; } } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java index 5cbe600c58..fc316b99da 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java @@ -92,6 +92,18 @@ public class PermissionsTest extends AbstractKeycloakTest { @Rule public GreenMailRule greenMailRule = new GreenMailRule(); + + // Remove all realms before first run + @Override + public void beforeAbstractKeycloakTestRealmImport() { + if (testContext.isInitialized()) { + return; + } + + removeAllRealmsDespiteMaster(); + } + + @Override public void addTestRealms(List testRealms) { RealmBuilder builder = RealmBuilder.create().name(REALM_NAME).testMail(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java index b9c43a66e8..f619666649 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java @@ -95,6 +95,20 @@ public class RealmTest extends AbstractAdminTest { @Rule public ExpectedException expectedException = ExpectedException.none(); + + // Remove all realms before first run + @Override + public void beforeAbstractKeycloakTestRealmImport() { + if (testContext.isInitialized()) { + return; + } + + removeAllRealmsDespiteMaster(); + + testContext.setInitialized(true); + } + + @Test public void getRealms() { List realms = adminClient.realms().findAll(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java index 057288b457..1a8589521b 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java @@ -81,12 +81,7 @@ public class ExportImportTest extends AbstractKeycloakTest { @Override public void beforeAbstractKeycloakTestRealmImport() { - // remove all realms (accidentally left by other tests) except for master - adminClient.realms().findAll().stream() - .map(RealmRepresentation::getRealm) - .filter(realmName -> ! realmName.equals("master")) - .forEach(this::removeRealm); - assertThat(adminClient.realms().findAll().size(), is(equalTo(1))); + removeAllRealmsDespiteMaster(); } private void setEventsConfig(RealmRepresentation realm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json b/testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json index a40cf3944d..2afb3c27ac 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json @@ -128,7 +128,8 @@ "l1Lifespan": "${keycloak.connectionsInfinispan.l1Lifespan:600000}", "remoteStoreEnabled": "${keycloak.connectionsInfinispan.remoteStoreEnabled:false}", "remoteStoreHost": "${keycloak.connectionsInfinispan.remoteStoreServer:localhost}", - "remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort:11222}" + "remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort:11222}", + "hotrodProtocolVersion": "${keycloak.connectionsInfinispan.hotrodProtocolVersion}" } }, diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml index 788f89c7de..d507fb819e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml @@ -143,7 +143,7 @@ - ${auth.server.cluster} + ${auth.server.jboss.cluster} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer ${auth.server.backend1.home} standalone-ha.xml @@ -167,7 +167,7 @@ - ${auth.server.cluster} + ${auth.server.jboss.cluster} org.jboss.as.arquillian.container.managed.ManagedDeployableContainer ${auth.server.backend2.home} standalone-ha.xml @@ -203,7 +203,9 @@ node1 ${undertow.remote} { - "keycloak.connectionsInfinispan.nodeName": "node1" + "keycloak.connectionsInfinispan.jgroupsUdpMcastAddr": "234.56.78.8", + "keycloak.connectionsInfinispan.nodeName": "node1", + "keycloak.connectionsInfinispan.clustered": "${keycloak.connectionsInfinispan.clustered:true}" } @@ -218,7 +220,9 @@ node2 ${undertow.remote} { - "keycloak.connectionsInfinispan.nodeName": "node2" + "keycloak.connectionsInfinispan.jgroupsUdpMcastAddr": "234.56.78.8", + "keycloak.connectionsInfinispan.nodeName": "node2", + "keycloak.connectionsInfinispan.clustered": "${keycloak.connectionsInfinispan.clustered:true}" } @@ -226,7 +230,7 @@ - ${auth.server.undertow.cluster} + ${auth.server.cluster} org.keycloak.testsuite.arquillian.undertow.lb.SimpleUndertowLoadBalancerContainer localhost ${auth.server.http.port} @@ -319,6 +323,7 @@ "keycloak.connectionsInfinispan.remoteStoreServer": "${keycloak.connectionsInfinispan.remoteStoreServer:localhost}", "keycloak.connectionsInfinispan.remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort:11222}", "keycloak.connectionsInfinispan.remoteStoreEnabled": "${keycloak.connectionsInfinispan.remoteStoreEnabled:true}", + "keycloak.connectionsInfinispan.hotrodProtocolVersion": "${keycloak.connectionsInfinispan.hotrodProtocolVersion}", "keycloak.connectionsJpa.url": "${keycloak.connectionsJpa.url.crossdc:jdbc:h2:mem:test-dc-shared}", "keycloak.connectionsJpa.driver": "${keycloak.connectionsJpa.driver.crossdc:org.h2.Driver}", "keycloak.connectionsJpa.driverDialect": "${keycloak.connectionsJpa.driverDialect.crossdc:}" @@ -342,6 +347,7 @@ "keycloak.connectionsInfinispan.remoteStoreServer": "${keycloak.connectionsInfinispan.remoteStoreServer:localhost}", "keycloak.connectionsInfinispan.remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort:11222}", "keycloak.connectionsInfinispan.remoteStoreEnabled": "${keycloak.connectionsInfinispan.remoteStoreEnabled:true}", + "keycloak.connectionsInfinispan.hotrodProtocolVersion": "${keycloak.connectionsInfinispan.hotrodProtocolVersion}", "keycloak.connectionsJpa.url": "${keycloak.connectionsJpa.url.crossdc:jdbc:h2:mem:test-dc-shared}", "keycloak.connectionsJpa.driver": "${keycloak.connectionsJpa.driver.crossdc:org.h2.Driver}", "keycloak.connectionsJpa.driverDialect": "${keycloak.connectionsJpa.driverDialect.crossdc:}" @@ -366,6 +372,7 @@ "keycloak.connectionsInfinispan.remoteStoreServer": "${keycloak.connectionsInfinispan.remoteStoreServer:localhost}", "keycloak.connectionsInfinispan.remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort.2:11222}", "keycloak.connectionsInfinispan.remoteStoreEnabled": "${keycloak.connectionsInfinispan.remoteStoreEnabled:true}", + "keycloak.connectionsInfinispan.hotrodProtocolVersion": "${keycloak.connectionsInfinispan.hotrodProtocolVersion}", "keycloak.connectionsJpa.url": "${keycloak.connectionsJpa.url.crossdc:jdbc:h2:mem:test-dc-shared}", "keycloak.connectionsJpa.driver": "${keycloak.connectionsJpa.driver.crossdc:org.h2.Driver}", "keycloak.connectionsJpa.driverDialect": "${keycloak.connectionsJpa.driverDialect.crossdc:}" @@ -389,6 +396,7 @@ "keycloak.connectionsInfinispan.remoteStoreServer": "${keycloak.connectionsInfinispan.remoteStoreServer:localhost}", "keycloak.connectionsInfinispan.remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort.2:11222}", "keycloak.connectionsInfinispan.remoteStoreEnabled": "${keycloak.connectionsInfinispan.remoteStoreEnabled:true}", + "keycloak.connectionsInfinispan.hotrodProtocolVersion": "${keycloak.connectionsInfinispan.hotrodProtocolVersion}", "keycloak.connectionsJpa.url": "${keycloak.connectionsJpa.url.crossdc:jdbc:h2:mem:test-dc-shared}", "keycloak.connectionsJpa.driver": "${keycloak.connectionsJpa.driver.crossdc:org.h2.Driver}", "keycloak.connectionsJpa.driverDialect": "${keycloak.connectionsJpa.driverDialect.crossdc:}" @@ -410,8 +418,10 @@ -Dauth.server.truststore=${auth.server.truststore} -Dauth.server.truststore.password=${auth.server.truststore.password} -Dkeycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled=${keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled} + -Dkeycloak.connectionsInfinispan.hotrodProtocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} + ${auth.server.memory.settings} -Djava.net.preferIPv4Stack=true ${auth.server.crossdc01.jvm.debug.args} @@ -436,8 +446,10 @@ -Dauth.server.truststore=${auth.server.truststore} -Dauth.server.truststore.password=${auth.server.truststore.password} -Dkeycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled=${keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled} + -Dkeycloak.connectionsInfinispan.hotrodProtocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} + ${auth.server.memory.settings} -Djava.net.preferIPv4Stack=true ${auth.server.crossdc02.jvm.debug.args} @@ -463,8 +475,10 @@ -Dauth.server.truststore=${auth.server.truststore} -Dauth.server.truststore.password=${auth.server.truststore.password} -Dkeycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled=${keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled} + -Dkeycloak.connectionsInfinispan.hotrodProtocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} + ${auth.server.memory.settings} -Djava.net.preferIPv4Stack=true ${auth.server.crossdc11.jvm.debug.args} @@ -489,8 +503,10 @@ -Dauth.server.truststore=${auth.server.truststore} -Dauth.server.truststore.password=${auth.server.truststore.password} -Dkeycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled=${keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled} + -Dkeycloak.connectionsInfinispan.hotrodProtocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} + ${auth.server.memory.settings} -Djava.net.preferIPv4Stack=true ${auth.server.crossdc12.jvm.debug.args} @@ -502,27 +518,6 @@ - - - - ${auth.server.cluster} - org.jboss.as.arquillian.container.managed.ManagedDeployableContainer - ${auth.server.balancer.home} - - -Djboss.socket.binding.port-offset=${auth.server.port.offset} - -Dauth.server.truststore=${auth.server.truststore} - -Dauth.server.truststore.password=${auth.server.truststore.password} - - - -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m - -Djava.net.preferIPv4Stack=true - - ${frontend.console.output} - ${auth.server.management.port} - ${auth.server.jboss.startup.timeout} - - - ${auth.server.remote} diff --git a/testsuite/integration-arquillian/tests/other/pom.xml b/testsuite/integration-arquillian/tests/other/pom.xml index b5021113d4..af3974fe06 100644 --- a/testsuite/integration-arquillian/tests/other/pom.xml +++ b/testsuite/integration-arquillian/tests/other/pom.xml @@ -65,7 +65,7 @@ org.keycloak.testsuite integration-arquillian-tests-base ${project.version} - test-jar + tests arquillian.xml,keycloak-add-user.json,test-constants.properties,kerberos/*,keystore/keycloak.truststore,password-blacklists/*,log4j.properties diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 462aed22d7..07ed2a5ed1 100755 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -42,6 +42,10 @@ undertow true + false + false + false + false false false @@ -108,6 +112,7 @@ 2010 12000 true + localhost 12232 13232 @@ -510,6 +515,11 @@ ${auth.server.ocsp.responder.enabled} + + ${auth.server.cluster} + ${auth.server.undertow.cluster} + ${auth.server.jboss.cluster} + ${auth.server.crossdc} ${auth.server.undertow.crossdc} @@ -716,6 +726,8 @@ -agentlib:jdwp=transport=dt_socket,server=y,suspend=${cache.server.crossdc2.debug.suspend},address=localhost:${cache.server.crossdc2.jvm.debug.port} + ${keycloak.connectionsInfinispan.hotrodProtocolVersion} + @@ -829,6 +841,7 @@ ${auth.server.crossdc12.home} ${keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled} + ${keycloak.connectionsInfinispan.hotrodProtocolVersion} 21 @@ -881,6 +894,7 @@ ${cache.server.home}/standalone/configuration %d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n false + 2.8 @@ -951,6 +965,7 @@ ${cache.server.home}/standalone/configuration %d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n false + 2.6 @@ -1059,13 +1074,44 @@ + + auth-server-cluster-undertow + + + - + + false + true + true + + true + + + + + + maven-surefire-plugin + + + 20000 + + + + + + + + + auth-server-cluster - - ${containers.home}/auth-server-balancer-wildfly + true + true + ${containers.home}/auth-server-${auth.server}-backend1 ${containers.home}/auth-server-${auth.server}-backend2 @@ -1099,30 +1145,6 @@ - - maven-dependency-plugin - - - unpack-auth-server-load-balancer - generate-resources - - unpack - - - - - org.keycloak.testsuite - integration-arquillian-server-wildfly-balancer - ${project.version} - zip - ${auth.server.balancer.home} - - - true - - - - maven-antrun-plugin @@ -1134,9 +1156,6 @@ - - - @@ -1155,9 +1174,7 @@ true false - true - ${auth.server.balancer.home} ${auth.server.backend1.home} ${auth.server.backend2.home} @@ -1649,15 +1666,6 @@ jackson-annotations - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - - - org.hibernate - hibernate-entitymanager - - org.bouncycastle bcprov-jdk15on diff --git a/testsuite/integration-deprecated/pom.xml b/testsuite/integration-deprecated/pom.xml index 36d9f01821..0f4536ab33 100755 --- a/testsuite/integration-deprecated/pom.xml +++ b/testsuite/integration-deprecated/pom.xml @@ -29,11 +29,6 @@ Keycloak Integration TestSuite - deprecated This testsuite is deprecated. Use testsuite/integration-arquillian instead - - 1.8 - 1.8 - - org.bouncycastle @@ -72,39 +67,25 @@ org.jboss.spec.javax.transaction jboss-transaction-api_1.2_spec - - org.jboss.resteasy - resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - + + org.jboss.resteasy + resteasy-jaxrs + org.jboss.resteasy resteasy-client - - org.jboss.resteasy - resteasy-undertow - - - org.jboss.resteasy - resteasy-multipart-provider - - - org.jboss.resteasy - resteasy-jackson2-provider + + org.jboss.resteasy + resteasy-undertow + + + org.jboss.resteasy + resteasy-multipart-provider + + + org.jboss.resteasy + resteasy-jackson2-provider com.google.zxing @@ -202,18 +183,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -273,7 +246,7 @@ org.keycloak.testsuite integration-arquillian-test-apps-servlets - 4.6.0.Final-SNAPSHOT + ${project.version} @@ -290,14 +263,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml index f8e6ef9f86..d4941a7b66 100755 --- a/testsuite/jetty/jetty92/pom.xml +++ b/testsuite/jetty/jetty92/pom.xml @@ -29,6 +29,9 @@ keycloak-testsuite-jetty92 Keycloak Jetty 9.2.x Integration TestSuite + 1.7 + 1.7 + 9.2.4.v20141103 @@ -72,20 +75,6 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - org.jboss.resteasy @@ -163,18 +152,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -204,7 +185,6 @@ org.wildfly wildfly-undertow - ${wildfly.version} test @@ -281,14 +261,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/jetty/jetty93/pom.xml b/testsuite/jetty/jetty93/pom.xml index af8eb29e3e..318466561a 100644 --- a/testsuite/jetty/jetty93/pom.xml +++ b/testsuite/jetty/jetty93/pom.xml @@ -72,20 +72,6 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - org.jboss.resteasy @@ -163,18 +149,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -204,7 +182,6 @@ org.wildfly wildfly-undertow - ${wildfly.version} test @@ -281,14 +258,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/jetty/jetty94/pom.xml b/testsuite/jetty/jetty94/pom.xml index 6801f73955..7200d91277 100644 --- a/testsuite/jetty/jetty94/pom.xml +++ b/testsuite/jetty/jetty94/pom.xml @@ -72,20 +72,6 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - org.jboss.resteasy @@ -163,18 +149,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -204,7 +182,6 @@ org.wildfly wildfly-undertow - ${wildfly.version} test @@ -281,14 +258,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/performance/tests/pom.xml b/testsuite/performance/tests/pom.xml index 4258bf6079..7d32e79066 100644 --- a/testsuite/performance/tests/pom.xml +++ b/testsuite/performance/tests/pom.xml @@ -48,9 +48,6 @@ https://downloads.jboss.org/keycloak-qe/${server.version} 1 - 1.8 - 1.8 - 2.11.7 2.1.7 2.2.1 diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml index 24a555f093..ae43bd51d2 100755 --- a/testsuite/proxy/pom.xml +++ b/testsuite/proxy/pom.xml @@ -63,20 +63,6 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - org.jboss.resteasy @@ -154,18 +140,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -195,7 +173,6 @@ org.wildfly wildfly-undertow - ${wildfly.version} test @@ -248,14 +225,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml index 7dd39284d2..ecc136869a 100755 --- a/testsuite/tomcat7/pom.xml +++ b/testsuite/tomcat7/pom.xml @@ -29,6 +29,9 @@ keycloak-testsuite-tomcat7 Keycloak Tomcat 7 Integration TestSuite + 1.7 + 1.7 + 7.0.59 @@ -86,20 +89,6 @@ org.jboss.resteasy resteasy-jaxrs - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - org.keycloak @@ -195,18 +184,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -273,14 +254,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml index 8bf39a6290..46400f2974 100755 --- a/testsuite/tomcat8/pom.xml +++ b/testsuite/tomcat8/pom.xml @@ -29,6 +29,9 @@ keycloak-testsuite-tomcat8 Keycloak Tomcat 8 Integration TestSuite + 1.7 + 1.7 + 8.0.14 @@ -167,18 +170,10 @@ org.hamcrest hamcrest-all - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail @@ -260,14 +255,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo exec-maven-plugin diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index 227157d2d3..064123d7f6 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -30,8 +30,6 @@ - 1.8 - 1.8 NON_EXISTENT_PATH_OVERRIDE_ON_COMMAND_LINE @@ -202,19 +200,11 @@ com.fasterxml.jackson.core jackson-annotations - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - com.h2database h2 compile - - org.hibernate - hibernate-entitymanager - com.icegreen greenmail diff --git a/testsuite/utils/src/main/resources/META-INF/keycloak-server.json b/testsuite/utils/src/main/resources/META-INF/keycloak-server.json index 8da4160c96..5ed3ac19af 100755 --- a/testsuite/utils/src/main/resources/META-INF/keycloak-server.json +++ b/testsuite/utils/src/main/resources/META-INF/keycloak-server.json @@ -104,7 +104,8 @@ "l1Lifespan": "${keycloak.connectionsInfinispan.l1Lifespan:600000}", "remoteStoreEnabled": "${keycloak.connectionsInfinispan.remoteStoreEnabled:false}", "remoteStoreHost": "${keycloak.connectionsInfinispan.remoteStoreServer:localhost}", - "remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort:11222}" + "remoteStorePort": "${keycloak.connectionsInfinispan.remoteStorePort:11222}", + "hotrodProtocolVersion": "${keycloak.connectionsInfinispan.hotrodProtocolVersion}" } }, diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml index 19f1ce539e..dda062dc47 100644 --- a/util/embedded-ldap/pom.xml +++ b/util/embedded-ldap/pom.xml @@ -85,17 +85,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java index 563df2083d..fbacff5374 100755 --- a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java +++ b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java @@ -92,6 +92,12 @@ public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcesso param.setParamValue(configService.getConfig().toString()); contextParams.add(param); + // Prefer ResteasyJackson2Provider over JsonBindingProvider + param = new ParamValueMetaData(); + param.setParamName("resteasy.preferJacksonOverJsonB"); // Corresponds to ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB + param.setParamValue(Boolean.TRUE.toString()); + contextParams.add(param); + webMetaData.setContextParams(contextParams); } diff --git a/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml b/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml index f1edb8092a..211034b84c 100755 --- a/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml +++ b/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml @@ -19,7 +19,7 @@ org.jboss.as.clustering.infinispan - + diff --git a/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-undertow.xml b/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-undertow.xml index 715d13621b..ed1ab2563e 100644 --- a/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-undertow.xml +++ b/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-undertow.xml @@ -24,7 +24,7 @@ org.wildfly.extension.undertow - +