KEYCLOAK-13971 Upgrade to EAP 7.4.0.CD19

vidhya03 · Apr 28, 2020 · 04b5836 · 04b5836
1 parent 5bb4ee5
commit 04b5836
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 51 deletions.
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,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
@@ -4,88 +4,88 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.60.0.redhat-00001</version>
+      <version>1.62.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.60.0.redhat-00001</version>
+      <version>1.62.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.10.0.redhat-00002</version>
+      <version>2.10.1.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.0/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.10.0.redhat-00002</version>
+      <version>2.10.1.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.0/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.10.0.redhat-00002</version>
+      <version>2.10.1.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.0/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/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.0.redhat-00002</version>
+      <version>2.10.1.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.0/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/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.0.redhat-00002</version>
+      <version>2.10.1.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.0/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/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.0.redhat-00002</version>
+      <version>2.10.1.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.0/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>

diff --git a/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt b/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 

diff --git a/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt b/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 

diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00002,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
@@ -4,110 +4,110 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.60.0.redhat-00001</version>
+      <version>1.62.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.60.0.redhat-00001</version>
+      <version>1.62.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.10.0.redhat-00002</version>
+      <version>2.10.1.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.0/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.10.0.redhat-00002</version>
+      <version>2.10.1.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.0/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.10.0.redhat-00002</version>
+      <version>2.10.1.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.0/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/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.0.redhat-00002</version>
+      <version>2.10.1.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.0/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/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.0.redhat-00002</version>
+      <version>2.10.1.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.0/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/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.0.redhat-00002</version>
+      <version>2.10.1.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.0/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.4.redhat-00001</version>
+      <version>4.5.11.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-client.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.5.4</url>
+          <url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-client.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.5.11</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>4.4.5.redhat-00001</version>
+      <version>4.4.13.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-core.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.4.5</url>
+          <url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-core.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.4.13</url>
         </license>
       </licenses>
     </dependency>

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/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt b/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 

diff --git a/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt b/...k15on,1.60.0.redhat-00001,MIT License.txt → ...k15on,1.62.0.redhat-00001,MIT License.txt
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 

diff --git a/...ution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml b/...ution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
@@ -674,7 +674,7 @@
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/noppa/text-security/master/LICENSE</url>
+          <url>https://raw.githubusercontent.com/noppa/text-security/master/LICENSE.txt</url>
         </license>
       </licenses>
     </other>

diff --git a/...ibution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/...ibution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
@@ -674,7 +674,7 @@
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/noppa/text-security/master/LICENSE</url>
+          <url>https://raw.githubusercontent.com/noppa/text-security/master/LICENSE.txt</url>
         </license>
       </licenses>
     </other>

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 
         <wildfly.version>19.0.0.Final</wildfly.version>
         <wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
-        <eap.version>7.3.0.GA-redhat-00004</eap.version>
+        <eap.version>7.4.0.CD19-redhat-00001</eap.version>
         <wildfly.core.version>11.0.0.Final</wildfly.core.version>
 
         <jboss.as.version>7.2.0.Final</jboss.as.version>
@@ -67,8 +67,7 @@
         <hibernate.core.version>5.3.15.Final</hibernate.core.version>
         <hibernate.c3p0.version>5.3.15.Final</hibernate.c3p0.version>
         <infinispan.version>9.4.18.Final</infinispan.version>
-        <!-- Will be used in the product. Upstream versions are overridden in the community profile -->
-        <jackson.version>2.10.0</jackson.version>
+        <jackson.version>2.10.1</jackson.version>
         <jackson.databind.version>${jackson.version}</jackson.databind.version>
         <jakarta.mail.version>1.6.4</jakarta.mail.version>
         <jboss.logging.version>3.4.1.Final</jboss.logging.version>
@@ -78,8 +77,7 @@
         <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.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>
-        <!-- Will be used in the product. Upstream versions are overridden in the community profile -->
-        <resteasy.version>3.9.3.SP1</resteasy.version>
+        <resteasy.version>3.11.0.Final</resteasy.version>
         <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
         <owasp.html.sanitizer.version>20191001.1</owasp.html.sanitizer.version>
         <slf4j-api.version>1.7.22</slf4j-api.version>
@@ -1617,10 +1615,6 @@
                 <product.name-html>\u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\u003E</product.name-html>
                 <product.version>${project.version}</product.version>
                 <product.default-profile>community</product.default-profile>
-                <jackson.version>2.10.1</jackson.version>
-                <jackson.databind.version>${jackson.version}</jackson.databind.version>
-                <resteasy.version>3.11.0.Final</resteasy.version>
-                <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
             </properties>
         </profile>