diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml index 600eaa2ec8..ee3c384760 100644 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml @@ -4,88 +4,88 @@ org.bouncycastle bcpkix-jdk15on - 1.65 + 1.67 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html org.bouncycastle bcprov-jdk15on - 1.65 + 1.67 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html com.fasterxml.jackson.core jackson-annotations - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.11.3/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.11.3/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.11.3/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.65,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.67,MIT License.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.65,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.67,MIT License.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.65,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.67,MIT License.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.65,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.67,MIT License.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml index 28267c4305..7761b80b65 100644 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml @@ -26,66 +26,66 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.11.3,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.11.3,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml index e0891987a9..3a4d471b43 100644 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml @@ -4,88 +4,88 @@ org.bouncycastle bcpkix-jdk15on - 1.65 + 1.67 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html org.bouncycastle bcprov-jdk15on - 1.65 + 1.67 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html com.fasterxml.jackson.core jackson-annotations - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.11.3/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.11.3/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.11.3/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/base/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.10.5 + 2.11.3 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-modules-base/jackson-modules-base-2.11.3/jaxb/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.65,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.67,MIT License.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.65,MIT License.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.67,MIT License.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.65,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.67,MIT License.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.65,MIT License.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.67,MIT License.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.4.redhat-00001,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.5.redhat-00002,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml index a35dc5593f..b5c866313b 100644 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml @@ -26,66 +26,66 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.10.4.redhat-00001 + 2.10.5.redhat-00002 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE 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 2c5ecb8dae..ca8793c57f 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 556d016295..501826873e 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 dd7f46932d..e601b3c4d3 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 79279bc0cb..4c420432ac 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/subsystems-ha.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml index 3055d3ffd6..2f66515bae 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml @@ -19,34 +19,33 @@ - logging.xml bean-validation.xml core-management.xml - keycloak-datasources.xml deployment-scanner.xml ee.xml - ejb3.xml + health.xml io.xml - keycloak-infinispan.xml jaxrs.xml jca.xml - jgroups.xml jmx.xml jpa.xml + keycloak-server.xml + logging.xml mail.xml - mod_cluster.xml + metrics.xml naming.xml remoting.xml request-controller.xml security-manager.xml - elytron.xml security.xml + jgroups.xml + keycloak-datasources.xml + mod_cluster.xml + ejb3.xml + keycloak-infinispan.xml + keycloak-undertow.xml + elytron.xml transactions.xml weld.xml - microprofile-config-smallrye.xml - microprofile-health-smallrye.xml - microprofile-metrics-smallrye.xml - keycloak-undertow.xml - keycloak-server.xml - \ No newline at end of file + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml index cf9a6ba15b..a3d8bc1477 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml @@ -19,32 +19,31 @@ - logging.xml bean-validation.xml core-management.xml - keycloak-datasources.xml deployment-scanner.xml ee.xml ejb3.xml + health.xml io.xml - keycloak-infinispan.xml jaxrs.xml jca.xml jmx.xml jpa.xml + keycloak-infinispan.xml + keycloak-server.xml + keycloak-undertow.xml + logging.xml mail.xml + metrics.xml naming.xml remoting.xml request-controller.xml security-manager.xml - elytron.xml security.xml + keycloak-datasources.xml + elytron.xml transactions.xml weld.xml - microprofile-config-smallrye.xml - microprofile-health-smallrye.xml - microprofile-metrics-smallrye.xml - keycloak-undertow.xml - keycloak-server.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 9cd7c0abee..89ecaa6a9c 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 e5c4f2b8df..b00370a4c9 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 @@ -72,7 +72,7 @@ set persistenceProvider=jpa if (outcome == failed) of /profile=$clusteredProfile/subsystem=infinispan/cache-container=keycloak/distributed-cache=authorization/:read-resource # In migration from 3.0.0 to 3.2.0 there is authorization distributed-cache replaced with local-cache try - echo + echo /profile=$clusteredProfile/subsystem=infinispan/cache-container=keycloak/distributed-cache=authorization/:add(mode=SYNC,owners=1) echo Added distributed-cache=authorization catch @@ -144,7 +144,7 @@ end-if # Migrate from 2.4.0 to 2.5.0 -if (result == NONE) of /profile=$clusteredProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) +if (result == NONE) of /profile=$clusteredProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) echo Adding eviction strategy to keycloak realms cache... /profile=$clusteredProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=strategy,value=LRU) /profile=$clusteredProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=max-entries,value=10000) @@ -167,7 +167,7 @@ if (outcome == success) of /profile=$clusteredProfile/subsystem=infinispan/cache end-if -# Migrate from 2.5.4 to 3.0.0 +# Migrate from 2.5.4 to 3.0.0 if (result == jpa) of /profile=$clusteredProfile/subsystem=keycloak-server/spi=eventsStore/:read-attribute(name=default-provider,include-defaults=false) echo Removing default provider for eventsStore /profile=$clusteredProfile/subsystem=keycloak-server/spi=eventsStore/:undefine-attribute(name=default-provider) @@ -341,7 +341,7 @@ if (outcome == success) of /profile=$clusteredProfile/subsystem=jgroups/stack=tc /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/protocol=FD/:remove /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/protocol=FD_ALL/:add echo -end-if +end-if if (result != undefined) of /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:read-attribute(name=socket-binding) echo Unsetting socket-binding from tcp FD_SOCK protocol @@ -349,7 +349,7 @@ if (result != undefined) of /profile=$clusteredProfile/subsystem=jgroups/stack=t /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:remove /profile=$clusteredProfile/subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:add echo -end-if +end-if if (outcome == failed) of /profile=$clusteredProfile/subsystem=undertow/server=default-server/host=default-host/setting=http-invoker/:read-resource echo Adding http-invoker to default-host @@ -397,7 +397,7 @@ if (outcome == success) of /profile=$clusteredProfile/subsystem=jdr/:read-resour echo end-try end-if - + if (outcome == success) of /profile=$clusteredProfile/subsystem=jsf/:read-resource echo Removing jsf subsystem and extension /profile=$clusteredProfile/subsystem=jsf/:remove @@ -579,13 +579,13 @@ if (result == NON_XA) of /profile=$clusteredProfile/subsystem=infinispan/cache-c end-if if (result == false) of /profile=$clusteredProfile/subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to ExampleDS datasource + echo Adding statistics-enabled expression to ExampleDS datasource /profile=$clusteredProfile/subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if if (result == false) of /profile=$clusteredProfile/subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to KeycloakDS datasource + echo Adding statistics-enabled expression to KeycloakDS datasource /profile=$clusteredProfile/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if @@ -703,4 +703,30 @@ if (result != org.keycloak.keycloak-model-infinispan) of /profile=$clusteredProf echo end-if +# Migrate from 12.0.0 to 13.0.0 + +## Add ability to make use of automatically generated self-signed certificate with Elytron, +## introduced by WFCORE-5095 in Wildfly Core 14.0.0.Final + +if (outcome == failed) of /profile=$clusteredProfile/subsystem=elytron/key-store=applicationKS:read-resource + echo Adding key store for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /profile=$clusteredProfile/subsystem=elytron/key-store=applicationKS:add(credential-reference={clear-text=password},type=JKS) + /profile=$clusteredProfile/subsystem=elytron/key-store=applicationKS:write-attribute(name=path,value=application.keystore) + /profile=$clusteredProfile/subsystem=elytron/key-store=applicationKS:write-attribute(name=relative-to,value=jboss.domain.config.dir) + echo +end-if + +if (outcome == failed) of /profile=$clusteredProfile/subsystem=elytron/key-manager=applicationKM:read-resource + echo Adding key manager for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /profile=$clusteredProfile/subsystem=elytron/key-manager=applicationKM:add(key-store=applicationKS, credential-reference={clear-text=password}) + /profile=$clusteredProfile/subsystem=elytron/key-manager=applicationKM:write-attribute(name=generate-self-signed-certificate-host,value=localhost) + echo +end-if + +if (outcome == failed) of /profile=$clusteredProfile/subsystem=elytron/server-ssl-context=applicationSSC:read-resource + echo Adding SSL context for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /profile=$clusteredProfile/subsystem=elytron/server-ssl-context=applicationSSC:add(key-manager=applicationKM) + echo +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 652bbb8180..974b53bbae 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 @@ -118,7 +118,7 @@ if (result == undefined) of /profile=$standaloneProfile/subsystem=infinispan/cac /profile=$standaloneProfile/subsystem=infinispan/cache-container=keycloak/local-cache=keys/component=expiration/:write-attribute(name=max-idle,value=3600000) echo end-if -if (outcome == failed) of /profile=$standaloneProfile/subsystem=keycloak-server/spi=publicKeyStorage/:read-resource +if (outcome == failed) of /profile=$standaloneProfile/subsystem=keycloak-server/spi=publicKeyStorage/:read-resource echo Adding spi=publicKeyStorage... /profile=$standaloneProfile/subsystem=keycloak-server/spi=publicKeyStorage/:add /profile=$standaloneProfile/subsystem=keycloak-server/spi=publicKeyStorage/provider=infinispan/:add(properties={minTimeBetweenRequests => "10"},enabled=true) @@ -129,7 +129,7 @@ end-if # NO CHANGES # Migrate from 2.4.0 to 2.5.0 -if (result == NONE) of /profile=$standaloneProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) +if (result == NONE) of /profile=$standaloneProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) echo Adding eviction strategy to keycloak realms cache... /profile=$standaloneProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=strategy,value=LRU) /profile=$standaloneProfile/subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=max-entries,value=10000) @@ -152,7 +152,7 @@ if (outcome == success) of /profile=$standaloneProfile/subsystem=infinispan/cach end-if -# Migrate from 2.5.4 to 3.0.0 +# Migrate from 2.5.4 to 3.0.0 if (result == jpa) of /profile=$standaloneProfile/subsystem=keycloak-server/spi=eventsStore/:read-attribute(name=default-provider,include-defaults=false) echo Removing default provider for eventsStore /profile=$standaloneProfile/subsystem=keycloak-server/spi=eventsStore/:undefine-attribute(name=default-provider) @@ -357,7 +357,7 @@ if (outcome == success) of /profile=$standaloneProfile/subsystem=jdr/:read-resou echo end-try end-if - + if (outcome == success) of /profile=$standaloneProfile/subsystem=jsf/:read-resource echo Removing jsf subsystem and extension /profile=$standaloneProfile/subsystem=jsf/:remove @@ -504,13 +504,13 @@ if (result == NON_XA) of /profile=$standaloneProfile/subsystem=infinispan/cache- end-if if (result == false) of /profile=$standaloneProfile/subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to ExampleDS datasource + echo Adding statistics-enabled expression to ExampleDS datasource /profile=$standaloneProfile/subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if if (result == false) of /profile=$standaloneProfile/subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to KeycloakDS datasource + echo Adding statistics-enabled expression to KeycloakDS datasource /profile=$standaloneProfile/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if @@ -604,4 +604,30 @@ if (result != org.keycloak.keycloak-model-infinispan) of /profile=$standalonePro echo end-if +# Migrate from 12.0.0 to 13.0.0 + +## Add ability to make use of automatically generated self-signed certificate with Elytron, +## introduced by WFCORE-5095 in Wildfly Core 14.0.0.Final + +if (outcome == failed) of /profile=$standaloneProfile/subsystem=elytron/key-store=applicationKS:read-resource + echo Adding key store for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /profile=$standaloneProfile/subsystem=elytron/key-store=applicationKS:add(credential-reference={clear-text=password},type=JKS) + /profile=$standaloneProfile/subsystem=elytron/key-store=applicationKS:write-attribute(name=path,value=application.keystore) + /profile=$standaloneProfile/subsystem=elytron/key-store=applicationKS:write-attribute(name=relative-to,value=jboss.domain.config.dir) + echo +end-if + +if (outcome == failed) of /profile=$standaloneProfile/subsystem=elytron/key-manager=applicationKM:read-resource + echo Adding key manager for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /profile=$standaloneProfile/subsystem=elytron/key-manager=applicationKM:add(key-store=applicationKS, credential-reference={clear-text=password}) + /profile=$standaloneProfile/subsystem=elytron/key-manager=applicationKM:write-attribute(name=generate-self-signed-certificate-host,value=localhost) + echo +end-if + +if (outcome == failed) of /profile=$standaloneProfile/subsystem=elytron/server-ssl-context=applicationSSC:read-resource + echo Adding SSL context for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /profile=$standaloneProfile/subsystem=elytron/server-ssl-context=applicationSSC:add(key-manager=applicationKM) + echo +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 bfc3f66bce..ea3f539b0b 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 @@ -67,7 +67,7 @@ if (outcome == failed) of /extension=org.jboss.as.deployment-scanner/:read-resou end-if if (outcome == failed) of /subsystem=deployment-scanner/:read-resource echo Adding deployment-scanner... - /subsystem=deployment-scanner/:add + /subsystem=deployment-scanner/:add echo end-if if (outcome == failed) of /subsystem=deployment-scanner/scanner=default/:read-resource @@ -79,7 +79,7 @@ end-if if (outcome == failed) of /subsystem=infinispan/cache-container=keycloak/distributed-cache=authorization/:read-resource # In migration from 3.0.0 to 3.2.0 there is authorization distributed-cache replaced with local-cache try - echo + echo /subsystem=infinispan/cache-container=keycloak/distributed-cache=authorization/:add(mode=SYNC,owners=1) echo Added distributed-cache=authorization catch @@ -122,7 +122,7 @@ if (result == undefined) of /subsystem=infinispan/cache-container=keycloak/local /subsystem=infinispan/cache-container=keycloak/local-cache=keys/component=expiration/:write-attribute(name=max-idle,value=3600000) echo end-if -if (outcome == failed) of /subsystem=keycloak-server/spi=publicKeyStorage/:read-resource +if (outcome == failed) of /subsystem=keycloak-server/spi=publicKeyStorage/:read-resource echo Adding spi=publicKeyStorage... /subsystem=keycloak-server/spi=publicKeyStorage/:add /subsystem=keycloak-server/spi=publicKeyStorage/provider=infinispan/:add(properties={minTimeBetweenRequests => "10"},enabled=true) @@ -151,7 +151,7 @@ end-if # Migrate from 2.4.0 to 2.5.0 -if (result == NONE) of /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) +if (result == NONE) of /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) echo Adding eviction strategy to keycloak realms cache... /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=strategy,value=LRU) /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=max-entries,value=10000) @@ -174,7 +174,7 @@ if (outcome == success) of /subsystem=infinispan/cache-container=hibernate/local end-if -# Migrate from 2.5.4 to 3.0.0 +# Migrate from 2.5.4 to 3.0.0 if (result == jpa) of /subsystem=keycloak-server/spi=eventsStore/:read-attribute(name=default-provider,include-defaults=false) echo Removing default provider for eventsStore /subsystem=keycloak-server/spi=eventsStore/:undefine-attribute(name=default-provider) @@ -259,7 +259,7 @@ if (outcome == failed) of /core-service=management/security-realm=ApplicationRea echo Adding keystore to ApplicationRealm... /core-service=management/security-realm=ApplicationRealm/server-identity=ssl:add(keystore-path=application.keystore,keystore-relative-to=jboss.server.config.dir,keystore-password=password,alias=server,key-password=password,generate-self-signed-certificate-host=localhost) echo -end-if +end-if if (outcome == failed) of /extension=org.wildfly.extension.elytron/:read-resource echo Adding elytron extension... @@ -339,7 +339,7 @@ if (outcome == success) of /subsystem=jgroups/stack=tcp/protocol=FD/:read-resour /subsystem=jgroups/stack=tcp/protocol=FD/:remove /subsystem=jgroups/stack=tcp/protocol=FD_ALL/:add echo -end-if +end-if if (result != undefined) of /subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:read-attribute(name=socket-binding) echo Unsetting socket-binding from tcp FD_SOCK protocol @@ -347,7 +347,7 @@ if (result != undefined) of /subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:read- /subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:remove /subsystem=jgroups/stack=tcp/protocol=FD_SOCK/:add echo -end-if +end-if if (outcome == failed) of /subsystem=undertow/server=default-server/host=default-host/setting=http-invoker/:read-resource echo Adding http-invoker to default-host @@ -401,7 +401,7 @@ if (outcome == success) of /subsystem=jdr/:read-resource /extension=org.jboss.as.jdr/:remove echo end-if - + if (outcome == success) of /subsystem=jsf/:read-resource echo Removing jsf subsystem and extension /subsystem=jsf/:remove @@ -587,13 +587,13 @@ if (result == NON_XA) of /subsystem=infinispan/cache-container=hibernate/local-c end-if if (result == false) of /subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to ExampleDS datasource + echo Adding statistics-enabled expression to ExampleDS datasource /subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if if (result == false) of /subsystem=datasources/data-source=KeycloakDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to KeycloakDS datasource + echo Adding statistics-enabled expression to KeycloakDS datasource /subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if @@ -634,52 +634,10 @@ if (outcome == failed) of /subsystem=weld/:read-resource echo end-if -if (outcome == failed) of /extension=org.wildfly.extension.microprofile.config-smallrye/:read-resource - echo Adding microprofile.config-smallrye extension... - /extension=org.wildfly.extension.microprofile.config-smallrye/:add(module=org.wildfly.extension.microprofile.config-smallrye) - echo -end-if - -if (outcome == failed) of /subsystem=microprofile-config-smallrye/:read-resource - echo Adding microprofile-config-smallrye subsystem - /subsystem=microprofile-config-smallrye/:add - echo -end-if - -if (outcome == failed) of /extension=org.wildfly.extension.microprofile.health-smallrye/:read-resource - echo Adding microprofile.health-smallrye extension... - /extension=org.wildfly.extension.microprofile.health-smallrye/:add(module=org.wildfly.extension.microprofile.health-smallrye) - echo -end-if - -if (outcome == failed) of /subsystem=microprofile-health-smallrye/:read-resource - echo Adding microprofile-health-smallrye subsystem - /subsystem=microprofile-health-smallrye/:add - /subsystem=microprofile-health-smallrye/:write-attribute(name=security-enabled,value=false) - echo -end-if - -if (outcome == failed) of /extension=org.wildfly.extension.microprofile.metrics-smallrye/:read-resource - echo Adding microprofile.metrics-smallrye extension... - /extension=org.wildfly.extension.microprofile.metrics-smallrye/:add(module=org.wildfly.extension.microprofile.metrics-smallrye) - echo -end-if - -if (outcome == failed) of /subsystem=microprofile-metrics-smallrye/:read-resource - echo Adding microprofile-metrics-smallrye subsystem - /subsystem=microprofile-metrics-smallrye/:add - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=security-enabled,value=false) - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=exposed-subsystems,value=[*]) - echo -end-if - -if (result == "Keycloak") of :read-attribute(name=product-name) - echo Adding microprofile-metrics-smallrye subsystem prefix attribute to Keycloak - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) -else - echo Adding microprofile-metrics-smallrye subsystem prefix attribute to RH-SSO - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:jboss}) -end-if +## KEYCLOAK-16723 / KEYCLOAK-16907: +## +## Loading of MicroProfile SmallRye config, health, and metrics extensions & subsystems got removed +## as part of upgrading to Wildfly 22. See [WFLY-14203], [WFLY-14151], and [WFLY-14108] for details # Migrate from 6.0.1 to 7.0.0 if (outcome == success) of /subsystem=ejb3/service=remote/channel-creation-options=READ_TIMEOUT/:read-resource @@ -796,4 +754,107 @@ if (result != expression "${jboss.mail.server.port:25}") of /socket-binding-grou echo end-if +# Migrate from 12.0.0 to 13.0.0 + +## KEYCLOAK-16723 / KEYCLOAK-16907: +## +## Based on [WFLY-14203], [WFLY-14151], and [WFLY-14108] remove MicroProfile SmallRye config, health, and metrics if present + +if (outcome == success) of /subsystem=microprofile-config-smallrye/:read-resource + echo Removing microprofile-config-smallrye subsystem... + /subsystem=microprofile-config-smallrye/:remove + echo +end-if + +if (outcome == success) of /extension=org.wildfly.extension.microprofile.config-smallrye/:read-resource + echo Removing microprofile.config-smallrye extension... + /extension=org.wildfly.extension.microprofile.config-smallrye/:remove + echo +end-if + +if (outcome == success) of /subsystem=microprofile-health-smallrye/:read-resource + echo Removing microprofile-health-smallrye subsystem... + /subsystem=microprofile-health-smallrye/:remove + echo +end-if + +if (outcome == success) of /extension=org.wildfly.extension.microprofile.health-smallrye/:read-resource + echo Removing microprofile.health-smallrye extension... + /extension=org.wildfly.extension.microprofile.health-smallrye/:remove + echo +end-if + +if (outcome == success) of /subsystem=microprofile-metrics-smallrye/:read-resource + echo Removing microprofile-metrics-smallrye subsystem... + /subsystem=microprofile-metrics-smallrye/:remove + echo +end-if + +if (outcome == success) of /extension=org.wildfly.extension.microprofile.metrics-smallrye/:read-resource + echo Removing microprofile.metrics-smallrye extension... + /extension=org.wildfly.extension.microprofile.metrics-smallrye/:remove + echo +end-if + +## Yet based on [WFLY-14203], [WFLY-14151], and [WFLY-14108] load +## org.wildfly.extension.health/org.wildfly.extension.metrics extensions & subsystems instead + +if (outcome == failed) of /extension=org.wildfly.extension.health:read-resource + echo Adding WildFly extension for health... + /extension=org.wildfly.extension.health:add(module=org.wildfly.extension.health) + echo +end-if + +if (outcome == failed) of /subsystem=health:read-resource + echo Adding Wildfly subsystem for health... + /subsystem=health:add(security-enabled=false) + echo +end-if + +if (outcome == failed) of /extension=org.wildfly.extension.metrics:read-resource + echo Adding Wildfly extension for base metrics... + /extension=org.wildfly.extension.metrics:add(module=org.wildfly.extension.metrics) + echo +end-if + +if (outcome == failed) of /subsystem=metrics:read-resource + echo Adding Wildfly subsystem for base metrics... + /subsystem=metrics:add(exposed-subsystems=[*],security-enabled=false) + echo +end-if + +if (result == "Keycloak") of :read-attribute(name=product-name) + echo Adding base metrics subsystem prefix to Keycloak... + /subsystem=metrics:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) + echo +else + echo Adding base metrics subsystem prefix to RH-SSO... + /subsystem=metrics:write-attribute(name=prefix,value=${wildfly.metrics.prefix:jboss}) + echo +end-if + +## Add ability to make use of automatically generated self-signed certificate with Elytron, +## introduced by WFCORE-5095 in Wildfly Core 14.0.0.Final + +if (outcome == failed) of /subsystem=elytron/key-store=applicationKS:read-resource + echo Adding key store for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /subsystem=elytron/key-store=applicationKS:add(credential-reference={clear-text=password},type=JKS) + /subsystem=elytron/key-store=applicationKS:write-attribute(name=path,value=application.keystore) + /subsystem=elytron/key-store=applicationKS:write-attribute(name=relative-to,value=jboss.server.config.dir) + echo +end-if + +if (outcome == failed) of /subsystem=elytron/key-manager=applicationKM:read-resource + echo Adding key manager for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /subsystem=elytron/key-manager=applicationKM:add(key-store=applicationKS, credential-reference={clear-text=password}) + /subsystem=elytron/key-manager=applicationKM:write-attribute(name=generate-self-signed-certificate-host,value=localhost) + echo +end-if + +if (outcome == failed) of /subsystem=elytron/server-ssl-context=applicationSSC:read-resource + echo Adding SSL context for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /subsystem=elytron/server-ssl-context=applicationSSC:add(key-manager=applicationKM) + echo +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 988b83d1d9..b4a3c9feee 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 @@ -81,7 +81,7 @@ if (outcome == failed) of /extension=org.jboss.as.deployment-scanner/:read-resou end-if if (outcome == failed) of /subsystem=deployment-scanner/:read-resource echo Adding deployment-scanner... - /subsystem=deployment-scanner/:add + /subsystem=deployment-scanner/:add echo end-if if (outcome == failed) of /subsystem=deployment-scanner/scanner=default/:read-resource @@ -125,7 +125,7 @@ if (result == undefined) of /subsystem=infinispan/cache-container=keycloak/local /subsystem=infinispan/cache-container=keycloak/local-cache=keys/component=expiration/:write-attribute(name=max-idle,value=3600000) echo end-if -if (outcome == failed) of /subsystem=keycloak-server/spi=publicKeyStorage/:read-resource +if (outcome == failed) of /subsystem=keycloak-server/spi=publicKeyStorage/:read-resource echo Adding spi=publicKeyStorage... /subsystem=keycloak-server/spi=publicKeyStorage/:add /subsystem=keycloak-server/spi=publicKeyStorage/provider=infinispan/:add(properties={minTimeBetweenRequests => "10"},enabled=true) @@ -136,7 +136,7 @@ end-if # NO CHANGES # Migrate from 2.4.0 to 2.5.0 -if (result == NONE) of /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) +if (result == NONE) of /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:read-attribute(name=strategy) echo Adding eviction strategy to keycloak realms cache... /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=strategy,value=LRU) /subsystem=infinispan/cache-container=keycloak/local-cache=realms/component=eviction/:write-attribute(name=max-entries,value=10000) @@ -159,7 +159,7 @@ if (outcome == success) of /subsystem=infinispan/cache-container=hibernate/local end-if -# Migrate from 2.5.4 to 3.0.0 +# Migrate from 2.5.4 to 3.0.0 if (result == jpa) of /subsystem=keycloak-server/spi=eventsStore/:read-attribute(name=default-provider,include-defaults=false) echo Removing default provider for eventsStore /subsystem=keycloak-server/spi=eventsStore/:undefine-attribute(name=default-provider) @@ -244,7 +244,7 @@ if (outcome == failed) of /core-service=management/security-realm=ApplicationRea echo Adding keystore to ApplicationRealm... /core-service=management/security-realm=ApplicationRealm/server-identity=ssl:add(keystore-path=application.keystore,keystore-relative-to=jboss.server.config.dir,keystore-password=password,alias=server,key-password=password,generate-self-signed-certificate-host=localhost) echo -end-if +end-if if (outcome == failed) of /extension=org.wildfly.extension.elytron/:read-resource echo Adding elytron extension... @@ -345,7 +345,7 @@ if (outcome == success) of /subsystem=jdr/:read-resource /extension=org.jboss.as.jdr/:remove echo end-if - + if (outcome == success) of /subsystem=jsf/:read-resource echo Removing jsf subsystem and extension /subsystem=jsf/:remove @@ -476,7 +476,7 @@ if (result == NON_XA) of /subsystem=infinispan/cache-container=hibernate/local-c end-if if (result == false) of /subsystem=datasources/data-source=ExampleDS/:read-attribute(name=statistics-enabled) - echo Adding statistics-enabled expression to ExampleDS datasource + echo Adding statistics-enabled expression to ExampleDS datasource /subsystem=datasources/data-source=ExampleDS/:write-attribute(name=statistics-enabled,value=${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}) echo end-if @@ -523,52 +523,10 @@ if (outcome == failed) of /subsystem=weld/:read-resource echo end-if -if (outcome == failed) of /extension=org.wildfly.extension.microprofile.health-smallrye/:read-resource - echo Adding microprofile.health-smallrye extension... - /extension=org.wildfly.extension.microprofile.health-smallrye/:add(module=org.wildfly.extension.microprofile.health-smallrye) - echo -end-if - -if (outcome == failed) of /subsystem=microprofile-health-smallrye/:read-resource - echo Adding microprofile-health-smallrye subsystem - /subsystem=microprofile-health-smallrye/:add - /subsystem=microprofile-health-smallrye/:write-attribute(name=security-enabled,value=false) - echo -end-if - -if (outcome == failed) of /extension=org.wildfly.extension.microprofile.config-smallrye/:read-resource - echo Adding microprofile.config-smallrye extension... - /extension=org.wildfly.extension.microprofile.config-smallrye/:add(module=org.wildfly.extension.microprofile.config-smallrye) - echo -end-if - -if (outcome == failed) of /subsystem=microprofile-config-smallrye/:read-resource - echo Adding microprofile-config-smallrye subsystem - /subsystem=microprofile-config-smallrye/:add - echo -end-if - -if (outcome == failed) of /extension=org.wildfly.extension.microprofile.metrics-smallrye/:read-resource - echo Adding microprofile.metrics-smallrye extension... - /extension=org.wildfly.extension.microprofile.metrics-smallrye/:add(module=org.wildfly.extension.microprofile.metrics-smallrye) - echo -end-if - -if (outcome == failed) of /subsystem=microprofile-metrics-smallrye/:read-resource - echo Adding microprofile-metrics-smallrye subsystem - /subsystem=microprofile-metrics-smallrye/:add - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=security-enabled,value=false) - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=exposed-subsystems,value=[*]) - echo -end-if - -if (result == "Keycloak") of :read-attribute(name=product-name) - echo Adding microprofile-metrics-smallrye subsystem prefix attribute to Keycloak - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) -else - echo Adding microprofile-metrics-smallrye subsystem prefix attribute to RH-SSO - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:jboss}) -end-if +## KEYCLOAK-16723 / KEYCLOAK-16907: +## +## Loading of MicroProfile SmallRye config, health, and metrics extensions & subsystems got removed +## as part of upgrading to Wildfly 22. See [WFLY-14203], [WFLY-14151], and [WFLY-14108] for details # Migrate from 6.0.1 to 7.0.0 if (outcome == success) of /subsystem=ejb3/service=remote/channel-creation-options=READ_TIMEOUT/:read-resource @@ -608,18 +566,6 @@ if ((result.time == 100L) && (result.unit == MILLISECONDS)) of /subsystem=ejb3/t echo end-if -if (result == UP) of /subsystem=microprofile-health-smallrye:read-attribute(name=empty-liveness-checks-status) - echo Adding empty-liveness-checks-status attribute to microprofile-health-smallrye subsystem - /subsystem=microprofile-health-smallrye:write-attribute(name=empty-liveness-checks-status, value=${env.MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS:UP}) - echo -end-if - -if (result == UP) of /subsystem=microprofile-health-smallrye:read-attribute(name=empty-readiness-checks-status) - echo Adding empty-readiness-checks-status attribute to microprofile-health-smallrye subsystem - /subsystem=microprofile-health-smallrye:write-attribute(name=empty-readiness-checks-status, value=${env.MP_HEALTH_EMPTY_READINESS_CHECKS_STATUS:UP}) - echo -end-if - if (outcome == failed) of /subsystem=keycloak-server/spi=hostname/provider=default/:read-resource echo Adding default hostname provider /subsystem=keycloak-server/spi=hostname/provider=default/:add(properties={frontendUrl => "${keycloak.frontendUrl:}",forceBackendUrlToFrontendUrl => "false"},enabled=true) @@ -661,4 +607,107 @@ if (result != expression "${jboss.mail.server.port:25}") of /socket-binding-grou echo end-if +# Migrate from 12.0.0 to 13.0.0 + +## KEYCLOAK-16723 / KEYCLOAK-16907: +## +## Based on [WFLY-14203], [WFLY-14151], and [WFLY-14108] remove MicroProfile SmallRye config, health, and metrics if present + +if (outcome == success) of /subsystem=microprofile-config-smallrye/:read-resource + echo Removing microprofile-config-smallrye subsystem... + /subsystem=microprofile-config-smallrye/:remove + echo +end-if + +if (outcome == success) of /extension=org.wildfly.extension.microprofile.config-smallrye/:read-resource + echo Removing microprofile.config-smallrye extension... + /extension=org.wildfly.extension.microprofile.config-smallrye/:remove + echo +end-if + +if (outcome == success) of /subsystem=microprofile-health-smallrye/:read-resource + echo Removing microprofile-health-smallrye subsystem... + /subsystem=microprofile-health-smallrye/:remove + echo +end-if + +if (outcome == success) of /extension=org.wildfly.extension.microprofile.health-smallrye/:read-resource + echo Removing microprofile.health-smallrye extension... + /extension=org.wildfly.extension.microprofile.health-smallrye/:remove + echo +end-if + +if (outcome == success) of /subsystem=microprofile-metrics-smallrye/:read-resource + echo Removing microprofile-metrics-smallrye subsystem... + /subsystem=microprofile-metrics-smallrye/:remove + echo +end-if + +if (outcome == success) of /extension=org.wildfly.extension.microprofile.metrics-smallrye/:read-resource + echo Removing microprofile.metrics-smallrye extension... + /extension=org.wildfly.extension.microprofile.metrics-smallrye/:remove + echo +end-if + +## Yet based on [WFLY-14203], [WFLY-14151], and [WFLY-14108] load +## org.wildfly.extension.health/org.wildfly.extension.metrics extensions & subsystems instead + +if (outcome == failed) of /extension=org.wildfly.extension.health:read-resource + echo Adding WildFly extension for health... + /extension=org.wildfly.extension.health:add(module=org.wildfly.extension.health) + echo +end-if + +if (outcome == failed) of /subsystem=health:read-resource + echo Adding Wildfly subsystem for health... + /subsystem=health:add(security-enabled=false) + echo +end-if + +if (outcome == failed) of /extension=org.wildfly.extension.metrics:read-resource + echo Adding Wildfly extension for base metrics... + /extension=org.wildfly.extension.metrics:add(module=org.wildfly.extension.metrics) + echo +end-if + +if (outcome == failed) of /subsystem=metrics:read-resource + echo Adding Wildfly subsystem for base metrics... + /subsystem=metrics:add(exposed-subsystems=[*],security-enabled=false) + echo +end-if + +if (result == "Keycloak") of :read-attribute(name=product-name) + echo Adding base metrics subsystem prefix to Keycloak... + /subsystem=metrics:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) + echo +else + echo Adding base metrics subsystem prefix to RH-SSO... + /subsystem=metrics:write-attribute(name=prefix,value=${wildfly.metrics.prefix:jboss}) + echo +end-if + +## Add ability to make use of automatically generated self-signed certificate with Elytron, +## introduced by WFCORE-5095 in Wildfly Core 14.0.0.Final + +if (outcome == failed) of /subsystem=elytron/key-store=applicationKS:read-resource + echo Adding key store for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /subsystem=elytron/key-store=applicationKS:add(credential-reference={clear-text=password},type=JKS) + /subsystem=elytron/key-store=applicationKS:write-attribute(name=path,value=application.keystore) + /subsystem=elytron/key-store=applicationKS:write-attribute(name=relative-to,value=jboss.server.config.dir) + echo +end-if + +if (outcome == failed) of /subsystem=elytron/key-manager=applicationKM:read-resource + echo Adding key manager for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /subsystem=elytron/key-manager=applicationKM:add(key-store=applicationKS, credential-reference={clear-text=password}) + /subsystem=elytron/key-manager=applicationKM:write-attribute(name=generate-self-signed-certificate-host,value=localhost) + echo +end-if + +if (outcome == failed) of /subsystem=elytron/server-ssl-context=applicationSSC:read-resource + echo Adding SSL context for the feature of auto-generation of self-signed certificate to Elytron subsystem... + /subsystem=elytron/server-ssl-context=applicationSSC:add(key-manager=applicationKM) + echo +end-if + echo *** End Migration *** diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml index e504e7c83e..09c573872a 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml @@ -422,7 +422,7 @@ org.eclipse.jdt.core.compiler ecj - 4.6.1 + 4.6.1.redhat-1 Eclipse Public License 1.0 diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.jdt.core.compiler,ecj,4.6.1,Eclipse Public License 1.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.jdt.core.compiler,ecj,4.6.1.redhat-1,Eclipse Public License 1.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.jdt.core.compiler,ecj,4.6.1,Eclipse Public License 1.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.jdt.core.compiler,ecj,4.6.1.redhat-1,Eclipse Public License 1.0.txt diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml index 4a1f59cac1..b8ab9f2385 100644 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml +++ b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml index 4f8370ed9e..50578ee1a3 100644 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml +++ b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml index 14a346ccea..4a6f7d7a5c 100644 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml @@ -4,22 +4,22 @@ org.bouncycastle bcpkix-jdk15on - 1.65 + 1.67 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html org.bouncycastle bcprov-jdk15on - 1.65 + 1.67 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.65,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.67,MIT License.txt similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.65,MIT License.txt rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.67,MIT License.txt diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.65,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.67,MIT License.txt similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.65,MIT License.txt rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.67,MIT License.txt diff --git a/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py b/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py index 6d1c89ccda..7e0ea2f7cc 100644 --- a/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py +++ b/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py @@ -811,6 +811,7 @@ _wildflyCoreProperties = [ "apache.httpcomponents.version", "apache.httpcomponents.httpcore.version", "jboss.dmr.version", + "bouncycastle.version", "jboss.logging.version", "jboss.logging.tools.version", "log4j.version", @@ -886,6 +887,7 @@ def performMainKeycloakPomFileUpdateTask(wildflyPomFile, wildflyCorePomFile, for "Unable to locate element with name: '%s' in '%s' or '%s'" % (wildflyElemName, wildflyPomFile, wildflyCorePomFile) ) + sys.exit(1) lxml.etree.ElementTree(keycloakXmlTreeRoot).write(mainKeycloakPomPath, encoding = "UTF-8", pretty_print = True, xml_declaration = True) stepLogger.info("Done syncing artifact version changes to: '%s'!" % mainKeycloakPomPath.replace(getKeycloakGitRepositoryRoot(), '.')) @@ -921,6 +923,30 @@ def updateAdapterLicenseFile(gavDictionary, xPathPrefix, nameSpace, licenseFile, groupIdElem is None or artifactIdElem is None or versionElem is None, logger = stepLogger ) + # KEYCLOAK-16202 Per: + # + # * https://github.com/keycloak/keycloak/pull/7463#discussion_r517346730 and + # * https://github.com/keycloak/keycloak/pull/7463#discussion_r517346766 + # + # skip automated updates of versions of "org.apache.httpcomponents:httpclient" + # and "org.apache.httpcomponents:httpcore" dependencies in the Fuse adapter + # license file(s) as part of the upgrade script run + if ( + 'fuse-adapter-zip' in licenseFile and + groupIdElem.text == 'org.apache.httpcomponents' and + artifactIdElem.text in ['httpclient', 'httpcore'] + ): + + httpComponentsFuseAdapterSpecificMessage = ( + "Not updating version of '%s:%s' artifact in the Fuse adapter license file," % + (groupIdElem.text, artifactIdElem.text), + " since this adapter can work properly only with a specific,\n\t\tpreviously approved version!" + " See '' and ''", + " properties in the main Keycloak pom.xml file\n\t\tfor further details." + ) + stepLogger.info(_empty_string.join(httpComponentsFuseAdapterSpecificMessage)) + continue + currentArtifactVersion = versionElem.text gavDictKey = groupIdElem.text + _gav_delimiter + artifactIdElem.text try: @@ -1017,8 +1043,26 @@ def updateAdapterLicenseFile(gavDictionary, xPathPrefix, nameSpace, licenseFile, stepLogger.debug(artifactVersionAlreadyHigherMessage) except KeyError: + # Cover the case when particular Keycloak / RH-SSO dependency isn't present in the GAV + # file created from the list of all Maven artifacts used by Wildfly (Core) / JBoss EAP + if 'keycloak' in licenseFile: + productName = 'Keycloak' + parentProductName = 'Wildfly (Core)' + elif 'rh-sso' in licenseFile: + productName = 'RH-SSO' + parentProductName = 'JBoss EAP' + else: + productName = parentProductName = None + _logErrorAndExitIf( + "Failed to determine the product name while updating the '%s' license file!" % licenseFile, + productName is None, + logger = stepLogger + ) # Ignore artifacts not found in the Gav dictionary - stepLogger.debug("Skipping '%s' artifact not present in GAV dictionary." % gavDictKey) + stepLogger.debug( + "Skipping '%s' specific '%s' license dependency since not present in '%s' list of all Maven artifacts!" % + (productName, gavDictKey, parentProductName) + ) pass lxml.etree.ElementTree(licenseFileXmlTreeRoot).write(licenseFile, encoding = "UTF-8", pretty_print = True, xml_declaration = True) diff --git a/pom.xml b/pom.xml index b91d5142b5..ab18c5d540 100755 --- a/pom.xml +++ b/pom.xml @@ -52,10 +52,10 @@ 7.4.0.GA ${timestamp} - 21.0.2.Final + 22.0.1.Final 1.2.13.Final 7.4.0.CD20-redhat-00001 - 13.0.3.Final + 14.0.1.Final 7.2.0.Final 7.5.22.Final-redhat-1 @@ -64,10 +64,10 @@ 0.66.19 2.4 4.5.13 - 4.4.13 + 4.4.14 0.6 1.5.1.Final - 1.65 + 1.67 3.3.7 3.3.7 3.3.7 @@ -77,8 +77,8 @@ 2.2.3 5.3.20.Final 5.3.20.Final - 11.0.4.Final - 2.10.5 + 11.0.8.Final + 2.11.3 ${jackson.version} ${jackson.databind.version} 1.6.5 @@ -86,10 +86,10 @@ 2.2.1.Final 2.0.1.Final 2.0.0.Final - 2.0.0.Final + 2.0.1.Final 2.0.0.Final 1.2.17 - 3.13.2.Final + 3.14.0.Final ${resteasy.version} 20191001.1 1.7.30 @@ -98,10 +98,10 @@ 2.3.3-b02 2.4.0-b180830.0359 2.3.1 - 1.2.1 + 1.2.2 2.3.3-b02 - 2.2.2.Final - 1.13.1.Final + 2.2.4.Final + 1.14.1.Final 1.8.0.Final 9.2.4.v20141103 9.3.9.v20160517 @@ -111,7 +111,7 @@ 1.1.6 1.5.2.Final 1.4.3 - 5.0.3.Final-redhat-00006 + 5.0.3.Final-redhat-00007 25.0-jre @@ -119,7 +119,7 @@ 2.6 - 3.10 + 3.11 2.6 2.0.0.AM26 2.0.0 diff --git a/prod-arguments.json b/prod-arguments.json index a4928e4867..49dab7d8d9 100644 --- a/prod-arguments.json +++ b/prod-arguments.json @@ -20,7 +20,7 @@ "dependencyOverride.org.jboss:jboss-parent@*": "19.0.0.redhat-2", "dependencyOverride.org.jboss.web:jbossweb@*": "$EAP6SUPPORTED_ORG_JBOSS_WEB_JBOSSWEB", "dependencyOverride.com.google.guava:guava@org.keycloak.testsuite:integration-arquillian": "", - "dependencyOverride.com.fasterxml.jackson.dataformat:*@*": "2.10.4.redhat-00001", + "dependencyOverride.com.fasterxml.jackson.dataformat:*@*": "2.10.5.redhat-00002", "dependencyOverride.org.jboss.logging:jboss-logging-processor@*": "", "dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-as7-subsystem": "", "dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-saml-as7-subsystem": "" diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index f36e1a6359..b148b69e51 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -800,11 +800,11 @@ The cross DC requires setting a profile specifying used cache server by specifyi `cache-server-infinispan` or `cache-server-jdg` profile in maven. Since JDG does not distribute `infinispan-server` zip artifact anymore, for `cache-server-jdg` profile it is -necessary to download the artifact and install it to local Maven repository. For JDG 7.3.0, the command is the following: +necessary to download the artifact and install it to local Maven repository. For JDG 7.3.8, the command is the following: mvn install:install-file \ -DgroupId=org.infinispan.server -DartifactId=infinispan-server -Dpackaging=zip -Dclassifier=bin -DgeneratePom=true \ - -Dversion=9.4.6.Final-redhat-00002 -Dfile=jboss-datagrid-7.3.0-server.zip + -Dversion=9.4.21.Final-redhat-00002 -Dfile=jboss-datagrid-7.3.8-server.zip #### Run Cross-DC Tests from Maven @@ -1060,4 +1060,4 @@ because this is not UI testing). For debugging purposes you can override the hea mvn clean install -f testsuite/integration-arquillian/tests/base \ -Pfirefox-strict-cookies \ -Dtest=**.adapter.** \ - -Dauth.server.host=[some_host] -Dauth.server.host2=[some_other_host] \ No newline at end of file + -Dauth.server.host=[some_host] -Dauth.server.host2=[some_other_host] diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 37a1adc751..cf1483e26e 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -40,8 +40,8 @@ undertow - 20.0.1.Final - 12.0.3.Final + 21.0.2.Final + 13.0.3.Final 2.2.0.Final diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml b/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml index 694b8f7dec..4320a1a864 100644 --- a/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml +++ b/testsuite/integration-arquillian/tests/other/server-config-migration/pom.xml @@ -27,7 +27,7 @@ 13.0.0-SNAPSHOT ../pom.xml - + org.keycloak.testsuite server-config-migration @@ -37,11 +37,12 @@ true true false - + false + ${project.build.directory}/keycloak-${project.version} 1.8.1 ${project.version} - + + remove-illegal-reflective-access-warnings-from-txt-files + + process-test-classes + + run + + + ${skip.remove.warnings} + + + + + + + + + + + + + + + + + + + + + + @@ -377,7 +411,7 @@ - + read-migrated-standalone process-test-resources