From 27b410e7724c4bbb36b175f265442bc49bbd9cde Mon Sep 17 00:00:00 2001 From: Martin Kanis Date: Mon, 25 Nov 2019 10:39:19 +0100 Subject: [PATCH] KEYCLOAK-12059 Upgrade to WildFly 18.0.1 --- common/pom.xml | 2 +- ...,2.9.10.1,Apache Software License 2.0.txt} | 0 .../resources/licenses/keycloak/licenses.xml | 4 +- ...,2.9.10.1,Apache Software License 2.0.txt} | 0 .../resources/licenses/keycloak/licenses.xml | 4 +- ...4.RELEASE,Apache Software License 2.0.txt} | 0 ...4.RELEASE,Apache Software License 2.0.txt} | 0 .../resources/licenses/keycloak/licenses.xml | 6 +- ...asn1,2.0.0,Apache Software License 2.0.txt | 3 +- .../keycloak/rfc4648.js,MIT License.txt | 112 +++++++++++------ ...4.RELEASE,Apache Software License 2.0.txt} | 0 ...4.RELEASE,Apache Software License 2.0.txt} | 0 .../resources/licenses/rh-sso/licenses.xml | 6 +- ...asn1,2.0.0,Apache Software License 2.0.txt | 3 +- .../rh-sso/rfc4648.js,MIT License.txt | 114 ++++++++++++------ pom.xml | 23 ++-- 16 files changed, 174 insertions(+), 103 deletions(-) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.core,jackson-databind,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.core,jackson-databind,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt} (100%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/{com.webauthn4j,webauthn4j-core,0.9.14.RELEASE,Apache Software License 2.0.txt => com.webauthn4j,webauthnj4-core,0.9.14.RELEASE,Apache Software License 2.0.txt} (100%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/{com.webauthn4j,webauthn4j-util,0.9.14.RELEASE,Apache Software License 2.0.txt => com.webauthn4j,webauthnj4-util,0.9.14.RELEASE,Apache Software License 2.0.txt} (100%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/{com.webauthn4j,webauthn4j-core,0.9.14.RELEASE,Apache Software License 2.0.txt => com.webauthn4j,webauthnj4-core,0.9.14.RELEASE,Apache Software License 2.0.txt} (100%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/{com.webauthn4j,webauthn4j-util,0.9.14.RELEASE,Apache Software License 2.0.txt => com.webauthn4j,webauthnj4-util,0.9.14.RELEASE,Apache Software License 2.0.txt} (100%) diff --git a/common/pom.xml b/common/pom.xml index 5ca963616a..d13f8ceaec 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -70,7 +70,7 @@ com.sun.activation - javax.activation + jakarta.activation diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml index 3e9c2edfcb..da18b2750a 100644 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml @@ -48,11 +48,11 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10 + 2.9.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10.1/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml index da0e9da3b5..f4ef86c18b 100644 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml @@ -48,11 +48,11 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10 + 2.9.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10.1/src/main/resources/META-INF/LICENSE diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthn4j-core,0.9.14.RELEASE,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthnj4-core,0.9.14.RELEASE,Apache Software License 2.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthn4j-core,0.9.14.RELEASE,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthnj4-core,0.9.14.RELEASE,Apache Software License 2.0.txt diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthn4j-util,0.9.14.RELEASE,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthnj4-util,0.9.14.RELEASE,Apache Software License 2.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthn4j-util,0.9.14.RELEASE,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.webauthn4j,webauthnj4-util,0.9.14.RELEASE,Apache Software License 2.0.txt diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml index c46b9f2af5..a78906e1f1 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml @@ -547,7 +547,7 @@ Apache Software License 2.0 - https://github.com/webauthn4j/webauthn4j/blob/0.9.14.RELEASE/LICENSE.txt + https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.9.14.RELEASE/LICENSE.txt @@ -558,7 +558,7 @@ Apache Software License 2.0 - https://github.com/webauthn4j/webauthn4j/blob/0.9.14.RELEASE/LICENSE.txt + https://raw.githubusercontent.com/webauthn4j/webauthn4j/0.9.14.RELEASE/LICENSE.txt @@ -569,7 +569,7 @@ Apache Software License 2.0 - https://github.com/apache/directory-kerby/blob/kerby-all-2.0.0/LICENSE + https://raw.githubusercontent.com/apache/directory-kerby/kerby-all-2.0.0/LICENSE diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.kerby,kerby-asn1,2.0.0,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.kerby,kerby-asn1,2.0.0,Apache Software License 2.0.txt index 8dada3edaf..e06d208186 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.kerby,kerby-asn1,2.0.0,Apache Software License 2.0.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.kerby,kerby-asn1,2.0.0,Apache Software License 2.0.txt @@ -1,4 +1,4 @@ - Apache License +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -199,3 +199,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/rfc4648.js,MIT License.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/rfc4648.js,MIT License.txt index bc52095169..f77cb20dfd 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/rfc4648.js,MIT License.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/rfc4648.js,MIT License.txt @@ -18,14 +18,15 @@ - - - + + + + rfc4648.js/package.json at master · swansontec/rfc4648.js · GitHub @@ -40,7 +41,8 @@ - + + @@ -51,7 +53,8 @@ - + + @@ -69,13 +72,14 @@ - - + - + - + + + @@ -139,7 +143,7 @@
Sign up @@ -173,10 +177,9 @@
  • Code review
  • Project management
  • Integrations
    • -
  • Actions -
  • Package registry - -
  • Security +
  • Actions
    • +
  • Packages
    • +
  • Security
  • Team management
  • Social coding
  • Documentation
    • @@ -282,7 +285,7 @@ aria-autocomplete="list" aria-controls="jump-to-results" aria-label="Search" - data-jump-to-suggestions-path="/_graphql/GetSuggestedNavigationDestinations#csrf-token=zHTcGNp32/2TjmgdtssKH9HGFR1aricyjs9oEr4ZdLpOJWJRa2ozk5cUQVcn9yIr5wqtic7ZdnyW6g8To7z5Lg==" + data-jump-to-suggestions-path="/_graphql/GetSuggestedNavigationDestinations#csrf-token=AzXxSnvATUBnulN021ivEmmxeFP6drpmHdDjy1DoDkyu4AAMDyluom2MJcu3An00ZjtWfDFZE/b0b0S33roKXQ==" spellcheck="false" autocomplete="off" > @@ -409,13 +412,13 @@ Sign in Sign up @@ -453,7 +456,7 @@ -
    +
      @@ -463,7 +466,7 @@
    • - + Watch
    • + Star
    • - + Fork @@ -499,7 +502,7 @@

      - /rfc4648.js @@ -530,7 +533,7 @@ -