From 4ff16ea2cb25590a02e66975b9222ae3d75b86d9 Mon Sep 17 00:00:00 2001 From: Farah Juma Date: Tue, 22 Aug 2023 13:41:46 -0400 Subject: [PATCH] Ensure the SAML Galleon feature pack generates an appropriate licenses file Closes https://github.com/keycloak/keycloak/issues/22623 (cherry picked from commit c9f867eec600d9aa24b06aca4cbab2eefa074f7c) --- .../saml-adapter-galleon-pack/pom.xml | 27 +++++- .../standalone/keycloak-saml/layer-spec.xml | 3 + .../keycloak => license}/licenses.xml | 0 .../content/docs/licenses/licenses.xsl | 97 +++++++++++++++++++ .../content/docs/licenses/mit.txt | 21 ++++ .../packages/docs.licenses/package.xml | 4 + .../docs.licenses/pm/wildfly/tasks.xml | 12 +++ .../resources/packages/licenses/package.xml | 4 - .../wildfly-feature-pack-build.xml | 1 - 9 files changed, 160 insertions(+), 9 deletions(-) rename distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/{licenses/keycloak => license}/licenses.xml (100%) create mode 100644 distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/licenses.xsl create mode 100644 distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/mit.txt create mode 100644 distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/package.xml create mode 100644 distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/pm/wildfly/tasks.xml delete mode 100644 distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/licenses/package.xml diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml index e2fe7d13249..344c966fd75 100644 --- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml @@ -33,8 +33,8 @@ ${basedir}/../../saml-adapters/wildfly-adapter/wildfly-jakarta-modules/src/main/resources 6.4.0.Final - ${basedir}/src/main/resources/licenses/keycloak/licenses.xml - ${basedir}/target/resources/packages/licenses/content/docs/licenses-keycloak + 2.3.1.Final + ${project.build.directory}/resources/packages/docs.licenses/content/docs/licenses @@ -252,8 +252,27 @@ - org.keycloak - keycloak-distribution-licenses-maven-plugin + org.wildfly.maven.plugins + licenses-plugin + ${version.org.wildfly.maven.plugins.licenses-plugin} + false + + + update-licenses-xml + + insert-versions + + process-resources + + true + true + + ${basedir}/target/resources/license/licenses.xml + + ${license.directory}/keycloak-saml-adapter-galleon-pack-licenses.xml + + + diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-saml/layer-spec.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-saml/layer-spec.xml index 4de96d950d5..1d869f320b5 100644 --- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-saml/layer-spec.xml +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-saml/layer-spec.xml @@ -6,4 +6,7 @@ + + + \ No newline at end of file diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/licenses/keycloak/licenses.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/license/licenses.xml similarity index 100% rename from distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/licenses/keycloak/licenses.xml rename to distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/license/licenses.xml diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/licenses.xsl b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/licenses.xsl new file mode 100644 index 00000000000..fc4aff49582 --- /dev/null +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/licenses.xsl @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + +

+

The following material has been provided for informational purposes only, and should not be relied upon or construed as a legal opinion or legal advice.

+ + + + + + + + + + + + + + + + + + + + + + + +
Package GroupPackage ArtifactPackage VersionRemote LicensesLocal Licenses
+ + + +
+
+ +
+
+
+
+
+ + + + + + +
+
+
+ + +
+ + + + + + bsd 2-clause simplified license.html + + + bsd 3-clause new or revised license.html + + + creative commons attribution 2.5.html + + + fsf all permissive license.html + + + indiana university extreme lab software license 1.1.1.html + + + mit-0.html + + + mozilla public license 2.0.html + + + + + + +
diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/mit.txt b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/mit.txt new file mode 100644 index 00000000000..056140b6dd8 --- /dev/null +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/content/docs/licenses/mit.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) ${license.git.copyrightYears} The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors + +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/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/package.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/package.xml new file mode 100644 index 00000000000..27179201652 --- /dev/null +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/package.xml @@ -0,0 +1,4 @@ + + + + diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/pm/wildfly/tasks.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/pm/wildfly/tasks.xml new file mode 100644 index 00000000000..88bfe3d1351 --- /dev/null +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/docs.licenses/pm/wildfly/tasks.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/licenses/package.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/licenses/package.xml deleted file mode 100644 index 9c0660065ea..00000000000 --- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/src/main/resources/packages/licenses/package.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build.xml index e5f03489e2e..52cde85cd89 100644 --- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build.xml +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build.xml @@ -26,7 +26,6 @@ -