From 61fe55461727af4fa11bf5f78c949e251834c91c Mon Sep 17 00:00:00 2001 From: stianst Date: Mon, 18 Dec 2017 14:38:45 +0100 Subject: [PATCH] KEYCLOAK-6051 Fix licenses --- .../as7-adapter-zip/assembly.xml | 18 +-- .../as7-eap6-adapter/as7-modules/assembly.xml | 16 ++- .../as7-eap6-adapter/as7-modules/pom.xml | 132 ++++++++++++++++++ ...ons,2.8.9,Apache Software License 2.0.txt} | 0 ...ore,2.8.9,Apache Software License 2.0.txt} | 0 ...ind,2.8.9,Apache Software License 2.0.txt} | 0 ...base,2.8.9,Apache Software License 2.0.txt | 1 + ...ider,2.8.9,Apache Software License 2.0.txt | 1 + ...ions,2.8.9,Apache Software License 2.0.txt | 1 + .../resources/licenses/keycloak/licenses.xml | 31 ++-- ...castle,bcpkix-jdk15on,1.56,MIT License.txt | 0 ...castle,bcprov-jdk15on,1.56,MIT License.txt | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ...9.redhat-1,Apache Software License 2.0.txt | 1 + ...9.redhat-1,Apache Software License 2.0.txt | 1 + ...ions,2.8.9,Apache Software License 2.0.txt | 1 + .../resources/licenses/rh-sso/licenses.xml | 35 +++-- ...x-jdk15on,1.56.0.redhat-2,MIT License.txt} | 0 ...ov-jdk15on,1.56.0.redhat-2,MIT License.txt | 1 + .../eap6-adapter-zip/assembly.xml | 30 +--- .../as7-eap6-adapter/eap6-adapter-zip/pom.xml | 4 - ...base,2.5.4,Apache Software License 2.0.txt | 1 - ...ider,2.5.4,Apache Software License 2.0.txt | 1 - ...4.redhat-1,Apache Software License 2.0.txt | 1 - ...4.redhat-1,Apache Software License 2.0.txt | 1 - ...ons,2.8.9,Apache Software License 2.0.txt} | 0 ...ore,2.8.9,Apache Software License 2.0.txt} | 0 ...ind,2.8.9,Apache Software License 2.0.txt} | 0 ...base,2.5.4,Apache Software License 2.0.txt | 1 - ...base,2.8.9,Apache Software License 2.0.txt | 1 + ...ider,2.5.4,Apache Software License 2.0.txt | 1 - ...ider,2.8.9,Apache Software License 2.0.txt | 1 + ...ions,2.8.9,Apache Software License 2.0.txt | 1 + .../resources/licenses/keycloak/licenses.xml | 37 +++-- ...ent,4.5.2,Apache Software License 2.0.txt} | 0 ...ore,4.4.4,Apache Software License 2.0.txt} | 0 ...3.1.Final,Apache Software License 2.0.txt} | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ...4.redhat-1,Apache Software License 2.0.txt | 1 - ...9.redhat-1,Apache Software License 2.0.txt | 1 + ...4.redhat-1,Apache Software License 2.0.txt | 1 - ...9.redhat-1,Apache Software License 2.0.txt | 1 + ...9.redhat-1,Apache Software License 2.0.txt | 1 + .../resources/licenses/rh-sso/licenses.xml | 37 +++-- ....redhat-1,Apache Software License 2.0.txt} | 0 ....redhat-1,Apache Software License 2.0.txt} | 0 ...-redhat-1,Apache Software License 2.0.txt} | 0 .../adapters/wildfly-adapter/assembly.xml | 14 +- distribution/adapters/wildfly-adapter/pom.xml | 4 - .../adapter-feature-pack/assembly.xml | 13 ++ .../adapter-feature-pack/pom.xml | 92 ++++++++++++ .../resources/licenses/keycloak/licenses.xml | 0 .../resources/licenses/rh-sso/licenses.xml | 0 .../resources/licenses/keycloak/licenses.xml | 66 +++++++-- ...5.0.Final,Apache Software License 2.0.txt} | 0 ...5.0.Final,Apache Software License 2.0.txt} | 0 ....5.0.Final,Apache Software License 2.0.txt | 1 + ....5.0.Final,Apache Software License 2.0.txt | 1 + ....5.0.Final,Apache Software License 2.0.txt | 1 + .../resources/licenses/rh-sso/licenses.xml | 68 +++++++-- ...-redhat-3,Apache Software License 2.0.txt} | 0 .../licenses-common/check-licenses.sh | 24 ++++ .../as7-adapter-zip/assembly.xml | 16 +-- .../as7-eap6-adapter/as7-modules/assembly.xml | 16 ++- .../as7-eap6-adapter/as7-modules/pom.xml | 101 +++++++++++++- .../resources/licenses/keycloak/licenses.xml | 0 ...castle,bcpkix-jdk15on,1.56,MIT License.txt | 0 ...castle,bcprov-jdk15on,1.56,MIT License.txt | 0 .../resources/licenses/rh-sso/licenses.xml | 0 ...ix-jdk15on,1.52.0.redhat-3,MIT License.txt | 0 ...ov-jdk15on,1.52.0.redhat-3,MIT License.txt | 0 .../eap6-adapter-zip/assembly.xml | 28 +--- .../as7-eap6-adapter/eap6-adapter-zip/pom.xml | 4 - ...ov-jdk15on,1.52.0.redhat-3,MIT License.txt | 1 - .../wildfly-adapter-zip/assembly.xml | 30 +--- .../wildfly-adapter-zip/pom.xml | 4 - .../wildfly-modules/assembly.xml | 16 ++- .../wildfly-adapter/wildfly-modules/pom.xml | 81 ++++++++++- .../resources/licenses/keycloak/licenses.xml | 0 .../resources/licenses/rh-sso/licenses.xml | 0 84 files changed, 703 insertions(+), 239 deletions(-) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.5.4,Apache Software License 2.0.txt => as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.8.9,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.5.4,Apache Software License 2.0.txt => as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.8.9,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.5.4,Apache Software License 2.0.txt => as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt} (100%) create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/keycloak/licenses.xml (72%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt (100%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt (100%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.5.4.redhat-1,Apache Software License 2.0.txt => as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.5.4.redhat-1,Apache Software License 2.0.txt => as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.9.redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt => as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt} (100%) create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/rh-sso/licenses.xml (69%) rename distribution/adapters/as7-eap6-adapter/{eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt => as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt} (100%) create mode 120000 distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt delete mode 120000 distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4,Apache Software License 2.0.txt delete mode 120000 distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,Apache Software License 2.0.txt delete mode 120000 distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt delete mode 120000 distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{com.fasterxml.jackson.core,jackson-annotations,2.5.4,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-annotations,2.8.9,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.5.4,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-core,2.8.9,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.5.4,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt} (100%) delete mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4,Apache Software License 2.0.txt create mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt delete mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,Apache Software License 2.0.txt create mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt create mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.apache.httpcomponents,httpclient,4.5,Apache Software License 2.0.txt => org.apache.httpcomponents,httpclient,4.5.2,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.apache.httpcomponents,httpcore,4.4.1,Apache Software License 2.0.txt => org.apache.httpcomponents,httpcore,4.4.4,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/{org.jboss.logging,jboss-logging,3.3.0.Final,Apache Software License 2.0.txt => org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/{com.fasterxml.jackson.core,jackson-annotations,2.5.4.redhat-1,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/{com.fasterxml.jackson.core,jackson-core,2.5.4.redhat-1,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-core,2.8.9.redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/{com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt => com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt} (100%) delete mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt create mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt delete mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt create mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt create mode 120000 distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/{org.apache.httpcomponents,httpclient,4.5.0.redhat-1,Apache Software License 2.0.txt => org.apache.httpcomponents,httpclient,4.5.2.redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/{org.apache.httpcomponents,httpcore,4.4.1.redhat-1,Apache Software License 2.0.txt => org.apache.httpcomponents,httpcore,4.4.4.redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/{org.jboss.logging,jboss-logging,3.3.0.Final-redhat-1,Apache Software License 2.0.txt => org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt} (100%) rename distribution/{adapters/wildfly-adapter => feature-packs/adapter-feature-pack}/src/main/resources/licenses/keycloak/licenses.xml (100%) rename distribution/{adapters/wildfly-adapter => feature-packs/adapter-feature-pack}/src/main/resources/licenses/rh-sso/licenses.xml (100%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/{com.google.code.guice,guice,2.0,Apache Software License 2.0.txt => org.drools,drools-compiler,6.5.0.Final,Apache Software License 2.0.txt} (100%) rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/{rh-sso/com.google.code.guice,guice,2.0,Apache Software License 2.0.txt => keycloak/org.drools,drools-core,6.5.0.Final,Apache Software License 2.0.txt} (100%) create mode 120000 distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt create mode 120000 distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt create mode 120000 distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt rename distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/{org.freemarker,freemarker,2.3.23.redhat-3,Apache Software License 2.0.txt => org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt} (100%) create mode 100755 distribution/licenses-common/check-licenses.sh rename distribution/saml-adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/keycloak/licenses.xml (100%) rename distribution/saml-adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt (100%) rename distribution/saml-adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt (100%) rename distribution/saml-adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/rh-sso/licenses.xml (100%) rename distribution/saml-adapters/as7-eap6-adapter/{eap6-adapter-zip => as7-modules}/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt (100%) rename distribution/{adapters/as7-eap6-adapter/eap6-adapter-zip => saml-adapters/as7-eap6-adapter/as7-modules}/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt (100%) delete mode 120000 distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt rename distribution/saml-adapters/wildfly-adapter/{wildfly-adapter-zip => wildfly-modules}/src/main/resources/licenses/keycloak/licenses.xml (100%) rename distribution/saml-adapters/wildfly-adapter/{wildfly-adapter-zip => wildfly-modules}/src/main/resources/licenses/rh-sso/licenses.xml (100%) diff --git a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml index 7419fa29f1..1525d77ea2 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml @@ -27,26 +27,12 @@ - ${project.build.directory}/unpacked + ${project.build.directory}/unpacked/modules com/fasterxml/jackson/** org/bouncycastle/** - org/keycloak/keycloak-common/** - org/keycloak/keycloak-core/** - org/keycloak/keycloak-adapter-spi/** - org/keycloak/keycloak-adapter-core/** - org/keycloak/keycloak-jboss-adapter-core/** - org/keycloak/keycloak-as7-adapter/** - org/keycloak/keycloak-as7-subsystem/** - org/keycloak/keycloak-adapter-subsystem/** - org/keycloak/keycloak-servlet-oauth-client/** - - - org/keycloak/keycloak-authz-client/** + org/keycloak/keycloak-*/** - - **/*.war - modules diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml index 4acef09b9c..e392cd204f 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/assembly.xml @@ -25,15 +25,19 @@ - ../../ - - License.html - - + src/main/resources/licenses/${product.slot} + licenses + + licenses.xml + + + + ${project.build.directory}/licenses + licenses ${project.build.directory}/modules - + modules diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml index bd7680e1fa..df9127aa74 100755 --- a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml @@ -37,75 +37,203 @@ org.keycloak keycloak-common + + + * + * + + org.keycloak keycloak-core + + + * + * + + org.keycloak keycloak-adapter-spi + + + * + * + + org.keycloak keycloak-as7-adapter-spi + + + * + * + + org.keycloak keycloak-tomcat-adapter-spi + + + * + * + + org.keycloak keycloak-adapter-core + + + * + * + + org.keycloak keycloak-jboss-adapter-core + + + * + * + + org.keycloak keycloak-as7-adapter + + + * + * + + org.keycloak keycloak-tomcat-core-adapter + + + * + * + + org.keycloak keycloak-as7-subsystem + + + * + * + + org.keycloak keycloak-servlet-oauth-client + + + * + * + + org.bouncycastle bcprov-jdk15on + + + * + * + + org.bouncycastle bcpkix-jdk15on + + + * + * + + com.fasterxml.jackson.core jackson-core + + + * + * + + com.fasterxml.jackson.core jackson-databind + + + * + * + + com.fasterxml.jackson.core jackson-annotations + + + * + * + + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + + + * + * + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + * + * + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + * + * + + org.keycloak keycloak-authz-client + + + * + * + + @@ -212,6 +340,10 @@ + + org.keycloak + keycloak-distribution-licenses-maven-plugin + diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.5.4,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.8.9,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.5.4,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.8.9,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.5.4,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.8.9,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.5.4,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.8.9,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.5.4,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.8.9,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.5.4,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.8.9,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.8.9,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.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..26c4542ac7 --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,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.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..26c4542ac7 --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,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.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..26c4542ac7 --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml similarity index 72% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml index 899631a97f..c2195cc5ee 100644 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml @@ -26,55 +26,66 @@ com.fasterxml.jackson.core jackson-annotations - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.8.9 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.5.4.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.9.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.5.4.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.9.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt new file mode 120000 index 0000000000..001ce00e5a --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt new file mode 120000 index 0000000000..001ce00e5a --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..001ce00e5a --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml similarity index 69% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml index 2f8d4d59c9..0f76b7c9af 100644 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml @@ -4,7 +4,7 @@ org.bouncycastle bcpkix-jdk15on - 1.52.0.redhat-3 + 1.56.0.redhat-2 MIT License @@ -15,7 +15,7 @@ org.bouncycastle bcprov-jdk15on - 1.52.0.redhat-3 + 1.56.0.redhat-2 MIT License @@ -26,55 +26,66 @@ com.fasterxml.jackson.core jackson-annotations - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.8.9 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt new file mode 120000 index 0000000000..2484813f2a --- /dev/null +++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt @@ -0,0 +1 @@ +org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml index dc6cfb3e40..228d498901 100755 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml +++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml @@ -26,39 +26,17 @@ - ${project.build.directory}/unpacked + ${project.build.directory}/unpacked/modules com/fasterxml/jackson/** org/bouncycastle/** - org/keycloak/keycloak-common/** - org/keycloak/keycloak-core/** - org/keycloak/keycloak-adapter-spi/** - org/keycloak/keycloak-adapter-core/** - org/keycloak/keycloak-jboss-adapter-core/** - org/keycloak/keycloak-as7-adapter/** - org/keycloak/keycloak-as7-subsystem/** - org/keycloak/keycloak-adapter-subsystem/** - org/keycloak/keycloak-servlet-oauth-client/** - - - org/keycloak/keycloak-authz-client/** + org/keycloak/keycloak-*/** - - **/*.war - modules/system/add-ons/keycloak - - src/main/resources/licenses/${product.slot} - docs/licenses-${product.slot}-adapter - - licenses.xml - - - - target/licenses - docs/licenses-${product.slot}-adapter + ${project.build.directory}/unpacked/licenses + docs/licenses-${product.slot} diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml index d303dada49..1bf1737406 100755 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml +++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml @@ -90,10 +90,6 @@ - - org.keycloak - keycloak-distribution-licenses-maven-plugin - diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4,Apache Software License 2.0.txt deleted file mode 120000 index dc029b01d0..0000000000 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,Apache Software License 2.0.txt deleted file mode 120000 index dc029b01d0..0000000000 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt deleted file mode 120000 index 79362bbd66..0000000000 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt deleted file mode 120000 index 79362bbd66..0000000000 --- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.5.4,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.8.9,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.5.4,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.8.9,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.5.4,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.8.9,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.5.4,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.8.9,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.5.4,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.8.9,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.5.4,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.8.9,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.5.4,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.5.4,Apache Software License 2.0.txt deleted file mode 120000 index dc029b01d0..0000000000 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,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.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..26c4542ac7 --- /dev/null +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,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.5.4,Apache Software License 2.0.txt deleted file mode 120000 index dc029b01d0..0000000000 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,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.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..26c4542ac7 --- /dev/null +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,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.8.9,Apache Software License 2.0.txt new file mode 120000 index 0000000000..26c4542ac7 --- /dev/null +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9,Apache Software License 2.0.txt \ No newline at end of file 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 121e73b7b8..f643800da5 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 @@ -26,55 +26,66 @@ com.fasterxml.jackson.core jackson-annotations - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.5.4 + 2.8.9 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.8.9 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE @@ -103,7 +114,7 @@ org.apache.httpcomponents httpclient - 4.5 + 4.5.2 Apache Software License 2.0 @@ -114,7 +125,7 @@ org.apache.httpcomponents httpcore - 4.4.1 + 4.4.4 Apache Software License 2.0 @@ -125,7 +136,7 @@ org.jboss.logging jboss-logging - 3.3.0.Final + 3.3.1.Final Apache Software License 2.0 diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5.2,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,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpclient,4.5.2,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.1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpcore,4.4.4,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.1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.apache.httpcomponents,httpcore,4.4.4,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.0.Final,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.0.Final,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.5.4.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.9.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.5.4.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.9.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt deleted file mode 120000 index 79362bbd66..0000000000 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.5.4.redhat-1,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt new file mode 120000 index 0000000000..001ce00e5a --- /dev/null +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.9.redhat-1,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt deleted file mode 120000 index 79362bbd66..0000000000 --- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.5.4.redhat-1,Apache Software License 2.0.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core,jackson-databind,2.5.4.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt new file mode 120000 index 0000000000..001ce00e5a --- /dev/null +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.9.redhat-1,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt new file mode 120000 index 0000000000..001ce00e5a --- /dev/null +++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.9.redhat-1,Apache Software License 2.0.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core,jackson-databind,2.8.9.redhat-1,Apache Software License 2.0.txt \ No newline at end of file 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 index f86cf960ec..30dfc17586 100644 --- 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 @@ -26,55 +26,66 @@ com.fasterxml.jackson.core jackson-annotations - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-core - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.core jackson-databind - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.5.4/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.9/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.5.4.redhat-1 + 2.8.9.redhat-1 Apache Software License 2.0 - https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.5.4/json/src/main/resources/META-INF/LICENSE + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.8.9.redhat-1 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.9/json/src/main/resources/META-INF/LICENSE @@ -103,7 +114,7 @@ org.apache.httpcomponents httpclient - 4.5.0.redhat-1 + 4.5.2.redhat-1 Apache Software License 2.0 @@ -114,7 +125,7 @@ org.apache.httpcomponents httpcore - 4.4.1.redhat-1 + 4.4.4.redhat-1 Apache Software License 2.0 @@ -125,7 +136,7 @@ org.jboss.logging jboss-logging - 3.3.0.Final-redhat-1 + 3.3.1.Final-redhat-1 Apache Software License 2.0 diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpclient,4.5.0.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpclient,4.5.2.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpclient,4.5.0.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpclient,4.5.2.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpcore,4.4.1.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpcore,4.4.4.redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpcore,4.4.1.redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.apache.httpcomponents,httpcore,4.4.4.redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.0.Final-redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt similarity index 100% rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.0.Final-redhat-1,Apache Software License 2.0.txt rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt diff --git a/distribution/adapters/wildfly-adapter/assembly.xml b/distribution/adapters/wildfly-adapter/assembly.xml index 69b8728bfd..411e8cdeb8 100755 --- a/distribution/adapters/wildfly-adapter/assembly.xml +++ b/distribution/adapters/wildfly-adapter/assembly.xml @@ -39,7 +39,7 @@ false - docs/** + docs/schema/** README.md @@ -66,18 +66,6 @@ layers.conf - - - src/main/resources/licenses/${product.slot} - docs/licenses-${product.slot}-adapter - - licenses.xml - - - - target/licenses - docs/licenses-${product.slot}-adapter - diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml index 196c2eef31..c352d744c2 100644 --- a/distribution/adapters/wildfly-adapter/pom.xml +++ b/distribution/adapters/wildfly-adapter/pom.xml @@ -80,10 +80,6 @@ - - org.keycloak - keycloak-distribution-licenses-maven-plugin - diff --git a/distribution/feature-packs/adapter-feature-pack/assembly.xml b/distribution/feature-packs/adapter-feature-pack/assembly.xml index 9f9c962e22..e1e18e1ade 100644 --- a/distribution/feature-packs/adapter-feature-pack/assembly.xml +++ b/distribution/feature-packs/adapter-feature-pack/assembly.xml @@ -28,5 +28,18 @@ target/${project.build.finalName} + + + + src/main/resources/licenses/${product.slot} + content/docs/licenses-${product.slot} + + licenses.xml + + + + target/licenses + content/docs/licenses-${product.slot} + diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml index 89ca947faa..7b8b7dbcc4 100755 --- a/distribution/feature-packs/adapter-feature-pack/pom.xml +++ b/distribution/feature-packs/adapter-feature-pack/pom.xml @@ -31,39 +31,127 @@ pom + + org.keycloak + keycloak-core + + + * + * + + + + + org.keycloak + keycloak-common + + + * + * + + + + + org.keycloak + keycloak-adapter-core + + + * + * + + + + + org.keycloak + keycloak-jboss-adapter-core + + + * + * + + + org.keycloak keycloak-wildfly-subsystem + + + * + * + + org.keycloak keycloak-wildfly-adapter + + + * + * + + org.keycloak keycloak-wildfly-elytron-oidc-adapter + + + * + * + + org.keycloak keycloak-servlet-oauth-client + + + * + * + + org.keycloak keycloak-adapter-spi + + + * + * + + org.keycloak keycloak-undertow-adapter-spi + + + * + * + + org.keycloak keycloak-undertow-adapter + + + * + * + + org.keycloak keycloak-authz-client + + + * + * + + @@ -114,6 +202,10 @@ + + org.keycloak + keycloak-distribution-licenses-maven-plugin + diff --git a/distribution/adapters/wildfly-adapter/src/main/resources/licenses/keycloak/licenses.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/licenses/keycloak/licenses.xml similarity index 100% rename from distribution/adapters/wildfly-adapter/src/main/resources/licenses/keycloak/licenses.xml rename to distribution/feature-packs/adapter-feature-pack/src/main/resources/licenses/keycloak/licenses.xml diff --git a/distribution/adapters/wildfly-adapter/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml similarity index 100% rename from distribution/adapters/wildfly-adapter/src/main/resources/licenses/rh-sso/licenses.xml rename to distribution/feature-packs/adapter-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml 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 8921462162..45d1e5cf9a 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 @@ -67,17 +67,6 @@ - - com.google.code.guice - guice - 2.0 - - - Apache Software License 2.0 - https://raw.githubusercontent.com/google/guice/2.0/COPYING - - - org.codehaus.plexus plexus-classworlds @@ -485,6 +474,61 @@ + + org.kie + kie-api + 6.5.0.Final + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.kie + kie-ci + 6.5.0.Final + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.kie + kie-internal + 6.5.0.Final + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.drools + drools-compiler + 6.5.0.Final + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.drools + drools-core + 6.5.0.Final + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt + + + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.code.guice,guice,2.0,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-compiler,6.5.0.Final,Apache Software License 2.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.code.guice,guice,2.0,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-compiler,6.5.0.Final,Apache Software License 2.0.txt diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.code.guice,guice,2.0,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-core,6.5.0.Final,Apache Software License 2.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.code.guice,guice,2.0,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.drools,drools-core,6.5.0.Final,Apache Software License 2.0.txt diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt new file mode 120000 index 0000000000..5034766fa3 --- /dev/null +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-api,6.5.0.Final,Apache Software License 2.0.txt @@ -0,0 +1 @@ +OpenSans,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt new file mode 120000 index 0000000000..5034766fa3 --- /dev/null +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-ci,6.5.0.Final,Apache Software License 2.0.txt @@ -0,0 +1 @@ +OpenSans,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt new file mode 120000 index 0000000000..5034766fa3 --- /dev/null +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.kie,kie-internal,6.5.0.Final,Apache Software License 2.0.txt @@ -0,0 +1 @@ +OpenSans,Apache Software License 2.0.txt \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml index f73e4ebb5f..1464cad0c9 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml @@ -48,7 +48,7 @@ org.freemarker freemarker - 2.3.26.incubating-redhat-1 + 2.3.26.incubating-redhat-3 Apache Software License 2.0 @@ -67,17 +67,6 @@ - - com.google.code.guice - guice - 2.0 - - - Apache Software License 2.0 - https://raw.githubusercontent.com/google/guice/2.0/COPYING - - - org.codehaus.plexus plexus-classworlds @@ -485,6 +474,61 @@ + + org.kie + kie-api + 6.5.0.Final-redhat-17 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.kie + kie-ci + 6.5.0.Final-redhat-17 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.kie + kie-internal + 6.5.0.Final-redhat-17 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/droolsjbpm-knowledge/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.drools + drools-compiler + 6.5.0.Final-redhat-17 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt + + + + + org.drools + drools-core + 6.5.0.Final-redhat-17 + + + Apache Software License 2.0 + https://raw.githubusercontent.com/kiegroup/drools/6.5.0.Final/LICENSE-ASL-2.0.txt + + + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.23.redhat-3,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt similarity index 100% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.23.redhat-3,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt diff --git a/distribution/licenses-common/check-licenses.sh b/distribution/licenses-common/check-licenses.sh new file mode 100755 index 0000000000..beba47e2da --- /dev/null +++ b/distribution/licenses-common/check-licenses.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +MODULES=`readlink -f $1` +LICENSES=`readlink -f $2` + +for i in `find $MODULES -name '*.jar'`; do + if ( unzip -l $i | grep pom.properties &>/dev/null ); then + unzip -p $i '*/pom.properties' > /tmp/pom.properties + source /tmp/pom.properties &>/dev/null + + if [ ! -f $LICENSES/$groupId\,$artifactId\,$version,* ]; then + echo "Missing: " + echo "group: $groupId" + echo "artifcat: $artifactId" + echo "version: $version" + echo "---------------------" + fi + else + echo "Not Maven: $i" + echo "---------------------" + fi + + +done diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml index bae0714257..4756c8ffb8 100755 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml @@ -26,23 +26,11 @@ - ${project.build.directory}/unpacked + ${project.build.directory}/unpacked/modules - org/keycloak/keycloak-common/** - org/keycloak/keycloak-saml-core/** - org/keycloak/keycloak-saml-adapter-core/** - org/keycloak/keycloak-saml-core-public/** - org/keycloak/keycloak-saml-adapter-api-public/** - org/keycloak/keycloak-adapter-spi/** - org/keycloak/keycloak-jboss-adapter-core/** org/bouncycastle/** - org/keycloak/keycloak-saml-as7-adapter/** - org/keycloak/keycloak-saml-as7-subsystem/** - org/keycloak/keycloak-saml-adapter-subsystem/** + org/keycloak/keycloak-*/** - - **/*.war - modules diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml index 4acef09b9c..e392cd204f 100755 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/assembly.xml @@ -25,15 +25,19 @@ - ../../ - - License.html - - + src/main/resources/licenses/${product.slot} + licenses + + licenses.xml + + + + ${project.build.directory}/licenses + licenses ${project.build.directory}/modules - + modules diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml index a3005fb1a4..a06eb9b52c 100755 --- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml @@ -37,55 +37,142 @@ org.keycloak keycloak-common + + + * + * + + + + + org.keycloak + keycloak-saml-core-public + + + * + * + + org.keycloak keycloak-adapter-spi + + + * + * + + org.keycloak keycloak-as7-adapter-spi + + + * + * + + org.keycloak keycloak-saml-core - - - org.keycloak - keycloak-saml-adapter-api-public - provided + + + * + * + + org.keycloak keycloak-saml-adapter-core + + + * + * + + org.keycloak keycloak-saml-tomcat-adapter-core + + + * + * + + + + + org.keycloak + keycloak-saml-adapter-api-public + + + * + * + + org.keycloak keycloak-jboss-adapter-core + + + * + * + + org.keycloak keycloak-saml-as7-adapter + + + * + * + + org.keycloak keycloak-saml-as7-subsystem + + + * + * + + org.keycloak keycloak-tomcat-adapter-spi + + + * + * + + org.bouncycastle bcprov-jdk15on + + + * + * + + org.bouncycastle bcpkix-jdk15on + + + * + * + + @@ -192,6 +279,10 @@ + + org.keycloak + keycloak-distribution-licenses-maven-plugin + diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt similarity index 100% rename from distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt similarity index 100% rename from distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt rename to distribution/saml-adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml index ed1631740e..b3d48610ec 100755 --- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml @@ -26,36 +26,16 @@ - ${project.build.directory}/unpacked + ${project.build.directory}/unpacked/modules - org/keycloak/keycloak-common/** - org/keycloak/keycloak-saml-core/** - org/keycloak/keycloak-saml-adapter-core/** - org/keycloak/keycloak-saml-core-public/** - org/keycloak/keycloak-adapter-spi/** - org/keycloak/keycloak-saml-adapter-api-public/** - org/keycloak/keycloak-jboss-adapter-core/** org/bouncycastle/** - org/keycloak/keycloak-saml-as7-adapter/** - org/keycloak/keycloak-saml-as7-subsystem/** - org/keycloak/keycloak-saml-adapter-subsystem/** + org/keycloak/keycloak-*/** - - **/*.war - modules/system/add-ons/keycloak - - src/main/resources/licenses/${product.slot} - docs/licenses-${product.slot}-adapter - - licenses.xml - - - - target/licenses - docs/licenses-${product.slot}-adapter + ${project.build.directory}/unpacked/licenses + docs/licenses-${product.slot} diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml index 7c88834892..5dc893fdfd 100755 --- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml +++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml @@ -90,10 +90,6 @@ - - org.keycloak - keycloak-distribution-licenses-maven-plugin - diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt deleted file mode 120000 index 4cd18fadf0..0000000000 --- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.52.0.redhat-3,MIT License.txt +++ /dev/null @@ -1 +0,0 @@ -org.bouncycastle,bcpkix-jdk15on,1.52.0.redhat-3,MIT License.txt \ No newline at end of file diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml index 41ffac3755..9cb207e172 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml @@ -26,37 +26,15 @@ - ${project.build.directory}/unpacked + ${project.build.directory}/unpacked/modules - org/keycloak/keycloak-common/** - org/keycloak/keycloak-saml-core/** - org/keycloak/keycloak-saml-core-public/** - org/keycloak/keycloak-saml-adapter-core/** - org/keycloak/keycloak-saml-adapter-api-public/** - org/keycloak/keycloak-adapter-spi/** - org/keycloak/keycloak-jboss-adapter-core/** - org/keycloak/keycloak-saml-undertow-adapter/** - org/keycloak/keycloak-saml-wildfly-adapter/** - org/keycloak/keycloak-saml-wildfly-elytron-adapter/** - org/keycloak/keycloak-saml-wildfly-subsystem/** - org/keycloak/keycloak-saml-adapter-subsystem/** + **/** - - **/*.war - modules/system/add-ons/keycloak - - src/main/resources/licenses/${product.slot} - docs/licenses-${product.slot}-adapter - - licenses.xml - - - - target/licenses - docs/licenses-${product.slot}-adapter + ${project.build.directory}/unpacked/licenses + docs/licenses-${product.slot} diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml index 444665bb41..3fa2c87a2a 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml @@ -87,10 +87,6 @@ - - org.keycloak - keycloak-distribution-licenses-maven-plugin - diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml index 4acef09b9c..e392cd204f 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/assembly.xml @@ -25,15 +25,19 @@ - ../../ - - License.html - - + src/main/resources/licenses/${product.slot} + licenses + + licenses.xml + + + + ${project.build.directory}/licenses + licenses ${project.build.directory}/modules - + modules diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml index 2641f9cc10..a0b59bc125 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml @@ -37,46 +37,122 @@ org.keycloak keycloak-common + + + * + * + + org.keycloak keycloak-adapter-spi + + + * + * + + org.keycloak keycloak-undertow-adapter-spi + + + * + * + + org.keycloak keycloak-saml-core + + + * + * + + org.keycloak keycloak-saml-adapter-api-public + + + * + * + + org.keycloak keycloak-saml-adapter-core + + + * + * + + org.keycloak keycloak-jboss-adapter-core + + + * + * + + org.keycloak keycloak-saml-undertow-adapter + + + * + * + + + + + org.keycloak + keycloak-saml-core-public + + + * + * + + org.keycloak keycloak-saml-wildfly-adapter + + + * + * + + org.keycloak keycloak-saml-wildfly-elytron-adapter + + + * + * + + org.keycloak keycloak-saml-wildfly-subsystem + + + * + * + + @@ -183,7 +259,10 @@ - + + org.keycloak + keycloak-distribution-licenses-maven-plugin + diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/licenses/keycloak/licenses.xml similarity index 100% rename from distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml rename to distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/licenses/keycloak/licenses.xml diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/licenses/rh-sso/licenses.xml similarity index 100% rename from distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml rename to distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/licenses/rh-sso/licenses.xml