Improve the NOTICE file for the binary distribution (#940)

* Uniformize the bundling of dependency licenses

* Add a line return to the main NOTICE file

* Add a NOTICE-binary file that concat all the notices for the binary distribution

* Remove the notices-binary director

* Add missing licenses related to the source release

Author: bchapuis

LICENSE

@@ -210,12 +210,14 @@
    distribution of this product is subject to the following
    additional license terms.
 
-       - FlatGeobuf, BSD-2-Clause license, see licenses/flatgeobuf.
-       - GeoPackage Java, MIT License, see licenses/geopackage-java.
-       - OSMPBF, MIT License, see licenses/osm-binary.
-       - OSM Test Data, Public domain, see licenses/osm-testdata.
-       - Mapbox Vector Tile, Creative Commons Public License, see licenses/vector-tile-spec.
-       - Palantir Streams, Apache License 2.0, see licenses/palantir-streams.
-       - Planetiler, Apache License 2.0, see licenses/planetiler.
-       - PMTiles, BSD-3-Clause license, see licenses/pmtiles.
-       - pyosmium, BSD 2-Clause "Simplified" License, see licenses/pyosmium.
+       - Externalsortinginjava, Public domain
+       - FlatGeobuf, BSD-2-Clause license
+       - GeoPackage Java, MIT License
+       - Hilbert Curves, Public domain
+       - OSMPBF, MIT License
+       - OSM Test Data, Public domain
+       - Mapbox Vector Tile, Creative Commons Public License
+       - Palantir Streams, Apache License 2.0
+       - Planetiler, Apache License 2.0
+       - PMTiles, BSD-3-Clause license
+       - pyosmium, BSD 2-Clause "Simplified" License

NOTICE

@@ -6,6 +6,7 @@ Copyright 2020-2022.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
 -----------------------------------------------------------------------
 
 This product contains code from Planetiler project

NOTICE-binary

@@ -29,7 +29,6 @@ limitations under the License.
       <outputDirectory>.</outputDirectory>
       <includes>
         <include>DISCLAIMER</include>
-        <include>NOTICE</include>
         <include>licenses/**</include>
         <include>licenses-binary/**</include>
         <include>notices/**</include>
@@ -81,6 +80,14 @@ limitations under the License.
       </includes>
     </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>../NOTICE-binary</source>
+      <outputDirectory>.</outputDirectory>
+      <destName>NOTICE</destName>
+      <fileMode>0644</fileMode>
+    </file>
+  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory>lib</outputDirectory>

baremaps-cli/src/assembly/bin.xml

@@ -31,7 +31,9 @@ This template is used to list the dependencies and their licenses at the end of
     <#return project.artifactId + "-" + project.version>
 </#function>
 
-   This product bundles the following dependencies:
+   Dependencies produced outside the ASF that is included in the
+   distribution of this product is subject to the following
+   additional license terms.
 
 <#if dependencyMap?size != 0>
     <#list dependencyMap as dependency>

baremaps-cli/src/license/bundle.ftl

@@ -0,0 +1 @@
+This code is in the public domain. You can take it, modify it, and use it in your commercial projects without attribution. We encourage you, however, to acknowledge this package whenever possible and to contribute your bug fixes and reports.

licenses/externalsortinginjava

@@ -0,0 +1 @@
+This code is in the public domain.