Some more fixes for issue22623

This commit is contained in:
Jean-Francois Denise 2023-08-24 10:03:19 +02:00 committed by Alexander Schwartz
parent c9f867eec6
commit 7aec0031b8
3 changed files with 16 additions and 36 deletions

View file

@ -270,6 +270,7 @@
<licensesConfigFile>${basedir}/target/resources/license/licenses.xml</licensesConfigFile> <licensesConfigFile>${basedir}/target/resources/license/licenses.xml</licensesConfigFile>
</licensesConfigFiles> </licensesConfigFiles>
<licensesOutputFile>${license.directory}/keycloak-saml-adapter-galleon-pack-licenses.xml</licensesOutputFile> <licensesOutputFile>${license.directory}/keycloak-saml-adapter-galleon-pack-licenses.xml</licensesOutputFile>
<excludedArtifacts>wildfly-common-ee-dependency-management|wildfly-ee-galleon-pack|wildfly-legacy-ee-bom|wildfly-standard-ee-bom\z</excludedArtifacts>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View file

@ -6,7 +6,7 @@
<artifactId>keycloak-adapter-spi</artifactId> <artifactId>keycloak-adapter-spi</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -16,7 +16,7 @@
<artifactId>keycloak-undertow-adapter-spi</artifactId> <artifactId>keycloak-undertow-adapter-spi</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -26,7 +26,7 @@
<artifactId>keycloak-common</artifactId> <artifactId>keycloak-common</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -36,7 +36,7 @@
<artifactId>keycloak-core</artifactId> <artifactId>keycloak-core</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -46,7 +46,7 @@
<artifactId>keycloak-crypto-default</artifactId> <artifactId>keycloak-crypto-default</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -56,7 +56,7 @@
<artifactId>keycloak-jboss-adapter-core</artifactId> <artifactId>keycloak-jboss-adapter-core</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -66,7 +66,7 @@
<artifactId>keycloak-saml-adapter-api-public</artifactId> <artifactId>keycloak-saml-adapter-api-public</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -76,7 +76,7 @@
<artifactId>keycloak-saml-adapter-core</artifactId> <artifactId>keycloak-saml-adapter-core</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -86,7 +86,7 @@
<artifactId>keycloak-saml-core</artifactId> <artifactId>keycloak-saml-core</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -96,7 +96,7 @@
<artifactId>keycloak-saml-core-public</artifactId> <artifactId>keycloak-saml-core-public</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
@ -106,27 +106,27 @@
<artifactId>keycloak-saml-undertow-adapter</artifactId> <artifactId>keycloak-saml-undertow-adapter</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-elytron-adapter</artifactId> <artifactId>keycloak-saml-wildfly-elytron-jakarta-adapter</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-subsystem</artifactId> <artifactId>keycloak-saml-wildfly-jakarta-subsystem</artifactId>
<licenses> <licenses>
<license> <license>
<name>Apache Software License 2.0</name> <name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url> <url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license> </license>
</licenses> </licenses>

View file

@ -1,21 +0,0 @@
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.