doc(mosaic): improved third-party list generation

eclipse · Mar 15, 2024 · e364bd4 · e364bd4
1 parent f7b24d7
commit e364bd4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 34 deletions.
diff --git 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,23 +47,23 @@ 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
 
 
 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
 
 
 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,31 +79,31 @@ 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/
 
 
 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/
 
 
 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
 
 
 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,47 +119,47 @@ 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
 
 
 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
 
 
 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
 
 
 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
 
 
 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
 
 
 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,63 +175,63 @@ 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
 
 
 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
 
 
 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
 
 
 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
 
 
 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
 
 
 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
@@ -629,16 +629,13 @@
                 <file>
                     <exists>LICENSE</exists>
                 </file>
-                <property>
-                    <name>parent.dir</name>
-                </property>
             </activation>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>license-maven-plugin</artifactId>
-                        <version>2.1.0</version>
+                        <version>2.4.0</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
@@ -654,7 +651,7 @@
                                     <sortArtifactByName>true</sortArtifactByName>
                                     <thirdPartyFilename>NOTICE-THIRD-PARTY.md</thirdPartyFilename>
                                     <fileTemplate>${parent.dir}/legal/templates/third-party-file.ftl</fileTemplate>
-                                    <licenseMerges>${parent.dir}/legal/templates/licenses-merges-file</licenseMerges>
+                                    <licenseMergesUrl>file:///${parent.dir}/legal/templates/licenses-merge-file</licenseMergesUrl>
                                     <missingFile>${parent.dir}/legal/templates/missing-licenses.properties</missingFile>
                                 </configuration>
                             </execution>
@@ -669,16 +666,13 @@
                 <file>
                     <missing>LICENSE</missing>
                 </file>
-                <property>
-                    <name>parent.dir</name>
-                </property>
             </activation>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>license-maven-plugin</artifactId>
-                        <version>2.1.0</version>
+                        <version>2.4.0</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
@@ -695,7 +689,7 @@
                                     <sortArtifactByName>true</sortArtifactByName>
                                     <thirdPartyFilename>NOTICE-THIRD-PARTY.md</thirdPartyFilename>
                                     <fileTemplate>${parent.dir}/legal/templates/third-party-file.ftl</fileTemplate>
-                                    <licenseMerges>${parent.dir}/legal/templates/licenses-merges-file</licenseMerges>
+                                    <licenseMergesUrl>file:///${parent.dir}/legal/templates/licenses-merge-file</licenseMergesUrl>
                                     <missingFile>${parent.dir}/legal/templates/missing-licenses.properties</missingFile>
                                 </configuration>
                             </execution>