[KEYCLOAK-16723] Upgrade to Wildfly 22
Base fixes:
* [KEYCLOAK-16724] Upgrade Keycloak to Wildfly 22.0.0.Beta1 / Wildfly Core 14.0.0.Beta4
* [KEYCLOAK-16822] Upgrade Keycloak to Wildfly 22.0.0.Final / Wildfly Core 14.0.0.Final
* [KEYCLOAK-17158] Upgrade Keycloak to Wildfly 22.0.1.Final / Wildfly Core 14.0.1.Final
Other (related) fixes:
* [KEYCLOAK-16174] Upgrade (RH-SSO adapters) to EAP CD 21
* [KEYCLOAK-16202] Don't upgrade versions of httpclient and httpcore in the Fuse adapter
as part of the Wildfly upgrade script run
* [KEYCLOAK-16737] Keycloak core depends on org.bouncycastle:bcprov-jdk15on:1.65, which
suffers from CVE-2020-28052
* [KEYCLOAK-16907] ConfigMigrationTest fails after upgrade to Wildfly 22.0.0.Final
* [KEYCLOAK-17156] org.keycloak.test.config.migration.ConfigMigrationTest fails with
'illegal reflective access to method com.sun.net.ssl.internal.ssl.Provider.isFIPS()'
Signed-off-by: Jan Lieskovsky <jlieskov@redhat.com>
This commit is contained in:
Jan Lieskovsky
Hynek Mlnařík
parent
de79493294
commit
16ba4c0104
56 changed files with 494 additions and 256 deletions
|
|
@ -4,88 +4,88 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcpkix-jdk15on</artifactId>
|
<artifactId>bcpkix-jdk15on</artifactId>
|
||||||
<version>1.65</version>
|
<version>1.67</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>MIT License</name>
|
<name>MIT License</name>
|
||||||
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
|
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
<version>1.65</version>
|
<version>1.67</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>MIT License</name>
|
<name>MIT License</name>
|
||||||
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
|
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.11.3/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-core</artifactId>
|
<artifactId>jackson-core</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.11.3/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.11.3/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-base</artifactId>
|
<artifactId>jackson-jaxrs-base</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.module</groupId>
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
|
||||||
|
|
@ -26,66 +26,66 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.4/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-core</artifactId>
|
<artifactId>jackson-core</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.4/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.4/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-base</artifactId>
|
<artifactId>jackson-jaxrs-base</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.module</groupId>
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
|
||||||
|
|
@ -4,88 +4,88 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcpkix-jdk15on</artifactId>
|
<artifactId>bcpkix-jdk15on</artifactId>
|
||||||
<version>1.65</version>
|
<version>1.67</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>MIT License</name>
|
<name>MIT License</name>
|
||||||
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
|
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
<version>1.65</version>
|
<version>1.67</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>MIT License</name>
|
<name>MIT License</name>
|
||||||
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
|
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.11.3/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-core</artifactId>
|
<artifactId>jackson-core</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.11.3/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.11.3/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-base</artifactId>
|
<artifactId>jackson-jaxrs-base</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/base/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.11.3/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.module</groupId>
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
||||||
<version>2.10.5</version>
|
<version>2.11.3</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-modules-base/jackson-modules-base-2.11.3/jaxb/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
|
||||||
|
|
@ -26,66 +26,66 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.4/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-core</artifactId>
|
<artifactId>jackson-core</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.4/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.4/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.5/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-base</artifactId>
|
<artifactId>jackson-jaxrs-base</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.module</groupId>
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
||||||
<version>2.10.4.redhat-00001</version>
|
<version>2.10.5.redhat-00002</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache Software License 2.0</name>
|
<name>Apache Software License 2.0</name>
|
||||||
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
|
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.5/json/src/main/resources/META-INF/LICENSE</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
~ limitations under the License.
|
~ limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<domain xmlns="urn:jboss:domain:14.0">
|
<domain xmlns="urn:jboss:domain:15.0">
|
||||||
|
|
||||||
<extensions>
|
<extensions>
|
||||||
<?EXTENSIONS?>
|
<?EXTENSIONS?>
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
is also started by this host controller file. The other instance must be started
|
is also started by this host controller file. The other instance must be started
|
||||||
via host-slave.xml
|
via host-slave.xml
|
||||||
-->
|
-->
|
||||||
<host name="master" xmlns="urn:jboss:domain:14.0">
|
<host name="master" xmlns="urn:jboss:domain:15.0">
|
||||||
<extensions>
|
<extensions>
|
||||||
<?EXTENSIONS?>
|
<?EXTENSIONS?>
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
~ limitations under the License.
|
~ limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<host xmlns="urn:jboss:domain:14.0">
|
<host xmlns="urn:jboss:domain:15.0">
|
||||||
<extensions>
|
<extensions>
|
||||||
<?EXTENSIONS?>
|
<?EXTENSIONS?>
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
via host-slave.xml
|
via host-slave.xml
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<host name="master" xmlns="urn:jboss:domain:14.0">
|
<host name="master" xmlns="urn:jboss:domain:15.0">
|
||||||
<extensions>
|
<extensions>
|
||||||
<?EXTENSIONS?>
|
<?EXTENSIONS?>
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
|
||||||
|
|
@ -19,34 +19,33 @@
|
||||||
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
|
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
|
||||||
<config>
|
<config>
|
||||||
<subsystems>
|
<subsystems>
|
||||||
<subsystem>logging.xml</subsystem>
|
|
||||||
<subsystem>bean-validation.xml</subsystem>
|
<subsystem>bean-validation.xml</subsystem>
|
||||||
<subsystem>core-management.xml</subsystem>
|
<subsystem>core-management.xml</subsystem>
|
||||||
<subsystem supplement="default">keycloak-datasources.xml</subsystem>
|
|
||||||
<subsystem>deployment-scanner.xml</subsystem>
|
<subsystem>deployment-scanner.xml</subsystem>
|
||||||
<subsystem>ee.xml</subsystem>
|
<subsystem>ee.xml</subsystem>
|
||||||
<subsystem supplement="ha">ejb3.xml</subsystem>
|
<subsystem>health.xml</subsystem>
|
||||||
<subsystem>io.xml</subsystem>
|
<subsystem>io.xml</subsystem>
|
||||||
<subsystem supplement="ha">keycloak-infinispan.xml</subsystem>
|
|
||||||
<subsystem>jaxrs.xml</subsystem>
|
<subsystem>jaxrs.xml</subsystem>
|
||||||
<subsystem>jca.xml</subsystem>
|
<subsystem>jca.xml</subsystem>
|
||||||
<subsystem supplement="default">jgroups.xml</subsystem>
|
|
||||||
<subsystem>jmx.xml</subsystem>
|
<subsystem>jmx.xml</subsystem>
|
||||||
<subsystem>jpa.xml</subsystem>
|
<subsystem>jpa.xml</subsystem>
|
||||||
|
<subsystem>keycloak-server.xml</subsystem>
|
||||||
|
<subsystem>logging.xml</subsystem>
|
||||||
<subsystem>mail.xml</subsystem>
|
<subsystem>mail.xml</subsystem>
|
||||||
<subsystem supplement="default">mod_cluster.xml</subsystem>
|
<subsystem>metrics.xml</subsystem>
|
||||||
<subsystem>naming.xml</subsystem>
|
<subsystem>naming.xml</subsystem>
|
||||||
<subsystem>remoting.xml</subsystem>
|
<subsystem>remoting.xml</subsystem>
|
||||||
<subsystem>request-controller.xml</subsystem>
|
<subsystem>request-controller.xml</subsystem>
|
||||||
<subsystem>security-manager.xml</subsystem>
|
<subsystem>security-manager.xml</subsystem>
|
||||||
<subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
|
|
||||||
<subsystem>security.xml</subsystem>
|
<subsystem>security.xml</subsystem>
|
||||||
|
<subsystem supplement="default">jgroups.xml</subsystem>
|
||||||
|
<subsystem supplement="default">keycloak-datasources.xml</subsystem>
|
||||||
|
<subsystem supplement="default">mod_cluster.xml</subsystem>
|
||||||
|
<subsystem supplement="ha">ejb3.xml</subsystem>
|
||||||
|
<subsystem supplement="ha">keycloak-infinispan.xml</subsystem>
|
||||||
|
<subsystem supplement="ha">keycloak-undertow.xml</subsystem>
|
||||||
|
<subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
|
||||||
<subsystem>transactions.xml</subsystem>
|
<subsystem>transactions.xml</subsystem>
|
||||||
<subsystem>weld.xml</subsystem>
|
<subsystem>weld.xml</subsystem>
|
||||||
<subsystem>microprofile-config-smallrye.xml</subsystem>
|
|
||||||
<subsystem>microprofile-health-smallrye.xml</subsystem>
|
|
||||||
<subsystem>microprofile-metrics-smallrye.xml</subsystem>
|
|
||||||
<subsystem supplement="ha">keycloak-undertow.xml</subsystem>
|
|
||||||
<subsystem>keycloak-server.xml</subsystem>
|
|
||||||
</subsystems>
|
</subsystems>
|
||||||
</config>
|
</config>
|
||||||
|
|
@ -19,32 +19,31 @@
|
||||||
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
|
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
|
||||||
<config>
|
<config>
|
||||||
<subsystems>
|
<subsystems>
|
||||||
<subsystem>logging.xml</subsystem>
|
|
||||||
<subsystem>bean-validation.xml</subsystem>
|
<subsystem>bean-validation.xml</subsystem>
|
||||||
<subsystem>core-management.xml</subsystem>
|
<subsystem>core-management.xml</subsystem>
|
||||||
<subsystem supplement="default">keycloak-datasources.xml</subsystem>
|
|
||||||
<subsystem>deployment-scanner.xml</subsystem>
|
<subsystem>deployment-scanner.xml</subsystem>
|
||||||
<subsystem>ee.xml</subsystem>
|
<subsystem>ee.xml</subsystem>
|
||||||
<subsystem>ejb3.xml</subsystem>
|
<subsystem>ejb3.xml</subsystem>
|
||||||
|
<subsystem>health.xml</subsystem>
|
||||||
<subsystem>io.xml</subsystem>
|
<subsystem>io.xml</subsystem>
|
||||||
<subsystem>keycloak-infinispan.xml</subsystem>
|
|
||||||
<subsystem>jaxrs.xml</subsystem>
|
<subsystem>jaxrs.xml</subsystem>
|
||||||
<subsystem>jca.xml</subsystem>
|
<subsystem>jca.xml</subsystem>
|
||||||
<subsystem>jmx.xml</subsystem>
|
<subsystem>jmx.xml</subsystem>
|
||||||
<subsystem>jpa.xml</subsystem>
|
<subsystem>jpa.xml</subsystem>
|
||||||
|
<subsystem>keycloak-infinispan.xml</subsystem>
|
||||||
|
<subsystem>keycloak-server.xml</subsystem>
|
||||||
|
<subsystem>keycloak-undertow.xml</subsystem>
|
||||||
|
<subsystem>logging.xml</subsystem>
|
||||||
<subsystem>mail.xml</subsystem>
|
<subsystem>mail.xml</subsystem>
|
||||||
|
<subsystem>metrics.xml</subsystem>
|
||||||
<subsystem>naming.xml</subsystem>
|
<subsystem>naming.xml</subsystem>
|
||||||
<subsystem>remoting.xml</subsystem>
|
<subsystem>remoting.xml</subsystem>
|
||||||
<subsystem>request-controller.xml</subsystem>
|
<subsystem>request-controller.xml</subsystem>
|
||||||
<subsystem>security-manager.xml</subsystem>
|
<subsystem>security-manager.xml</subsystem>
|
||||||
<subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
|
|
||||||
<subsystem>security.xml</subsystem>
|
<subsystem>security.xml</subsystem>
|
||||||
|
<subsystem supplement="default">keycloak-datasources.xml</subsystem>
|
||||||
|
<subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
|
||||||
<subsystem>transactions.xml</subsystem>
|
<subsystem>transactions.xml</subsystem>
|
||||||
<subsystem>weld.xml</subsystem>
|
<subsystem>weld.xml</subsystem>
|
||||||
<subsystem>microprofile-config-smallrye.xml</subsystem>
|
|
||||||
<subsystem>microprofile-health-smallrye.xml</subsystem>
|
|
||||||
<subsystem>microprofile-metrics-smallrye.xml</subsystem>
|
|
||||||
<subsystem>keycloak-undertow.xml</subsystem>
|
|
||||||
<subsystem>keycloak-server.xml</subsystem>
|
|
||||||
</subsystems>
|
</subsystems>
|
||||||
</config>
|
</config>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
|
|
||||||
<server xmlns="urn:jboss:domain:14.0">
|
<server xmlns="urn:jboss:domain:15.0">
|
||||||
|
|
||||||
<extensions>
|
<extensions>
|
||||||
<?EXTENSIONS?>
|
<?EXTENSIONS?>
|
||||||
|
|
|
||||||
|
|
@ -703,4 +703,30 @@ if (result != org.keycloak.keycloak-model-infinispan) of /profile=$clusteredProf
|
||||||
echo
|
echo
|
||||||
end-if
|
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 ***
|
echo *** End Migration of /profile=$clusteredProfile ***
|
||||||
|
|
|
||||||
|
|
@ -604,4 +604,30 @@ if (result != org.keycloak.keycloak-model-infinispan) of /profile=$standalonePro
|
||||||
echo
|
echo
|
||||||
end-if
|
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 ***
|
echo *** End Migration of /profile=$standaloneProfile ***
|
||||||
|
|
|
||||||
|
|
@ -634,52 +634,10 @@ if (outcome == failed) of /subsystem=weld/:read-resource
|
||||||
echo
|
echo
|
||||||
end-if
|
end-if
|
||||||
|
|
||||||
if (outcome == failed) of /extension=org.wildfly.extension.microprofile.config-smallrye/:read-resource
|
## KEYCLOAK-16723 / KEYCLOAK-16907:
|
||||||
echo Adding microprofile.config-smallrye extension...
|
##
|
||||||
/extension=org.wildfly.extension.microprofile.config-smallrye/:add(module=org.wildfly.extension.microprofile.config-smallrye)
|
## Loading of MicroProfile SmallRye config, health, and metrics extensions & subsystems got removed
|
||||||
echo
|
## as part of upgrading to Wildfly 22. See [WFLY-14203], [WFLY-14151], and [WFLY-14108] for details
|
||||||
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
|
|
||||||
|
|
||||||
# Migrate from 6.0.1 to 7.0.0
|
# Migrate from 6.0.1 to 7.0.0
|
||||||
if (outcome == success) of /subsystem=ejb3/service=remote/channel-creation-options=READ_TIMEOUT/:read-resource
|
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
|
echo
|
||||||
end-if
|
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 ***
|
echo *** End Migration ***
|
||||||
|
|
|
||||||
|
|
@ -523,52 +523,10 @@ if (outcome == failed) of /subsystem=weld/:read-resource
|
||||||
echo
|
echo
|
||||||
end-if
|
end-if
|
||||||
|
|
||||||
if (outcome == failed) of /extension=org.wildfly.extension.microprofile.health-smallrye/:read-resource
|
## KEYCLOAK-16723 / KEYCLOAK-16907:
|
||||||
echo Adding microprofile.health-smallrye extension...
|
##
|
||||||
/extension=org.wildfly.extension.microprofile.health-smallrye/:add(module=org.wildfly.extension.microprofile.health-smallrye)
|
## Loading of MicroProfile SmallRye config, health, and metrics extensions & subsystems got removed
|
||||||
echo
|
## as part of upgrading to Wildfly 22. See [WFLY-14203], [WFLY-14151], and [WFLY-14108] for details
|
||||||
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
|
|
||||||
|
|
||||||
# Migrate from 6.0.1 to 7.0.0
|
# Migrate from 6.0.1 to 7.0.0
|
||||||
if (outcome == success) of /subsystem=ejb3/service=remote/channel-creation-options=READ_TIMEOUT/:read-resource
|
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
|
echo
|
||||||
end-if
|
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
|
if (outcome == failed) of /subsystem=keycloak-server/spi=hostname/provider=default/:read-resource
|
||||||
echo Adding default hostname provider
|
echo Adding default hostname provider
|
||||||
/subsystem=keycloak-server/spi=hostname/provider=default/:add(properties={frontendUrl => "${keycloak.frontendUrl:}",forceBackendUrlToFrontendUrl => "false"},enabled=true)
|
/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
|
echo
|
||||||
end-if
|
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 ***
|
echo *** End Migration ***
|
||||||
|
|
|
||||||
|
|
@ -422,7 +422,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jdt.core.compiler</groupId>
|
<groupId>org.eclipse.jdt.core.compiler</groupId>
|
||||||
<artifactId>ecj</artifactId>
|
<artifactId>ecj</artifactId>
|
||||||
<version>4.6.1</version>
|
<version>4.6.1.redhat-1</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Eclipse Public License 1.0</name>
|
<name>Eclipse Public License 1.0</name>
|
||||||
|
|
|
||||||
|
|
@ -4,22 +4,22 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcpkix-jdk15on</artifactId>
|
<artifactId>bcpkix-jdk15on</artifactId>
|
||||||
<version>1.65</version>
|
<version>1.67</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>MIT License</name>
|
<name>MIT License</name>
|
||||||
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
|
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
<version>1.65</version>
|
<version>1.67</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>MIT License</name>
|
<name>MIT License</name>
|
||||||
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
|
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv67/LICENSE.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
|
||||||
|
|
@ -811,6 +811,7 @@ _wildflyCoreProperties = [
|
||||||
"apache.httpcomponents.version",
|
"apache.httpcomponents.version",
|
||||||
"apache.httpcomponents.httpcore.version",
|
"apache.httpcomponents.httpcore.version",
|
||||||
"jboss.dmr.version",
|
"jboss.dmr.version",
|
||||||
|
"bouncycastle.version",
|
||||||
"jboss.logging.version",
|
"jboss.logging.version",
|
||||||
"jboss.logging.tools.version",
|
"jboss.logging.tools.version",
|
||||||
"log4j.version",
|
"log4j.version",
|
||||||
|
|
@ -886,6 +887,7 @@ def performMainKeycloakPomFileUpdateTask(wildflyPomFile, wildflyCorePomFile, for
|
||||||
"Unable to locate element with name: '%s' in '%s' or '%s'" %
|
"Unable to locate element with name: '%s' in '%s' or '%s'" %
|
||||||
(wildflyElemName, wildflyPomFile, wildflyCorePomFile)
|
(wildflyElemName, wildflyPomFile, wildflyCorePomFile)
|
||||||
)
|
)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
lxml.etree.ElementTree(keycloakXmlTreeRoot).write(mainKeycloakPomPath, encoding = "UTF-8", pretty_print = True, xml_declaration = True)
|
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(), '.'))
|
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,
|
groupIdElem is None or artifactIdElem is None or versionElem is None,
|
||||||
logger = stepLogger
|
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 '<apache.httpcomponents.fuse.version>' and '<apache.httpcomponents.httpcore.fuse.version>'",
|
||||||
|
" properties in the main Keycloak pom.xml file\n\t\tfor further details."
|
||||||
|
)
|
||||||
|
stepLogger.info(_empty_string.join(httpComponentsFuseAdapterSpecificMessage))
|
||||||
|
continue
|
||||||
|
|
||||||
currentArtifactVersion = versionElem.text
|
currentArtifactVersion = versionElem.text
|
||||||
gavDictKey = groupIdElem.text + _gav_delimiter + artifactIdElem.text
|
gavDictKey = groupIdElem.text + _gav_delimiter + artifactIdElem.text
|
||||||
try:
|
try:
|
||||||
|
|
@ -1017,8 +1043,26 @@ def updateAdapterLicenseFile(gavDictionary, xPathPrefix, nameSpace, licenseFile,
|
||||||
stepLogger.debug(artifactVersionAlreadyHigherMessage)
|
stepLogger.debug(artifactVersionAlreadyHigherMessage)
|
||||||
|
|
||||||
except KeyError:
|
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
|
# 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
|
pass
|
||||||
|
|
||||||
lxml.etree.ElementTree(licenseFileXmlTreeRoot).write(licenseFile, encoding = "UTF-8", pretty_print = True, xml_declaration = True)
|
lxml.etree.ElementTree(licenseFileXmlTreeRoot).write(licenseFile, encoding = "UTF-8", pretty_print = True, xml_declaration = True)
|
||||||
|
|
|
||||||
26
pom.xml
26
pom.xml
|
|
@ -52,10 +52,10 @@
|
||||||
<product.rhsso.version>7.4.0.GA</product.rhsso.version>
|
<product.rhsso.version>7.4.0.GA</product.rhsso.version>
|
||||||
|
|
||||||
<product.build-time>${timestamp}</product.build-time>
|
<product.build-time>${timestamp}</product.build-time>
|
||||||
<wildfly.version>21.0.2.Final</wildfly.version>
|
<wildfly.version>22.0.1.Final</wildfly.version>
|
||||||
<wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
|
<wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
|
||||||
<eap.version>7.4.0.CD20-redhat-00001</eap.version>
|
<eap.version>7.4.0.CD20-redhat-00001</eap.version>
|
||||||
<wildfly.core.version>13.0.3.Final</wildfly.core.version>
|
<wildfly.core.version>14.0.1.Final</wildfly.core.version>
|
||||||
|
|
||||||
<jboss.as.version>7.2.0.Final</jboss.as.version>
|
<jboss.as.version>7.2.0.Final</jboss.as.version>
|
||||||
<jboss.as.subsystem.test.version>7.5.22.Final-redhat-1</jboss.as.subsystem.test.version>
|
<jboss.as.subsystem.test.version>7.5.22.Final-redhat-1</jboss.as.subsystem.test.version>
|
||||||
|
|
@ -64,10 +64,10 @@
|
||||||
<jboss.aesh.version>0.66.19</jboss.aesh.version>
|
<jboss.aesh.version>0.66.19</jboss.aesh.version>
|
||||||
<aesh.version>2.4</aesh.version>
|
<aesh.version>2.4</aesh.version>
|
||||||
<apache.httpcomponents.version>4.5.13</apache.httpcomponents.version>
|
<apache.httpcomponents.version>4.5.13</apache.httpcomponents.version>
|
||||||
<apache.httpcomponents.httpcore.version>4.4.13</apache.httpcomponents.httpcore.version>
|
<apache.httpcomponents.httpcore.version>4.4.14</apache.httpcomponents.httpcore.version>
|
||||||
<apache.mime4j.version>0.6</apache.mime4j.version>
|
<apache.mime4j.version>0.6</apache.mime4j.version>
|
||||||
<jboss.dmr.version>1.5.1.Final</jboss.dmr.version>
|
<jboss.dmr.version>1.5.1.Final</jboss.dmr.version>
|
||||||
<bouncycastle.version>1.65</bouncycastle.version>
|
<bouncycastle.version>1.67</bouncycastle.version>
|
||||||
<cxf.version>3.3.7</cxf.version>
|
<cxf.version>3.3.7</cxf.version>
|
||||||
<cxf.jetty.version>3.3.7</cxf.jetty.version>
|
<cxf.jetty.version>3.3.7</cxf.jetty.version>
|
||||||
<cxf.jaxrs.version>3.3.7</cxf.jaxrs.version>
|
<cxf.jaxrs.version>3.3.7</cxf.jaxrs.version>
|
||||||
|
|
@ -77,8 +77,8 @@
|
||||||
<jakarta.persistence.version>2.2.3</jakarta.persistence.version>
|
<jakarta.persistence.version>2.2.3</jakarta.persistence.version>
|
||||||
<hibernate.core.version>5.3.20.Final</hibernate.core.version>
|
<hibernate.core.version>5.3.20.Final</hibernate.core.version>
|
||||||
<hibernate.c3p0.version>5.3.20.Final</hibernate.c3p0.version>
|
<hibernate.c3p0.version>5.3.20.Final</hibernate.c3p0.version>
|
||||||
<infinispan.version>11.0.4.Final</infinispan.version>
|
<infinispan.version>11.0.8.Final</infinispan.version>
|
||||||
<jackson.version>2.10.5</jackson.version>
|
<jackson.version>2.11.3</jackson.version>
|
||||||
<jackson.databind.version>${jackson.version}</jackson.databind.version>
|
<jackson.databind.version>${jackson.version}</jackson.databind.version>
|
||||||
<jackson.annotations.version>${jackson.databind.version}</jackson.annotations.version>
|
<jackson.annotations.version>${jackson.databind.version}</jackson.annotations.version>
|
||||||
<jakarta.mail.version>1.6.5</jakarta.mail.version>
|
<jakarta.mail.version>1.6.5</jakarta.mail.version>
|
||||||
|
|
@ -86,10 +86,10 @@
|
||||||
<jboss.logging.tools.version>2.2.1.Final</jboss.logging.tools.version>
|
<jboss.logging.tools.version>2.2.1.Final</jboss.logging.tools.version>
|
||||||
<jboss-jaxrs-api_2.1_spec>2.0.1.Final</jboss-jaxrs-api_2.1_spec>
|
<jboss-jaxrs-api_2.1_spec>2.0.1.Final</jboss-jaxrs-api_2.1_spec>
|
||||||
<jboss-transaction-api_1.3_spec>2.0.0.Final</jboss-transaction-api_1.3_spec>
|
<jboss-transaction-api_1.3_spec>2.0.0.Final</jboss-transaction-api_1.3_spec>
|
||||||
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
|
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
|
||||||
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
|
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
|
||||||
<log4j.version>1.2.17</log4j.version>
|
<log4j.version>1.2.17</log4j.version>
|
||||||
<resteasy.version>3.13.2.Final</resteasy.version>
|
<resteasy.version>3.14.0.Final</resteasy.version>
|
||||||
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
|
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
|
||||||
<owasp.html.sanitizer.version>20191001.1</owasp.html.sanitizer.version>
|
<owasp.html.sanitizer.version>20191001.1</owasp.html.sanitizer.version>
|
||||||
<slf4j-api.version>1.7.30</slf4j-api.version>
|
<slf4j-api.version>1.7.30</slf4j-api.version>
|
||||||
|
|
@ -98,10 +98,10 @@
|
||||||
<sun.xml.bind.version>2.3.3-b02</sun.xml.bind.version>
|
<sun.xml.bind.version>2.3.3-b02</sun.xml.bind.version>
|
||||||
<javax.xml.bind.jaxb.version>2.4.0-b180830.0359</javax.xml.bind.jaxb.version>
|
<javax.xml.bind.jaxb.version>2.4.0-b180830.0359</javax.xml.bind.jaxb.version>
|
||||||
<sun.xml.ws.version>2.3.1</sun.xml.ws.version>
|
<sun.xml.ws.version>2.3.1</sun.xml.ws.version>
|
||||||
<sun.activation.version>1.2.1</sun.activation.version>
|
<sun.activation.version>1.2.2</sun.activation.version>
|
||||||
<org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
|
<org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
|
||||||
<undertow.version>2.2.2.Final</undertow.version>
|
<undertow.version>2.2.4.Final</undertow.version>
|
||||||
<elytron.version>1.13.1.Final</elytron.version>
|
<elytron.version>1.14.1.Final</elytron.version>
|
||||||
<elytron.undertow-server.version>1.8.0.Final</elytron.undertow-server.version>
|
<elytron.undertow-server.version>1.8.0.Final</elytron.undertow-server.version>
|
||||||
<jetty92.version>9.2.4.v20141103</jetty92.version>
|
<jetty92.version>9.2.4.v20141103</jetty92.version>
|
||||||
<jetty93.version>9.3.9.v20160517</jetty93.version>
|
<jetty93.version>9.3.9.v20160517</jetty93.version>
|
||||||
|
|
@ -111,7 +111,7 @@
|
||||||
<glassfish.json.version>1.1.6</glassfish.json.version>
|
<glassfish.json.version>1.1.6</glassfish.json.version>
|
||||||
<wildfly.common.version>1.5.2.Final</wildfly.common.version>
|
<wildfly.common.version>1.5.2.Final</wildfly.common.version>
|
||||||
<ua-parser.version>1.4.3</ua-parser.version>
|
<ua-parser.version>1.4.3</ua-parser.version>
|
||||||
<picketbox.version>5.0.3.Final-redhat-00006</picketbox.version>
|
<picketbox.version>5.0.3.Final-redhat-00007</picketbox.version>
|
||||||
<google.guava.version>25.0-jre</google.guava.version>
|
<google.guava.version>25.0-jre</google.guava.version>
|
||||||
|
|
||||||
<!-- Openshift -->
|
<!-- Openshift -->
|
||||||
|
|
@ -119,7 +119,7 @@
|
||||||
|
|
||||||
<!-- Others -->
|
<!-- Others -->
|
||||||
<commons-lang.version>2.6</commons-lang.version>
|
<commons-lang.version>2.6</commons-lang.version>
|
||||||
<commons-lang3.version>3.10</commons-lang3.version>
|
<commons-lang3.version>3.11</commons-lang3.version>
|
||||||
<commons-io.version>2.6</commons-io.version>
|
<commons-io.version>2.6</commons-io.version>
|
||||||
<apacheds.version>2.0.0.AM26</apacheds.version>
|
<apacheds.version>2.0.0.AM26</apacheds.version>
|
||||||
<apacheds.codec.version>2.0.0</apacheds.codec.version>
|
<apacheds.codec.version>2.0.0</apacheds.codec.version>
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"dependencyOverride.org.jboss:jboss-parent@*": "19.0.0.redhat-2",
|
"dependencyOverride.org.jboss:jboss-parent@*": "19.0.0.redhat-2",
|
||||||
"dependencyOverride.org.jboss.web:jbossweb@*": "$EAP6SUPPORTED_ORG_JBOSS_WEB_JBOSSWEB",
|
"dependencyOverride.org.jboss.web:jbossweb@*": "$EAP6SUPPORTED_ORG_JBOSS_WEB_JBOSSWEB",
|
||||||
"dependencyOverride.com.google.guava:guava@org.keycloak.testsuite:integration-arquillian": "",
|
"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-processor@*": "",
|
||||||
"dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-as7-subsystem": "",
|
"dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-as7-subsystem": "",
|
||||||
"dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-saml-as7-subsystem": ""
|
"dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-saml-as7-subsystem": ""
|
||||||
|
|
|
||||||
|
|
@ -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.
|
`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
|
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 \
|
mvn install:install-file \
|
||||||
-DgroupId=org.infinispan.server -DartifactId=infinispan-server -Dpackaging=zip -Dclassifier=bin -DgeneratePom=true \
|
-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
|
#### Run Cross-DC Tests from Maven
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,8 +40,8 @@
|
||||||
<app.server>undertow</app.server>
|
<app.server>undertow</app.server>
|
||||||
|
|
||||||
<!-- Wildfly deprecated versions -->
|
<!-- Wildfly deprecated versions -->
|
||||||
<wildfly.deprecated.version>20.0.1.Final</wildfly.deprecated.version>
|
<wildfly.deprecated.version>21.0.2.Final</wildfly.deprecated.version>
|
||||||
<wildfly.deprecated.wildfly.core.version>12.0.3.Final</wildfly.deprecated.wildfly.core.version>
|
<wildfly.deprecated.wildfly.core.version>13.0.3.Final</wildfly.deprecated.wildfly.core.version>
|
||||||
<wildfly.deprecated.arquillian.wildfly.container>2.2.0.Final</wildfly.deprecated.arquillian.wildfly.container>
|
<wildfly.deprecated.arquillian.wildfly.container>2.2.0.Final</wildfly.deprecated.arquillian.wildfly.container>
|
||||||
|
|
||||||
<!--component versions-->
|
<!--component versions-->
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@
|
||||||
<skip.add.user.json>true</skip.add.user.json>
|
<skip.add.user.json>true</skip.add.user.json>
|
||||||
<skip.copy.example.wars>true</skip.copy.example.wars>
|
<skip.copy.example.wars>true</skip.copy.example.wars>
|
||||||
<skip.rename.configs>false</skip.rename.configs>
|
<skip.rename.configs>false</skip.rename.configs>
|
||||||
|
<skip.remove.warnings>false</skip.remove.warnings>
|
||||||
|
|
||||||
<jbossHome>${project.build.directory}/keycloak-${project.version}</jbossHome>
|
<jbossHome>${project.build.directory}/keycloak-${project.version}</jbossHome>
|
||||||
<migrated.version>1.8.1</migrated.version>
|
<migrated.version>1.8.1</migrated.version>
|
||||||
|
|
@ -172,6 +173,39 @@
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<!-- KEYCLOAK-17156: Remove com.sun.net.ssl.internal.ssl.Provider.isFIPS() illegal reflective access warnings
|
||||||
|
possibly present in "master-standalone*.txt" and "migrated-standalone*.txt" files -->
|
||||||
|
<id>remove-illegal-reflective-access-warnings-from-txt-files</id>
|
||||||
|
<!-- Needs to be called after 'process-test-resources' phase, but before the 'test' phase itself! -->
|
||||||
|
<phase>process-test-classes</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<skip>${skip.remove.warnings}</skip>
|
||||||
|
<target>
|
||||||
|
<copy todir="${project.build.directory}">
|
||||||
|
<fileset dir="${project.build.directory}">
|
||||||
|
<include name="**/master-standalone*.txt"/>
|
||||||
|
<include name="**/migrated-standalone*.txt"/>
|
||||||
|
</fileset>
|
||||||
|
<mapper type="glob" from="*" to="*.unfiltered"/>
|
||||||
|
</copy>
|
||||||
|
<move todir="${project.build.directory}" overwrite="true">
|
||||||
|
<fileset dir="${project.build.directory}">
|
||||||
|
<include name="**/*.unfiltered"/>
|
||||||
|
</fileset>
|
||||||
|
<filterchain>
|
||||||
|
<linecontains negate="true">
|
||||||
|
<contains value="WARNING:"/>
|
||||||
|
</linecontains>
|
||||||
|
</filterchain>
|
||||||
|
<mapper type="regexp" from="^(.*)\.unfiltered$" to="\1"/>
|
||||||
|
</move>
|
||||||
|
</target>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue