Release Baremaps 0.8.1

- Removed unlicensed file - Add missing license header - Update the LICENSE and NOTICE files - Add directory for third party licensex
apache · Nov 24, 2024 · ee38d7f · ee38d7f
1 parent 8c6efc4
commit ee38d7f
Show file tree

Hide file tree

Showing 45 changed files with 1,245 additions and 118 deletions.
diff --git a/DISCLAIMER b/DISCLAIMER
@@ -0,0 +1,6 @@
+Apache Baremaps is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects
+until a further review indicates that the infrastructure, communications, and decision-making
+process have stabilized in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/LICENSE b/LICENSE
@@ -208,14 +208,14 @@
 
    Code and data produced outside the ASF that is included in the
    distribution of this product is subject to the following
-   additional license terms:
-
-       - FlatGeobuf, BSD-2-Clause license
-       - GeoPackage Java, MIT License
-       - 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
+   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.
diff --git a/NOTICE b/NOTICE
@@ -7,69 +7,80 @@ Copyright 2020-2022.
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes test data copied from FlatGeobuf.
+This product includes code and test data copied from FlatGeobuf.
 BSD-2-Clause license.
 Please visit the following URL for the full text of the FlatGeobuf license:
 https://github.com/flatgeobuf/flatgeobuf/
 The copied files are located in:
-- baremaps-core/src/test/resources/data/
+- baremaps-flatgeobuf/src/main/fbs/features.fbs
+- baremaps-flatgeobuf/src/main/fbs/header.fbs
+- baremaps-testing/data/samples/counties.fgb
 
 This product includes test data copied from GeoPackage Java.
 MIT License.
 Please visit the following URL for the full text of the GeoPackage Java license:
 https://github.com/ngageoint/geopackage-java/
 The copied files are located in:
-- baremaps-core/src/test/resources/data/
+- baremaps-testing/data/samples/counties.gpkg
+- baremaps-testing/data/samples/data.gpkg
 
 This product includes protocol buffers definitions derived from OSMPBF.
 MIT License.
 Please visit the following URLs for the licensing information:
 - https://github.com/openstreetmap/OSM-binary/issues/18
 - https://github.com/openstreetmap/OSM-binary/pull/35
 The derived files are:
-- baremaps-core/src/main/proto/osmformat.proto
-- baremaps-core/src/main/proto/fileformat.proto
+- baremaps-openstreetmap/src/main/proto/fileformat.proto
+- baremaps-openstreetmap/src/main/proto/osmformat.proto
 
 This product includes test data copied from OSM Test Data.
 Public domain.
 Please visit the following URL for the full text of the OSM Test Data license:
 https://github.com/osmcode/osm-testdata?tab=readme-ov-file#license
 The copied files are located in:
-- baremaps-core/src/test/resources/osm-testdata/
+- baremaps-testing/data/osm-testdata/
 
 This product includes protocol buffers definitions derived from Mapbox Vector Tile.
 Creative Commons Public License.
 Please visit the following URL for the licensing information:
 - https://github.com/mapbox/vector-tile-spec/blob/master/LICENSE
 The derived files are:
-- baremaps-core/src/main/proto/vector_tile.proto
+- baremaps-maplibre/src/main/proto/vector_tile.proto
 
 This product includes code derived from Palantir Streams.
 Apache License 2.0.
 Please visit the following URL for the full text of the Palantir license:
 https://github.com/palantir/streams/blob/develop/LICENSE
 The derived files are:
-- baremaps-core/src/main/java/org/apache/baremaps/stream/BufferedSpliterator.java
+- baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/stream/BufferedSpliterator.java
+
+This product includes code derived from PgBulkInsert.
+MIT License.
+Please visit the following URL for the full text of the PgBulkInsert license:
+https://github.com/PgBulkInsert/PgBulkInsert/blob/master/LICENSE
+The derived files are:
+- baremaps-postgres/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java
 
 This product includes code derived from Planetiler.
 Apache License 2.0.
 Please visit the following URL for the full text of the Planetiler license:
 https://github.com/onthegomap/planetiler/blob/main/LICENSE
 The derived files are:
-- baremaps-core/src/main/java/org/apache/baremaps/database/collection/MemoryAlignedDataMap.java
-- baremaps-core/src/main/java/org/apache/baremaps/database/collection/MonotonicDataMap.java
-- baremaps-core/src/main/java/org/apache/baremaps/database/collection/MonotonicFixedSizeDataMap.java
+- baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java
+- baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java
+- baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java
+- baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedSizeDataMap.java
 
 This product includes test data copied from PMTiles.
 BSD-3-Clause license.
 Please visit the following URL for the full text of the PMTiles license:
 https://github.com/protomaps/PMTiles
 The copied files are located in:
-- baremaps-core/src/test/resources/pmtiles/
+- baremaps-testing/data/pmtiles/
 
 This product includes code derived from pyosmium.
 BSD 2-Clause "Simplified" License.
 Please visit the following URL for the full text of the pyosmium license:
 https://github.com/osmcode/pyosmium/blob/master/LICENSE.TXT
 The derived files are:
-- baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java
+- baremaps-openstreetmap/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java
diff --git a/baremaps-benchmarking/pom.xml b/baremaps-benchmarking/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.baremaps</groupId>
     <artifactId>baremaps</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.8.1</version>
   </parent>
 
   <artifactId>baremaps-benchmarking</artifactId>

diff --git a/baremaps-cli/pom.xml b/baremaps-cli/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.baremaps</groupId>
     <artifactId>baremaps</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.8.1</version>
   </parent>
 
   <artifactId>baremaps-cli</artifactId>

diff --git a/baremaps-cli/src/assembly/bin.xml b/baremaps-cli/src/assembly/bin.xml
@@ -28,8 +28,9 @@ limitations under the License.
       <directory>../.</directory>
       <outputDirectory>.</outputDirectory>
       <includes>
-        <include>DISCLAIMER-WIP</include>
+        <include>DISCLAIMER</include>
         <include>NOTICE</include>
+        <include>licenses/**</include>
       </includes>
       <lineEnding>unix</lineEnding>
     </fileSet>

diff --git a/baremaps-cli/src/assembly/src.xml b/baremaps-cli/src/assembly/src.xml
@@ -32,6 +32,7 @@ limitations under the License.
                 <include>**/src/**/*</include>
                 <include>baremaps-testing/data/**</include>
                 <include>codestyle.xml</include>
+                <include>DISCLAIMER</include>
                 <include>LICENSE.header</include>
                 <include>NOTICE</include>
             </includes>
@@ -46,6 +47,7 @@ limitations under the License.
                 <include>.asf.yaml</include>
                 <include>CONTRIBUTING.md</include>
                 <include>LICENSE</include>
+                <include>licenses/**</include>
                 <include>examples/**</include>
                 <include>.gitignore</include>
                 <include>RELEASE.md</include>

diff --git a/baremaps-cli/src/license/override.properties b/baremaps-cli/src/license/override.properties
@@ -122,8 +122,9 @@ io.sgr--s2-geometry-library-java--1.0.0=Apache License 2.0
 it.unimi.dsi--fastutil--8.5.14=Apache License 2.0
 jakarta.activation--jakarta.activation-api--1.2.1=Eclipse Distribution License 1.0
 jakarta.transaction--jakarta.transaction-api--1.3.3=Eclipse Public License 2.0; GPL2 w/ CPE
-jakarta.xml.bind--jakarta.xml.bind-api--2.3.2=Eclipse Distribution License 1.0
+jakarta.xml.bind--jakarta.xml.bind-api--4.0.1=Eclipse Distribution License 1.0
 javax.annotation--javax.annotation-api--1.3.2=CDDL; GPL2 w/ CPE
+javax.measure--unit-api--2.1.3=BSD 3-Clause License
 javax.servlet--javax.servlet-api--3.1.0=CDDL; GPL2 w/ CPE
 javax.servlet.jsp--jsp-api--2.1=CDDL; GPL2 w/ CPE
 javax.ws.rs--jsr311-api--1.1.1=CDDL License
@@ -146,22 +147,29 @@ net.minidev--json-smart--2.5.0=Apache License 2.0
 net.ripe.ipresource--ipresource--1.52=BSD License
 org.antlr--antlr4-runtime--4.11.1=BSD 3-Clause License
 org.apache.avro--avro--1.9.2=Apache License 2.0
-org.apache.baremaps--baremaps-core--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-data--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-flatgeobuf--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-geoparquet--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-maplibre--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-openstreetmap--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-pmtiles--0.7.4-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-server--0.7.4-SNAPSHOT=Apache License 2.0
+org.apache.baremaps--baremaps-core--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-csv--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-data--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-dem--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-flatgeobuf--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-geopackage--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-geoparquet--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-maplibre--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-openstreetmap--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-pmtiles--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-postgres--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-rpsl--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-server--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-shapefile--0.8.1=Apache License 2.0
+org.apache.baremaps--baremaps-store--0.8.1=Apache License 2.0
 org.apache.calcite--calcite-core--1.37.0=Apache License 2.0
 org.apache.calcite--calcite-linq4j--1.37.0=Apache License 2.0
 org.apache.calcite.avatica--avatica-core--1.25.0=Apache License 2.0
 org.apache.calcite.avatica--avatica-metrics--1.25.0=Apache License 2.0
 org.apache.commons--commons-compress--1.27.1=Apache License 2.0
 org.apache.commons--commons-configuration2--2.8.0=Apache License 2.0
 org.apache.commons--commons-dbcp2--2.11.0=Apache License 2.0
-org.apache.commons--commons-lang3--3.1=Apache License 2.0
+org.apache.commons--commons-lang3--3.16.0=Apache License 2.0
 org.apache.commons--commons-math3--3.6.1=Apache License 2.0
 org.apache.commons--commons-pool2--2.12.0=Apache License 2.0
 org.apache.commons--commons-text--1.11.0=Apache License 2.0
@@ -221,6 +229,13 @@ org.apache.parquet--parquet-encoding--1.14.2=Apache License 2.0
 org.apache.parquet--parquet-format-structures--1.14.2=Apache License 2.0
 org.apache.parquet--parquet-hadoop--1.14.2=Apache License 2.0
 org.apache.parquet--parquet-jackson--1.14.2=Apache License 2.0
+org.apache.sis.core--sis-feature--1.4=Apache License 2.0
+org.apache.sis.core--sis-metadata--1.4=Apache License 2.0
+org.apache.sis.core--sis-referencing--1.4=Apache License 2.0
+org.apache.sis.core--sis-utility--1.4=Apache License 2.0
+org.apache.sis.storage--sis-geotiff--1.4=Apache License 2.0
+org.apache.sis.storage--sis-sqlstore--1.4=Apache License 2.0
+org.apache.sis.storage--sis-storage--1.4=Apache License 2.0
 org.apache.yetus--audience-annotations--0.12.0=Apache License 2.0
 org.apache.zookeeper--zookeeper--3.8.3=Apache License 2.0
 org.apache.zookeeper--zookeeper-jute--3.8.3=Apache License 2.0
@@ -254,6 +269,7 @@ org.locationtech.jts--jts-core--1.20.0=Eclipse Distribution License 1.0
 org.locationtech.jts.io--jts-io-common--1.20.0=Eclipse Distribution License 1.0
 org.locationtech.proj4j--proj4j--1.3.0=Apache License 2.0
 org.locationtech.spatial4j--spatial4j--0.8=Apache License 2.0
+org.opengis--geoapi--3.0.2=OGC copyright
 org.ow2.asm--asm--7.2=BSD 3-Clause License
 org.ow2.asm--asm-analysis--7.2=BSD 3-Clause License
 org.ow2.asm--asm-commons--7.2=BSD 3-Clause License
@@ -262,12 +278,42 @@ org.postgresql--postgresql--42.7.4=BSD 2-Clause License
 org.reactivestreams--reactive-streams--1.0.4=MIT License
 org.roaringbitmap--RoaringBitmap--1.2.1=Apache License 2.0
 org.slf4j--slf4j-api--2.0.16=MIT License
-org.slf4j--slf4j-nop--2.0.12=MIT License
 org.slf4j--slf4j-reload4j--1.7.36=MIT License
 org.wildfly.openssl--wildfly-openssl--1.1.3.Final=Apache License 2.0
 org.xerial--sqlite-jdbc--3.46.1.0=Apache License 2.0
 org.xerial.snappy--snappy-java--1.1.10.4=Apache License 2.0
 org.xerial.thirdparty--nestedvm--1.0=Apache License 2.0
 org.yaml--snakeyaml--2.2=Apache License 2.0
-software.amazon.awssdk--bundle--2.23.19=Apache License 2.0
+software.amazon.awssdk--annotations--2.27.17=Apache License 2.0
+software.amazon.awssdk--apache-client--2.27.17=Apache License 2.0
+software.amazon.awssdk--arns--2.27.17=Apache License 2.0
+software.amazon.awssdk--auth--2.27.17=Apache License 2.0
+software.amazon.awssdk--aws-core--2.27.17=Apache License 2.0
+software.amazon.awssdk--aws-query-protocol--2.27.17=Apache License 2.0
+software.amazon.awssdk--aws-xml-protocol--2.27.17=Apache License 2.0
+software.amazon.awssdk--checksums--2.27.17=Apache License 2.0
+software.amazon.awssdk--checksums-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--crt-core--2.27.17=Apache License 2.0
+software.amazon.awssdk--endpoints-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--http-auth--2.27.17=Apache License 2.0
+software.amazon.awssdk--http-auth-aws--2.27.17=Apache License 2.0
+software.amazon.awssdk--http-auth-aws-eventstream--2.27.17=Apache License 2.0
+software.amazon.awssdk--http-auth-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--http-client-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--identity-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--json-utils--2.27.17=Apache License 2.0
+software.amazon.awssdk--metrics-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--netty-nio-client--2.27.17=Apache License 2.0
+software.amazon.awssdk--profiles--2.27.17=Apache License 2.0
+software.amazon.awssdk--protocol-core--2.27.17=Apache License 2.0
+software.amazon.awssdk--regions--2.27.17=Apache License 2.0
+software.amazon.awssdk--retries--2.27.17=Apache License 2.0
+software.amazon.awssdk--retries-spi--2.27.17=Apache License 2.0
+software.amazon.awssdk--s3--2.27.17=Apache License 2.0
+software.amazon.awssdk--s3-transfer-manager--2.27.17=Apache License 2.0
+software.amazon.awssdk--sdk-core--2.27.17=Apache License 2.0
+software.amazon.awssdk--third-party-jackson-core--2.27.17=Apache License 2.0
+software.amazon.awssdk--utils--2.27.17=Apache License 2.0
+software.amazon.eventstream--eventstream--1.0.1=Apache License 2.0
+
 
diff --git a/baremaps-core/pom.xml b/baremaps-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.baremaps</groupId>
     <artifactId>baremaps</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.8.1</version>
   </parent>
 
   <artifactId>baremaps-core</artifactId>

diff --git a/baremaps-csv/pom.xml b/baremaps-csv/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.baremaps</groupId>
     <artifactId>baremaps</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.8.1</version>
   </parent>
 
   <artifactId>baremaps-csv</artifactId>

diff --git a/baremaps-data/pom.xml b/baremaps-data/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.baremaps</groupId>
     <artifactId>baremaps</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.8.1</version>
   </parent>
   <artifactId>baremaps-data</artifactId>
   <dependencies>

diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MemoryAlignedDataMap.java
@@ -1,12 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicDataMap.java
@@ -1,12 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/...aps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java b/...aps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicFixedSizeDataMap.java
@@ -1,12 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedDataMap.java b/baremaps-data/src/main/java/org/apache/baremaps/data/collection/MonotonicPairedDataMap.java
@@ -29,6 +29,12 @@
  * A {@link DataMap} that can hold a large number of variable-size data elements. The elements must
  * be sorted by their key and inserted in a monotonic way. The elements cannot be removed or updated
  * once inserted.
+ *
+ * <p>
+ * This code has been adapted from Planetiler (Apache license).
+ *
+ * <p>
+ * Copyright (c) Planetiler.
  */
 public class MonotonicPairedDataMap<E> implements DataMap<Long, E> {
 

diff --git a/baremaps-dem/pom.xml b/baremaps-dem/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.baremaps</groupId>
     <artifactId>baremaps</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.8.1</version>
   </parent>
   <artifactId>baremaps-dem</artifactId>
   <dependencies>