From 8419898001896baf0fed546261562275d61134e0 Mon Sep 17 00:00:00 2001 From: Bartosz Spyrko-Smietanko Date: Wed, 25 Oct 2023 15:48:37 +0100 Subject: [PATCH 1/2] Correct license names in generated licenses.xml --- dist/common/src/main/licenses/licenses.xml | 472 ++++++++++++++++++++- 1 file changed, 470 insertions(+), 2 deletions(-) diff --git a/dist/common/src/main/licenses/licenses.xml b/dist/common/src/main/licenses/licenses.xml index 03dc9d1fa..fd7d4a5b2 100644 --- a/dist/common/src/main/licenses/licenses.xml +++ b/dist/common/src/main/licenses/licenses.xml @@ -1,17 +1,430 @@ + + com.fasterxml.jackson.core + jackson-annotations + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + com.fasterxml.jackson.core + jackson-core + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + com.fasterxml.jackson.core + jackson-databind + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + com.networknt + json-schema-validator + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + commons-codec + commons-codec + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + commons-io + commons-io + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + info.picocli + picocli + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.commons + commons-lang3 + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.commons + commons-text + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.httpcomponents + httpclient + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.httpcomponents + httpcore + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven + maven-artifact + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven + maven-builder-support + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven + maven-model + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven + maven-model-builder + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven + maven-repository-metadata + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven + maven-resolver-provider + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-api + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-connector-basic + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-impl + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-named-locks + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-spi + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-transport-file + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-transport-http + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.apache.maven.resolver + maven-resolver-util + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.codehaus.plexus + plexus-interpolation + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.codehaus.plexus + plexus-utils + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.eclipse.jgit + org.eclipse.jgit + + + Eclipse Distribution License, Version 1.0 + http://repository.jboss.org/licenses/edl-1.0.txt + repo + + + org.jboss staxmapper - GNU Lesser General Public License v2.1 or later - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 repo + + org.jboss.galleon + galleon-core + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.jboss.galleon + galleon-maven-universe + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.jboss.logging + jboss-logging + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.jboss.logmanager + jboss-logmanager + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.jboss.modules + jboss-modules + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + Indiana University Extreme! Lab Software License 1.1.1 + https://enterprise.dejacode.com/licenses/public/indiana-extreme/?_list_filters=q%3Dindiana%2Bextreme#license-text + repo + + + + + org.jboss.slf4j + slf4j-jboss-logmanager + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.slf4j + jcl-over-slf4j + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.slf4j + slf4j-api + + + MIT License + http://www.opensource.org/licenses/MIT + repo + + + + org.wildfly.channel channel-core @@ -34,6 +447,50 @@ + + org.wildfly.common + wildfly-common + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.wildfly.galleon-plugins + wildfly-config-gen + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.wildfly.galleon-plugins + wildfly-galleon-plugins + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + org.wildfly.installation-manager + installation-manager-api + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + org.wildfly.prospero prospero-cli @@ -89,5 +546,16 @@ + + org.yaml + snakeyaml + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + From f70aff580243c3729053857a8c2c0fb31c4c356e Mon Sep 17 00:00:00 2001 From: Bartosz Spyrko-Smietanko Date: Wed, 25 Oct 2023 17:52:17 +0100 Subject: [PATCH 2/2] Exclude galleon pack from licenses plugin --- dist/wildfly-galleon-pack/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dist/wildfly-galleon-pack/pom.xml b/dist/wildfly-galleon-pack/pom.xml index 6169665c7..214b7a346 100644 --- a/dist/wildfly-galleon-pack/pom.xml +++ b/dist/wildfly-galleon-pack/pom.xml @@ -21,6 +21,12 @@ ${prospero.base.feature-pack.groupId} ${prospero.base.feature-pack.artifactId} zip + + + * + * + + @@ -414,7 +420,7 @@ ${project.build.directory}/resources/packages/docs.licenses/content/docs/licenses/${prospero.dist.name}-feature-pack-licenses.xml org.prospero - prospero-dist-common + prospero-dist-common|wildfly-ee-galleon-pack