[KEYCLOAK-13692] Upgrade to Wildfly "20.0.1.Final" and Infinispan "10…

….1.8.Final" Co-authored-by: Jan Lieskovsky <jlieskov@redhat.com> Co-authored-by: Marek Posolda <mposolda@redhat.com>
srose · Jul 20, 2020 · 969b09f · 969b09f
1 parent 46bf139
commit 969b09f
Show file tree

Hide file tree

Showing 161 changed files with 4,275 additions and 275 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,10 @@ nbproject
 *.tar
 *.zip
 
+# Python byte-compiled files #
+##############################
+*.pyc
+
 # Logs and databases #
 ######################
 *.log

diff --git a/adapters/oidc/wildfly/wildfly-adapter/pom.xml b/adapters/oidc/wildfly/wildfly-adapter/pom.xml
@@ -30,6 +30,18 @@
     <name>Keycloak Wildfly Integration</name>
     <description/>
 
+    <repositories>
+        <!-- KEYCLOAK-13692 Needed for org.picketbox:*:jar:5.0.3.Final-redhat-00005 -->
+        <repository>
+            <id>jboss-enterprise-maven-repository</id>
+            <name>JBoss Enterprise Maven Repository</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.logging</groupId>

diff --git a/.../org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java b/.../org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java
@@ -66,14 +66,21 @@ public static SessionIdMapperUpdater addTokenStoreUpdaters(ServletContext servle
 
             Configuration ssoCacheConfiguration = cacheManager.getCacheConfiguration(cacheName);
             if (ssoCacheConfiguration == null) {
-                Configuration cacheConfiguration = cacheManager.getCacheConfiguration(deploymentSessionCacheName);
-                if (cacheConfiguration == null) {
+                // Fallback to use cache "/my-app-deployment-context" as template
+                ssoCacheConfiguration = tryDefineCacheConfigurationFromTemplate(cacheManager, containerName, cacheName, deploymentSessionCacheName);
+
+                if (ssoCacheConfiguration == null) {
+                    // Fallback to use cache "my-app-deployment-context.war" as template
+                    if (cacheName.lastIndexOf('.') != -1) {
+                        String templateName = cacheName.substring(0, cacheName.lastIndexOf('.'));
+                        ssoCacheConfiguration = tryDefineCacheConfigurationFromTemplate(cacheManager, containerName, cacheName, templateName);
+                    }
+                }
+
+                if (ssoCacheConfiguration == null) {
+                    // Finally fallback to the cache container default configuration
                     LOG.debugv("Using default configuration for SSO cache {0}.{1}.", containerName, cacheName);
                     ssoCacheConfiguration = cacheManager.getDefaultCacheConfiguration();
-                } else {
-                    LOG.debugv("Using distributed HTTP session cache configuration for SSO cache {0}.{1}, configuration taken from cache {2}",
-                      containerName, cacheName, deploymentSessionCacheName);
-                    ssoCacheConfiguration = cacheConfiguration;
                     cacheManager.defineConfiguration(cacheName, ssoCacheConfiguration);
                 }
             } else {
@@ -107,6 +114,23 @@ public void close() throws Exception {
         }
     }
 
+    /**
+     * Try to define new cache configuration "newCacheName" from the existing configuration "templateCacheName" .
+     *
+     * @return Newly defined configuration or null in case that definition of new configuration was not successful
+     */
+    private static Configuration tryDefineCacheConfigurationFromTemplate(EmbeddedCacheManager cacheManager, String containerName, String newCacheName, String templateCacheName) {
+        Configuration cacheConfiguration = cacheManager.getCacheConfiguration(templateCacheName);
+        if (cacheConfiguration != null) {
+            LOG.debugv("Using distributed HTTP session cache configuration for SSO cache {0}.{1}, configuration taken from cache {2}",
+                    containerName, newCacheName, templateCacheName);
+            return cacheManager.defineConfiguration(newCacheName, cacheConfiguration);
+        } else {
+            // templateCacheName configuration did not exists, so returning null
+            return null;
+        }
+    }
+
     private static void addSsoCacheCrossDcListener(Cache<String, String[]> ssoCache, SsoSessionCacheListener listener) {
         if (ssoCache.getCacheConfiguration().persistence() == null) {
             return;

diff --git a/adapters/saml/wildfly/wildfly-adapter/pom.xml b/adapters/saml/wildfly/wildfly-adapter/pom.xml
@@ -30,6 +30,18 @@
     <name>Keycloak Wildfly SAML Adapter</name>
     <description/>
 
+    <repositories>
+        <!-- KEYCLOAK-13692 Needed for org.picketbox:*:jar:5.0.3.Final-redhat-00005 -->
+        <repository>
+            <id>jboss-enterprise-maven-repository</id>
+            <name>JBoss Enterprise Maven Repository</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.logging</groupId>

diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml
@@ -35,6 +35,18 @@
         <maven.compiler.source>1.7</maven.compiler.source>
     </properties>
 
+    <repositories>
+        <!-- KEYCLOAK-13692 Needed for org.picketbox:*:jar:5.0.3.Final-redhat-00005 -->
+        <repository>
+            <id>jboss-enterprise-maven-repository</id>
+            <name>JBoss Enterprise Maven Repository</name>
+            <url>https://maven.repository.redhat.com/ga/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.logging</groupId>

diff --git a/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt b/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt
diff --git a/...re,2.10.1,Apache Software License 2.0.txt → ...re,2.10.4,Apache Software License 2.0.txt b/...re,2.10.1,Apache Software License 2.0.txt → ...re,2.10.4,Apache Software License 2.0.txt
diff --git a/...nd,2.10.1,Apache Software License 2.0.txt → ...nd,2.10.4,Apache Software License 2.0.txt b/...nd,2.10.1,Apache Software License 2.0.txt → ...nd,2.10.4,Apache Software License 2.0.txt
diff --git a/...se,2.10.1,Apache Software License 2.0.txt → ...se,2.10.4,Apache Software License 2.0.txt b/...se,2.10.1,Apache Software License 2.0.txt → ...se,2.10.4,Apache Software License 2.0.txt
diff --git a/...er,2.10.1,Apache Software License 2.0.txt → ...er,2.10.4,Apache Software License 2.0.txt b/...er,2.10.1,Apache Software License 2.0.txt → ...er,2.10.4,Apache Software License 2.0.txt
diff --git a/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt b/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt
diff --git a/...n/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml b/...n/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml
@@ -1,91 +1,91 @@
-<?xml version="1.0"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <licenseSummary>
   <dependencies>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.62</version>
+      <version>1.65</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.62</version>
+      <version>1.65</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.4/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.4/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.4/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.10.1</version>
+      <version>2.10.4</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>

diff --git a/...astle,bcpkix-jdk15on,1.62,MIT License.txt → ...astle,bcpkix-jdk15on,1.65,MIT License.txt b/...astle,bcpkix-jdk15on,1.62,MIT License.txt → ...astle,bcpkix-jdk15on,1.65,MIT License.txt
diff --git a/...astle,bcprov-jdk15on,1.62,MIT License.txt → ...astle,bcprov-jdk15on,1.65,MIT License.txt b/...astle,bcprov-jdk15on,1.62,MIT License.txt → ...astle,bcprov-jdk15on,1.65,MIT License.txt
diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...ion/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml b/...ion/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml
@@ -1,91 +1,91 @@
-<?xml version="1.0"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <licenseSummary>
   <dependencies>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.62.0.redhat-00001</version>
+      <version>1.65.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.62.0.redhat-00001</version>
+      <version>1.65.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv65/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.10.1.redhat-00001</version>
+      <version>2.10.4.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.4/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.10.1.redhat-00001</version>
+      <version>2.10.4.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.4/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.10.1.redhat-00001</version>
+      <version>2.10.4.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.4/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.10.1.redhat-00001</version>
+      <version>2.10.4.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.10.1.redhat-00001</version>
+      <version>2.10.4.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.10.1.redhat-00001</version>
+      <version>2.10.4.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.4/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>

diff --git a/...k15on,1.62.0.redhat-00001,MIT License.txt → ...k15on,1.65.0.redhat-00001,MIT License.txt b/...k15on,1.62.0.redhat-00001,MIT License.txt → ...k15on,1.65.0.redhat-00001,MIT License.txt
diff --git a/...k15on,1.62.0.redhat-00001,MIT License.txt → ...k15on,1.65.0.redhat-00001,MIT License.txt b/...k15on,1.62.0.redhat-00001,MIT License.txt → ...k15on,1.65.0.redhat-00001,MIT License.txt
diff --git a/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt b/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt
diff --git a/...re,2.10.1,Apache Software License 2.0.txt → ...re,2.10.4,Apache Software License 2.0.txt b/...re,2.10.1,Apache Software License 2.0.txt → ...re,2.10.4,Apache Software License 2.0.txt
diff --git a/...nd,2.10.1,Apache Software License 2.0.txt → ...nd,2.10.4,Apache Software License 2.0.txt b/...nd,2.10.1,Apache Software License 2.0.txt → ...nd,2.10.4,Apache Software License 2.0.txt
diff --git a/...se,2.10.1,Apache Software License 2.0.txt → ...se,2.10.4,Apache Software License 2.0.txt b/...se,2.10.1,Apache Software License 2.0.txt → ...se,2.10.4,Apache Software License 2.0.txt
diff --git a/...er,2.10.1,Apache Software License 2.0.txt → ...er,2.10.4,Apache Software License 2.0.txt b/...er,2.10.1,Apache Software License 2.0.txt → ...er,2.10.4,Apache Software License 2.0.txt
diff --git a/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt b/...ns,2.10.1,Apache Software License 2.0.txt → ...ns,2.10.4,Apache Software License 2.0.txt