From e364bd47f0bccad815207b9e7c5ad32395b6b4a4 Mon Sep 17 00:00:00 2001 From: Karl Schrab Date: Fri, 15 Mar 2024 18:00:42 +0100 Subject: [PATCH] doc(mosaic): improved third-party list generation --- NOTICE-THIRD-PARTY.md | 48 +++++++++++++++++++++---------------------- pom.xml | 14 ++++--------- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/NOTICE-THIRD-PARTY.md b/NOTICE-THIRD-PARTY.md index 802f081e3..080639cb8 100644 --- a/NOTICE-THIRD-PARTY.md +++ b/NOTICE-THIRD-PARTY.md @@ -15,7 +15,7 @@ Apache Commons CLI (1.6.0) Apache Commons Configuration (2.5) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `org.apache.commons:commons-configuration2:2.5` * Project: http://commons.apache.org/proper/commons-configuration/ * Source: https://gitbox.apache.org/repos/asf?p=commons-configuration @@ -47,7 +47,7 @@ Apache Commons Logging (1.3.0) Apache Commons Math (3.6.1) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `org.apache.commons:commons-math3:3.6.1` * Project: http://commons.apache.org/proper/commons-math/ * Source: https://git-wip-us.apache.org/repos/asf?p=commons-math @@ -55,7 +55,7 @@ Apache Commons Math (3.6.1) Apache Commons Text (1.6) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `org.apache.commons:commons-text:1.6` * Project: http://commons.apache.org/proper/commons-text * Source: https://git-wip-us.apache.org/repos/asf?p=commons-text @@ -63,7 +63,7 @@ Apache Commons Text (1.6) Commons JXPath (1.3) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `commons-jxpath:commons-jxpath:1.3` * Project: http://commons.apache.org/jxpath/ * Source: https://svn.apache.org/repos/asf/commons/proper/jxpath/trunk @@ -79,7 +79,7 @@ commons-compiler (3.1.11) Findbugs Annotations under Apache License (1.3.9-1) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1` * Project: http://stephenc.github.com/findbugs-annotations * Source: https://github.com/stephenc/findbugs-annotations/tree/master/ @@ -87,7 +87,7 @@ Findbugs Annotations under Apache License (1.3.9-1) FindBugs-jsr305 (3.0.2) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.google.code.findbugs:jsr305:3.0.2` * Project: http://findbugs.sourceforge.net/ * Source: https://code.google.com/p/jsr-305/ @@ -95,7 +95,7 @@ FindBugs-jsr305 (3.0.2) GraphHopper API (0.13.0) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.graphhopper:graphhopper-api:0.13.0` * Project: https://www.graphhopper.com/graphhopper-api * Source: https://github.com/graphhopper/graphhopper/graphhopper-api @@ -103,7 +103,7 @@ GraphHopper API (0.13.0) GraphHopper Core (0.13.0) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.graphhopper:graphhopper-core:0.13.0` * Project: https://www.graphhopper.com/graphhopper-core * Source: https://github.com/graphhopper/graphhopper/graphhopper-core @@ -119,7 +119,7 @@ Gson (2.10.1) Guava: Google Core Libraries for Java (32.1.1-jre) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.google.guava:guava:32.1.1-jre` * Project: https://github.com/google/guava * Source: https://github.com/google/guava/guava @@ -127,7 +127,7 @@ Guava: Google Core Libraries for Java (32.1.1-jre) HPPC Collections (0.8.1) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.carrotsearch:hppc:0.8.1` * Project: http://labs.carrotsearch.com/hppc.html/hppc * Source: https://github.com/carrotsearch/hppc/hppc @@ -135,7 +135,7 @@ HPPC Collections (0.8.1) Internet Time Utility (1.8.0) - * License: Apache License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.ethlo.time:itu:1.8.0` * Project: https://github.com/ethlo/itu * Source: https://github.com/ethlo/itu @@ -143,7 +143,7 @@ Internet Time Utility (1.8.0) Jackson-annotations (2.16.1) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.fasterxml.jackson.core:jackson-annotations:2.16.1` * Project: https://github.com/FasterXML/jackson * Source: https://github.com/FasterXML/jackson-annotations @@ -151,7 +151,7 @@ Jackson-annotations (2.16.1) Jackson-core (2.16.1) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.fasterxml.jackson.core:jackson-core:2.16.1` * Project: https://github.com/FasterXML/jackson-core * Source: https://github.com/FasterXML/jackson-core @@ -159,7 +159,7 @@ Jackson-core (2.16.1) jackson-databind (2.16.1) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.fasterxml.jackson.core:jackson-databind:2.16.1` * Project: https://github.com/FasterXML/jackson * Source: https://github.com/FasterXML/jackson-databind @@ -175,7 +175,7 @@ janino (3.1.11) Java-WebSocket (1.3.9) - * License: MIT License + * License: MIT * Maven artifact: `org.java-websocket:Java-WebSocket:1.3.9` * Project: https://github.com/TooTallNate/Java-WebSocket * Source: https://github.com/TooTallNate/Java-WebSocket @@ -183,7 +183,7 @@ Java-WebSocket (1.3.9) JSch (0.2.16) - * License: ISC, Revised BSD + * License: BSD-3-Clause, ISC * Maven artifact: `com.github.mwiede:jsch:0.2.16` * Project: https://github.com/mwiede/jsch * Source: https://github.com/mwiede/jsch @@ -191,7 +191,7 @@ JSch (0.2.16) JsonSchemaValidator (1.3.1) - * License: Apache License Version 2.0 + * License: Apache-2.0 * Maven artifact: `com.networknt:json-schema-validator:1.3.1` * Project: https://github.com/networknt/json-schema-validator * Source: https://github.com/networknt/json-schema-validator @@ -199,7 +199,7 @@ JsonSchemaValidator (1.3.1) Logback Classic Module (1.5.0) - * License: Eclipse Public License - v 1.0, GNU Lesser General Public License + * License: EPL-1.0, LGPL-2.1 * Maven artifact: `ch.qos.logback:logback-classic:1.5.0` * Project: http://logback.qos.ch/logback-classic * Source: https://github.com/qos-ch/logback/logback-classic @@ -207,23 +207,23 @@ Logback Classic Module (1.5.0) Logback Core Module (1.5.0) - * License: Eclipse Public License - v 1.0, GNU Lesser General Public License + * License: EPL-1.0, LGPL-2.1 * Maven artifact: `ch.qos.logback:logback-core:1.5.0` * Project: http://logback.qos.ch/logback-core * Source: https://github.com/qos-ch/logback/logback-core -Protocol Buffers [Core] (3.8.0) +Protocol Buffers [Core] (3.23.2) - * License: 3-Clause BSD License - * Maven artifact: `com.google.protobuf:protobuf-java:3.8.0` + * License: BSD-3-Clause + * Maven artifact: `com.google.protobuf:protobuf-java:3.23.2` * Project: https://developers.google.com/protocol-buffers/protobuf-java/ * Source: https://github.com/protocolbuffers/protobuf/protobuf-java SLF4J API Module (2.0.12) - * License: MIT License + * License: MIT * Maven artifact: `org.slf4j:slf4j-api:2.0.12` * Project: http://www.slf4j.org * Source: https://github.com/qos-ch/slf4j/slf4j-parent/slf4j-api @@ -231,7 +231,7 @@ SLF4J API Module (2.0.12) SQLite JDBC (3.42.0.0) - * License: The Apache Software License, Version 2.0 + * License: Apache-2.0 * Maven artifact: `org.xerial:sqlite-jdbc:3.42.0.0` * Project: https://github.com/xerial/sqlite-jdbc * Source: https://github.com/xerial/sqlite-jdbc diff --git a/pom.xml b/pom.xml index 1cdc49b08..41a2c845c 100644 --- a/pom.xml +++ b/pom.xml @@ -629,16 +629,13 @@ LICENSE - - parent.dir - org.codehaus.mojo license-maven-plugin - 2.1.0 + 2.4.0 false @@ -654,7 +651,7 @@ true NOTICE-THIRD-PARTY.md ${parent.dir}/legal/templates/third-party-file.ftl - ${parent.dir}/legal/templates/licenses-merges-file + file:///${parent.dir}/legal/templates/licenses-merge-file ${parent.dir}/legal/templates/missing-licenses.properties @@ -669,16 +666,13 @@ LICENSE - - parent.dir - org.codehaus.mojo license-maven-plugin - 2.1.0 + 2.4.0 false @@ -695,7 +689,7 @@ true NOTICE-THIRD-PARTY.md ${parent.dir}/legal/templates/third-party-file.ftl - ${parent.dir}/legal/templates/licenses-merges-file + file:///${parent.dir}/legal/templates/licenses-merge-file ${parent.dir}/legal/templates/missing-licenses.properties