From d4eeed306be1bb0a605c5d1154c33a1aabc7fb96 Mon Sep 17 00:00:00 2001 From: Douglas Palmer Date: Tue, 24 Mar 2020 15:10:34 -0700 Subject: [PATCH] [KEYCLOAK-11764] Upgrade to Wildfly 19 --- boms/pom.xml | 2 +- ...ns,2.10.1,Apache Software License 2.0.txt} | 0 ...re,2.10.1,Apache Software License 2.0.txt} | 0 ...nd,2.10.1,Apache Software License 2.0.txt} | 0 ...se,2.10.1,Apache Software License 2.0.txt} | 0 ...er,2.10.1,Apache Software License 2.0.txt} | 0 ...ns,2.10.1,Apache Software License 2.0.txt} | 0 .../resources/licenses/keycloak/licenses.xml | 32 ++++----- ...astle,bcpkix-jdk15on,1.62,MIT License.txt} | 2 +- ...astle,bcprov-jdk15on,1.62,MIT License.txt} | 2 +- ...ns,2.10.1,Apache Software License 2.0.txt} | 0 ...re,2.10.1,Apache Software License 2.0.txt} | 0 ...nd,2.10.1,Apache Software License 2.0.txt} | 0 ...se,2.10.1,Apache Software License 2.0.txt} | 0 ...er,2.10.1,Apache Software License 2.0.txt} | 0 ...ns,2.10.1,Apache Software License 2.0.txt} | 0 .../resources/licenses/keycloak/licenses.xml | 40 +++++------ ...nt,4.5.11,Apache Software License 2.0.txt} | 0 ...re,4.4.13,Apache Software License 2.0.txt} | 0 ...astle,bcpkix-jdk15on,1.62,MIT License.txt} | 2 +- ...astle,bcprov-jdk15on,1.62,MIT License.txt} | 2 +- ...or,2.10.1,Apache Software License 2.0.txt} | 0 .../resources/licenses/keycloak/licenses.xml | 2 +- .../resources/licenses/keycloak/licenses.xml | 8 +-- ...castle,bcpkix-jdk15on,1.60,MIT License.txt | 22 ------ ...castle,bcpkix-jdk15on,1.62,MIT License.txt | 22 ++++++ ...castle,bcprov-jdk15on,1.60,MIT License.txt | 22 ------ ...castle,bcprov-jdk15on,1.62,MIT License.txt | 22 ++++++ maven-settings.xml | 4 +- pom.xml | 72 +++++++++---------- saml-core/pom.xml | 1 - .../SAMLLoginResponseHandlingTest.java | 4 +- .../tests/other/springboot-tests/pom.xml | 4 ++ travis-run-tests.sh | 10 +-- util/embedded-ldap/pom.xml | 4 ++ .../util/ldap/RangedAttributeInterceptor.java | 5 +- 36 files changed, 146 insertions(+), 138 deletions(-) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.core,jackson-annotations,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-annotations,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.core,jackson-core,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-core,2.10.1,Apache Software License 2.0.txt} (100%) rename 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 => com.fasterxml.jackson.core,jackson-databind,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt => org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt} (94%) rename distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/{org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt => org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt} (94%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.core,jackson-annotations,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-annotations,2.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-core,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-core,2.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.1,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-databind,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.10.1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.apache.httpcomponents,httpclient,4.5.4,Apache Software License 2.0.txt => org.apache.httpcomponents,httpclient,4.5.11,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.apache.httpcomponents,httpcore,4.4.5,Apache Software License 2.0.txt => org.apache.httpcomponents,httpcore,4.4.13,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt => org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt} (94%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt => org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt} (94%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.9.10,Apache Software License 2.0.txt => com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.10.1,Apache Software License 2.0.txt} (100%) delete mode 100644 distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt create mode 100644 distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt delete mode 100644 distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt create mode 100644 distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt diff --git a/boms/pom.xml b/boms/pom.xml index a826e401bc..a95d5f2cea 100644 --- a/boms/pom.xml +++ b/boms/pom.xml @@ -21,7 +21,7 @@ org.jboss jboss-parent - 34 + 35 org.keycloak.bom diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,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-annotations,2.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-annotations,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-annotations,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.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-core,2.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-core,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-core,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10.1,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.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.1,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.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.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.jaxrs,jackson-jaxrs-base,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.jaxrs,jackson-jaxrs-base,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.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.jaxrs,jackson-jaxrs-json-provider,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.jaxrs,jackson-jaxrs-json-provider,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.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.module,jackson-module-jaxb-annotations,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.module,jackson-module-jaxb-annotations,2.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 da18b2750a..64cf2a95e3 100644 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml @@ -4,88 +4,88 @@ org.bouncycastle bcpkix-jdk15on - 1.60 + 1.62 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html org.bouncycastle bcprov-jdk15on - 1.60 + 1.62 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html com.fasterxml.jackson.core jackson-annotations - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.10/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.10/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.9.10.1 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10.1/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt similarity index 94% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt index acdef84f96..872d42dc4e 100644 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt @@ -1,7 +1,7 @@ -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)

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/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt similarity index 94% rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt index acdef84f96..872d42dc4e 100644 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt @@ -1,7 +1,7 @@ -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)

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/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,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-annotations,2.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-annotations,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-annotations,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.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-core,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-core,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.10.1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.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.1,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.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.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.jaxrs,jackson-jaxrs-base,2.9.10,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.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.jaxrs,jackson-jaxrs-json-provider,2.9.10,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.10.1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.10,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.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.module,jackson-module-jaxb-annotations,2.9.10,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.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 28b3493cfd..73b702cba9 100644 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml @@ -4,110 +4,110 @@ org.bouncycastle bcpkix-jdk15on - 1.60 + 1.62 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html org.bouncycastle bcprov-jdk15on - 1.60 + 1.62 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html com.fasterxml.jackson.core jackson-annotations - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.10/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.10/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.9.10.1 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10.1/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.9.10 + 2.10.1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE org.apache.httpcomponents httpclient - 4.5.4 + 4.5.11 Apache Software License 2.0 - 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 + 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 org.apache.httpcomponents httpcore - 4.4.5 + 4.4.13 Apache Software License 2.0 - 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 + 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 diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5.4,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5.11,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5.4,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5.11,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpcore,4.4.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpcore,4.4.13,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpcore,4.4.5,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpcore,4.4.13,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt similarity index 94% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt index acdef84f96..872d42dc4e 100644 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt @@ -1,7 +1,7 @@ -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)

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/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt similarity index 94% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt index acdef84f96..872d42dc4e 100644 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt @@ -1,7 +1,7 @@ -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)

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/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.9.10,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.10.1,Apache Software License 2.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.9.10,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.10.1,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 2afb1029f0..e56d0454a0 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 @@ -554,7 +554,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.9.10 + 2.10.1 Apache Software License 2.0 diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml index 2bc05bc686..a512c43b48 100644 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml @@ -4,22 +4,22 @@ org.bouncycastle bcpkix-jdk15on - 1.60 + 1.62 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html org.bouncycastle bcprov-jdk15on - 1.60 + 1.62 MIT License - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html + https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt deleted file mode 100644 index acdef84f96..0000000000 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt +++ /dev/null @@ -1,22 +0,0 @@ - - - -Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) -

-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, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: -

-The above copyright notice and this permission notice shall be included in all copies or substantial -portions of the Software. -

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - - diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt new file mode 100644 index 0000000000..872d42dc4e --- /dev/null +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.62,MIT License.txt @@ -0,0 +1,22 @@ + + + +Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) +

+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, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: +

+The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. +

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt deleted file mode 100644 index acdef84f96..0000000000 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt +++ /dev/null @@ -1,22 +0,0 @@ - - - -Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) -

-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, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: -

-The above copyright notice and this permission notice shall be included in all copies or substantial -portions of the Software. -

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - - diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt new file mode 100644 index 0000000000..872d42dc4e --- /dev/null +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.62,MIT License.txt @@ -0,0 +1,22 @@ + + + +Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) +

+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, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: +

+The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. +

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + diff --git a/maven-settings.xml b/maven-settings.xml index 9a7e3cd3bc..950b2dba53 100644 --- a/maven-settings.xml +++ b/maven-settings.xml @@ -14,7 +14,7 @@ jboss-public-repository-group JBoss Public Maven Repository Group - http://repository.jboss.org/nexus/content/groups/public/ + https://repository.jboss.org/nexus/content/groups/public/ default true @@ -30,7 +30,7 @@ jboss-public-repository-group JBoss Public Maven Repository Group - http://repository.jboss.org/nexus/content/groups/public/ + https://repository.jboss.org/nexus/content/groups/public/ default true diff --git a/pom.xml b/pom.xml index bdee396080..056ae51f40 100755 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.jboss jboss-parent - 34 + 35 Keycloak @@ -41,10 +41,10 @@ ${timestamp} - 18.0.1.Final - 1.2.12.Final + 19.0.0.Final + 1.2.13.Final 7.3.0.GA-redhat-00004 - 10.0.3.Final + 11.0.0.Final 7.2.0.Final 7.5.22.Final-redhat-1 @@ -52,22 +52,21 @@ 0.66.19 2.4 - 4.5.4 - 4.4.5 + 4.5.11 + 4.4.13 0.6 1.5.0.Final - 1.60 - 3.3.4 - 3.3.4 - 3.3.4 - 3.3.4 + 1.62 + 3.3.5 + 3.3.5 + 3.3.5 + 3.3.5 2.1.1 - 2.3.1 - 1.4.193 + 1.4.197 2.2.3 - 5.3.14.Final - 5.3.14.Final - 9.4.16.Final + 5.3.15.Final + 5.3.15.Final + 9.4.18.Final 2.10.0 ${jackson.version} @@ -85,22 +84,22 @@ 20191001.1 1.7.22 1.7.22 - 3.0.7 - 2.3.1 - 2.3.1 + 3.0.10 + 2.3.3-b02 + 2.4.0-b180830.0359 2.3.1 1.2.1 - 2.3.1 - 2.0.28.Final - 1.10.4.Final - 1.6.0.Final + 2.3.3-b02 + 2.0.30.Final + 1.11.2.Final + 1.7.0.Final 9.2.4.v20141103 9.3.9.v20160517 9.4.2.v20170220 - 5.0.3 + 6.0.3 2.1.4 1.1.6 - 1.5.1.Final + 1.5.2.Final 1.4.3 5.0.3.Final 25.0-jre @@ -111,8 +110,9 @@ 2.6 3.9 - 2.0.0-M21 - 1.0.0-M33 + 2.6 + 2.0.0-M24 + 1.0.0 3.4.0 2.3.29 @@ -146,7 +146,7 @@ 1.0.4 1.7.6 2.3.7 - 1.2.1.Final + 2.0.0.Final 1.6.5 1.8.0 0.28.0 @@ -247,11 +247,6 @@ jboss-dmr ${jboss.dmr.version} - - com.github.relaxng - relaxngDatatype - ${github.relaxng.version} - com.sun.istack istack-commons-runtime @@ -1475,6 +1470,11 @@ commons-lang3 ${commons-lang3.version} + + commons-io + commons-io + ${commons-io.version} + @@ -1617,9 +1617,9 @@ \u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\u003E ${project.version} community - 2.9.10 - 2.9.10.1 - 3.9.1.Final + 2.10.1 + ${jackson.version} + 3.11.0.Final ${resteasy.version} diff --git a/saml-core/pom.xml b/saml-core/pom.xml index ccc7db0fe6..5398d3dd11 100755 --- a/saml-core/pom.xml +++ b/saml-core/pom.xml @@ -70,7 +70,6 @@ commons-io commons-io - 2.6 test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java index 6bf8da5d79..57d437264b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java @@ -117,7 +117,7 @@ public class SAMLLoginResponseHandlingTest extends AbstractSAMLServletAdapterTes @Test public void testErrorHandlingUnsigned() throws Exception { SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder() - .destination(employeeSigServletPage.toString() + "/saml") + .destination(employeeSigServletPage.toString() + "saml") .issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo") .status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get()); Document document = builder.buildDocument(); @@ -131,7 +131,7 @@ public class SAMLLoginResponseHandlingTest extends AbstractSAMLServletAdapterTes @Test public void testErrorHandlingSigned() throws Exception { SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder() - .destination(employeeSigServletPage.toString() + "/saml") + .destination(employeeSigServletPage.toString() + "saml") .issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo") .status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get()); Document document = builder.buildDocument(); diff --git a/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml b/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml index 35b5d70f21..d050501b64 100644 --- a/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml +++ b/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml @@ -74,6 +74,7 @@ -Pspring-boot-adapter-${adapter.container} -Dmaven.repo.local=${settings.localRepository} -Dspringboot-version=${springboot.version.option} + -Dinsecure.repositories=WARN @@ -97,6 +98,7 @@ -Dspringboot-version=${springboot.version.option} -Dapp.server.debug.port=${app.server.debug.port} -Dapp.server.debug.suspend=${app.server.debug.suspend} + -Dinsecure.repositories=WARN @@ -154,6 +156,7 @@ -Pspring-boot-adapter-${adapter.container} -Dmaven.repo.local=${settings.localRepository} -Dspringboot-version=${springboot.version.option} + -Dinsecure.repositories=WARN ${repo.argument} @@ -180,6 +183,7 @@ -Dspringboot-version=${springboot.version.option} -Dapp.server.debug.port=${app.server.debug.port} -Dapp.server.debug.suspend=${app.server.debug.suspend} + -Dinsecure.repositories=WARN ${repo.argument} diff --git a/travis-run-tests.sh b/travis-run-tests.sh index 88909599e2..8ee3fcfb14 100755 --- a/travis-run-tests.sh +++ b/travis-run-tests.sh @@ -5,7 +5,7 @@ function run-server-tests() { mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml install -B -nsu -Pauth-server-wildfly -DskipTests cd tests/base - mvn test -B -nsu -Pauth-server-wildfly "-Dtest=$1" $2 2>&1 | java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer + mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml test -B -nsu -Pauth-server-wildfly "-Dtest=$1" $2 2>&1 | java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer exit ${PIPESTATUS[0]} } @@ -69,9 +69,9 @@ kill $COMPILING_PID travis_fold end compile_keycloak if [ $1 == "unit" ]; then - mvn -B test -DskipTestsuite + mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml test -B -DskipTestsuite # Generate documentation to catch potential issues earlier than during the release - mvn test -B -nsu -f services -Pjboss-release + mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml test -B -nsu -f services -Pjboss-release fi if [ $1 == "server-group1" ]; then @@ -103,7 +103,7 @@ if [ $1 == "crossdc-server" ]; then mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml install -B -nsu -Pauth-servers-crossdc-jboss,auth-server-wildfly,cache-server-infinispan -DskipTests cd tests/base - mvn clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly -Dtest=org.keycloak.testsuite.crossdc.**.* 2>&1 | + mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly -Dtest=org.keycloak.testsuite.crossdc.**.* 2>&1 | java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer exit ${PIPESTATUS[0]} fi @@ -113,7 +113,7 @@ if [ $1 == "crossdc-adapter" ]; then mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml install -B -nsu -Pauth-servers-crossdc-jboss,auth-server-wildfly,cache-server-infinispan,app-server-wildfly -DskipTests cd tests/base - mvn clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly,app-server-wildfly -Dtest=org.keycloak.testsuite.adapter.**.crossdc.**.* 2>&1 | + mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly,app-server-wildfly -Dtest=org.keycloak.testsuite.adapter.**.crossdc.**.* 2>&1 | java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer exit ${PIPESTATUS[0]} fi diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml index f1b22f62e7..e5307b3235 100644 --- a/util/embedded-ldap/pom.xml +++ b/util/embedded-ldap/pom.xml @@ -35,6 +35,10 @@ org.keycloak keycloak-core + + commons-io + commons-io + org.jboss.logging jboss-logging diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java index d7f47714fa..a0ed01680c 100644 --- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java +++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java @@ -17,6 +17,7 @@ package org.keycloak.util.ldap; +import java.io.IOException; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -181,12 +182,12 @@ public class RangedAttributeInterceptor extends BaseInterceptor { } @Override - public void close() { + public void close() throws IOException { c.close(); } @Override - public void close(Exception excptn) { + public void close(Exception excptn) throws IOException { c.close(excptn); }