Skip to content

Commit e6a2465

Browse files
bchapuisbchapuis
committed
Release Baremaps 0.8.1
- Removed unlicensed files - Add missing license header - Update the LICENSE and NOTICE files - Add directory for third party licensex - Remove dependency to gdal - Add licenses and notices directories to src and bin distribution - Add apache rat step to the CI - Improve apache rat confirguration - Add missing license headers identified with apache rat - Add LICENSE and NOTICE to release artifacts (jar)
1 parent 8c6efc4 commit e6a2465

File tree

99 files changed

+9612
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+9612
-219
lines changed

‎.github/workflows/analyze.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111

1212
lint:
13-
name: Spotless linter
13+
name: Spotless Check
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
@@ -24,8 +24,23 @@ jobs:
2424
- name: Run linter
2525
run: ./mvnw spotless:check
2626

27+
rat:
28+
name: Apache Rat Check
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Checkout code
32+
uses: actions/checkout@v4
33+
- name: Set up Java 17
34+
uses: actions/setup-java@v3
35+
with:
36+
java-version: 17
37+
distribution: temurin
38+
cache: maven
39+
- name: Run Apache Rat
40+
run: ./mvnw -B apache-rat:check
41+
2742
javadoc:
28-
name: Build javadoc
43+
name: Javadoc Build
2944
runs-on: ubuntu-latest
3045
steps:
3146
- name: Checkout code

‎DISCLAIMER

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Apache Baremaps is an effort undergoing incubation at The Apache Software Foundation (ASF),
2+
sponsored by the Apache Incubator. Incubation is required of all newly accepted projects
3+
until a further review indicates that the infrastructure, communications, and decision-making
4+
process have stabilized in a manner consistent with other successful ASF projects. While incubation
5+
status is not necessarily a reflection of the completeness or stability of the code, it does
6+
indicate that the project has yet to be fully endorsed by the ASF.

‎LICENSE

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@
208208

209209
Code and data produced outside the ASF that is included in the
210210
distribution of this product is subject to the following
211-
additional license terms:
212-
213-
- FlatGeobuf, BSD-2-Clause license
214-
- GeoPackage Java, MIT License
215-
- OSMPBF, MIT License
216-
- OSM Test Data, Public domain
217-
- Mapbox Vector Tile, Creative Commons Public License
218-
- Palantir Streams, Apache License 2.0
219-
- Planetiler, Apache License 2.0
220-
- PMTiles, BSD-3-Clause license
221-
- pyosmium, BSD 2-Clause "Simplified" License
211+
additional license terms.
212+
213+
- FlatGeobuf, BSD-2-Clause license, see licenses/flatgeobuf.
214+
- GeoPackage Java, MIT License, see licenses/geopackage-java.
215+
- OSMPBF, MIT License, see licenses/osm-binary.
216+
- OSM Test Data, Public domain, see licenses/osm-testdata.
217+
- Mapbox Vector Tile, Creative Commons Public License, see licenses/vector-tile-spec.
218+
- Palantir Streams, Apache License 2.0, see licenses/palantir-streams.
219+
- Planetiler, Apache License 2.0, see licenses/planetiler.
220+
- PMTiles, BSD-3-Clause license, see licenses/pmtiles.
221+
- pyosmium, BSD 2-Clause "Simplified" License, see licenses/pyosmium.

‎NOTICE

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -6,70 +6,3 @@ Copyright 2020-2022.
66

77
This product includes software developed at
88
The Apache Software Foundation (http://www.apache.org/).
9-
10-
This product includes test data copied from FlatGeobuf.
11-
BSD-2-Clause license.
12-
Please visit the following URL for the full text of the FlatGeobuf license:
13-
https://github.com/flatgeobuf/flatgeobuf/
14-
The copied files are located in:
15-
- baremaps-core/src/test/resources/data/
16-
17-
This product includes test data copied from GeoPackage Java.
18-
MIT License.
19-
Please visit the following URL for the full text of the GeoPackage Java license:
20-
https://github.com/ngageoint/geopackage-java/
21-
The copied files are located in:
22-
- baremaps-core/src/test/resources/data/
23-
24-
This product includes protocol buffers definitions derived from OSMPBF.
25-
MIT License.
26-
Please visit the following URLs for the licensing information:
27-
- https://github.com/openstreetmap/OSM-binary/issues/18
28-
- https://github.com/openstreetmap/OSM-binary/pull/35
29-
The derived files are:
30-
- baremaps-core/src/main/proto/osmformat.proto
31-
- baremaps-core/src/main/proto/fileformat.proto
32-
33-
This product includes test data copied from OSM Test Data.
34-
Public domain.
35-
Please visit the following URL for the full text of the OSM Test Data license:
36-
https://github.com/osmcode/osm-testdata?tab=readme-ov-file#license
37-
The copied files are located in:
38-
- baremaps-core/src/test/resources/osm-testdata/
39-
40-
This product includes protocol buffers definitions derived from Mapbox Vector Tile.
41-
Creative Commons Public License.
42-
Please visit the following URL for the licensing information:
43-
- https://github.com/mapbox/vector-tile-spec/blob/master/LICENSE
44-
The derived files are:
45-
- baremaps-core/src/main/proto/vector_tile.proto
46-
47-
This product includes code derived from Palantir Streams.
48-
Apache License 2.0.
49-
Please visit the following URL for the full text of the Palantir license:
50-
https://github.com/palantir/streams/blob/develop/LICENSE
51-
The derived files are:
52-
- baremaps-core/src/main/java/org/apache/baremaps/stream/BufferedSpliterator.java
53-
54-
This product includes code derived from Planetiler.
55-
Apache License 2.0.
56-
Please visit the following URL for the full text of the Planetiler license:
57-
https://github.com/onthegomap/planetiler/blob/main/LICENSE
58-
The derived files are:
59-
- baremaps-core/src/main/java/org/apache/baremaps/database/collection/MemoryAlignedDataMap.java
60-
- baremaps-core/src/main/java/org/apache/baremaps/database/collection/MonotonicDataMap.java
61-
- baremaps-core/src/main/java/org/apache/baremaps/database/collection/MonotonicFixedSizeDataMap.java
62-
63-
This product includes test data copied from PMTiles.
64-
BSD-3-Clause license.
65-
Please visit the following URL for the full text of the PMTiles license:
66-
https://github.com/protomaps/PMTiles
67-
The copied files are located in:
68-
- baremaps-core/src/test/resources/pmtiles/
69-
70-
This product includes code derived from pyosmium.
71-
BSD 2-Clause "Simplified" License.
72-
Please visit the following URL for the full text of the pyosmium license:
73-
https://github.com/osmcode/pyosmium/blob/master/LICENSE.TXT
74-
The derived files are:
75-
- baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/state/StateReader.java

‎baremaps-benchmarking/pom.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to you under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
218
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
319
<modelVersion>4.0.0</modelVersion>
420
<parent>
521
<groupId>org.apache.baremaps</groupId>
622
<artifactId>baremaps</artifactId>
7-
<version>0.7.4-SNAPSHOT</version>
23+
<version>0.8.1</version>
824
</parent>
925

1026
<artifactId>baremaps-benchmarking</artifactId>

‎baremaps-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ limitations under the License.
2121
<parent>
2222
<groupId>org.apache.baremaps</groupId>
2323
<artifactId>baremaps</artifactId>
24-
<version>0.7.4-SNAPSHOT</version>
24+
<version>0.8.1</version>
2525
</parent>
2626

2727
<artifactId>baremaps-cli</artifactId>

‎baremaps-cli/src/assembly/bin.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ limitations under the License.
2828
<directory>../.</directory>
2929
<outputDirectory>.</outputDirectory>
3030
<includes>
31-
<include>DISCLAIMER-WIP</include>
31+
<include>DISCLAIMER</include>
3232
<include>NOTICE</include>
33+
<include>licenses/**</include>
34+
<include>licenses-binary/**</include>
35+
<include>notices/**</include>
36+
<include>notices-binary/**</include>
3337
</includes>
3438
<lineEnding>unix</lineEnding>
3539
</fileSet>

‎baremaps-cli/src/assembly/src.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ limitations under the License.
3232
<include>**/src/**/*</include>
3333
<include>baremaps-testing/data/**</include>
3434
<include>codestyle.xml</include>
35+
<include>DISCLAIMER</include>
3536
<include>LICENSE.header</include>
3637
<include>NOTICE</include>
3738
</includes>
@@ -46,6 +47,10 @@ limitations under the License.
4647
<include>.asf.yaml</include>
4748
<include>CONTRIBUTING.md</include>
4849
<include>LICENSE</include>
50+
<include>licenses/**</include>
51+
<include>licenses-binary/**</include>
52+
<include>notices/**</include>
53+
<include>notices-binary/**</include>
4954
<include>examples/**</include>
5055
<include>.gitignore</include>
5156
<include>RELEASE.md</include>

‎baremaps-cli/src/license/override.properties

Lines changed: 58 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ io.sgr--s2-geometry-library-java--1.0.0=Apache License 2.0
122122
it.unimi.dsi--fastutil--8.5.14=Apache License 2.0
123123
jakarta.activation--jakarta.activation-api--1.2.1=Eclipse Distribution License 1.0
124124
jakarta.transaction--jakarta.transaction-api--1.3.3=Eclipse Public License 2.0; GPL2 w/ CPE
125-
jakarta.xml.bind--jakarta.xml.bind-api--2.3.2=Eclipse Distribution License 1.0
125+
jakarta.xml.bind--jakarta.xml.bind-api--4.0.1=Eclipse Distribution License 1.0
126126
javax.annotation--javax.annotation-api--1.3.2=CDDL; GPL2 w/ CPE
127+
javax.measure--unit-api--2.1.3=BSD 3-Clause License
127128
javax.servlet--javax.servlet-api--3.1.0=CDDL; GPL2 w/ CPE
128129
javax.servlet.jsp--jsp-api--2.1=CDDL; GPL2 w/ CPE
129130
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
146147
net.ripe.ipresource--ipresource--1.52=BSD License
147148
org.antlr--antlr4-runtime--4.11.1=BSD 3-Clause License
148149
org.apache.avro--avro--1.9.2=Apache License 2.0
149-
org.apache.baremaps--baremaps-core--0.7.4-SNAPSHOT=Apache License 2.0
150-
org.apache.baremaps--baremaps-data--0.7.4-SNAPSHOT=Apache License 2.0
151-
org.apache.baremaps--baremaps-flatgeobuf--0.7.4-SNAPSHOT=Apache License 2.0
152-
org.apache.baremaps--baremaps-geoparquet--0.7.4-SNAPSHOT=Apache License 2.0
153-
org.apache.baremaps--baremaps-maplibre--0.7.4-SNAPSHOT=Apache License 2.0
154-
org.apache.baremaps--baremaps-openstreetmap--0.7.4-SNAPSHOT=Apache License 2.0
155-
org.apache.baremaps--baremaps-pmtiles--0.7.4-SNAPSHOT=Apache License 2.0
156-
org.apache.baremaps--baremaps-server--0.7.4-SNAPSHOT=Apache License 2.0
150+
org.apache.baremaps--baremaps-core--0.8.1=Apache License 2.0
151+
org.apache.baremaps--baremaps-csv--0.8.1=Apache License 2.0
152+
org.apache.baremaps--baremaps-data--0.8.1=Apache License 2.0
153+
org.apache.baremaps--baremaps-dem--0.8.1=Apache License 2.0
154+
org.apache.baremaps--baremaps-flatgeobuf--0.8.1=Apache License 2.0
155+
org.apache.baremaps--baremaps-geopackage--0.8.1=Apache License 2.0
156+
org.apache.baremaps--baremaps-geoparquet--0.8.1=Apache License 2.0
157+
org.apache.baremaps--baremaps-maplibre--0.8.1=Apache License 2.0
158+
org.apache.baremaps--baremaps-openstreetmap--0.8.1=Apache License 2.0
159+
org.apache.baremaps--baremaps-pmtiles--0.8.1=Apache License 2.0
160+
org.apache.baremaps--baremaps-postgres--0.8.1=Apache License 2.0
161+
org.apache.baremaps--baremaps-rpsl--0.8.1=Apache License 2.0
162+
org.apache.baremaps--baremaps-server--0.8.1=Apache License 2.0
163+
org.apache.baremaps--baremaps-shapefile--0.8.1=Apache License 2.0
164+
org.apache.baremaps--baremaps-store--0.8.1=Apache License 2.0
157165
org.apache.calcite--calcite-core--1.37.0=Apache License 2.0
158166
org.apache.calcite--calcite-linq4j--1.37.0=Apache License 2.0
159167
org.apache.calcite.avatica--avatica-core--1.25.0=Apache License 2.0
160168
org.apache.calcite.avatica--avatica-metrics--1.25.0=Apache License 2.0
161169
org.apache.commons--commons-compress--1.27.1=Apache License 2.0
162170
org.apache.commons--commons-configuration2--2.8.0=Apache License 2.0
163171
org.apache.commons--commons-dbcp2--2.11.0=Apache License 2.0
164-
org.apache.commons--commons-lang3--3.1=Apache License 2.0
172+
org.apache.commons--commons-lang3--3.16.0=Apache License 2.0
165173
org.apache.commons--commons-math3--3.6.1=Apache License 2.0
166174
org.apache.commons--commons-pool2--2.12.0=Apache License 2.0
167175
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
221229
org.apache.parquet--parquet-format-structures--1.14.2=Apache License 2.0
222230
org.apache.parquet--parquet-hadoop--1.14.2=Apache License 2.0
223231
org.apache.parquet--parquet-jackson--1.14.2=Apache License 2.0
232+
org.apache.sis.core--sis-feature--1.4=Apache License 2.0
233+
org.apache.sis.core--sis-metadata--1.4=Apache License 2.0
234+
org.apache.sis.core--sis-referencing--1.4=Apache License 2.0
235+
org.apache.sis.core--sis-utility--1.4=Apache License 2.0
236+
org.apache.sis.storage--sis-geotiff--1.4=Apache License 2.0
237+
org.apache.sis.storage--sis-sqlstore--1.4=Apache License 2.0
238+
org.apache.sis.storage--sis-storage--1.4=Apache License 2.0
224239
org.apache.yetus--audience-annotations--0.12.0=Apache License 2.0
225240
org.apache.zookeeper--zookeeper--3.8.3=Apache License 2.0
226241
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
254269
org.locationtech.jts.io--jts-io-common--1.20.0=Eclipse Distribution License 1.0
255270
org.locationtech.proj4j--proj4j--1.3.0=Apache License 2.0
256271
org.locationtech.spatial4j--spatial4j--0.8=Apache License 2.0
272+
org.opengis--geoapi--3.0.2=OGC copyright
257273
org.ow2.asm--asm--7.2=BSD 3-Clause License
258274
org.ow2.asm--asm-analysis--7.2=BSD 3-Clause License
259275
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
262278
org.reactivestreams--reactive-streams--1.0.4=MIT License
263279
org.roaringbitmap--RoaringBitmap--1.2.1=Apache License 2.0
264280
org.slf4j--slf4j-api--2.0.16=MIT License
265-
org.slf4j--slf4j-nop--2.0.12=MIT License
266281
org.slf4j--slf4j-reload4j--1.7.36=MIT License
267282
org.wildfly.openssl--wildfly-openssl--1.1.3.Final=Apache License 2.0
268283
org.xerial--sqlite-jdbc--3.46.1.0=Apache License 2.0
269284
org.xerial.snappy--snappy-java--1.1.10.4=Apache License 2.0
270285
org.xerial.thirdparty--nestedvm--1.0=Apache License 2.0
271286
org.yaml--snakeyaml--2.2=Apache License 2.0
272-
software.amazon.awssdk--bundle--2.23.19=Apache License 2.0
287+
software.amazon.awssdk--annotations--2.27.17=Apache License 2.0
288+
software.amazon.awssdk--apache-client--2.27.17=Apache License 2.0
289+
software.amazon.awssdk--arns--2.27.17=Apache License 2.0
290+
software.amazon.awssdk--auth--2.27.17=Apache License 2.0
291+
software.amazon.awssdk--aws-core--2.27.17=Apache License 2.0
292+
software.amazon.awssdk--aws-query-protocol--2.27.17=Apache License 2.0
293+
software.amazon.awssdk--aws-xml-protocol--2.27.17=Apache License 2.0
294+
software.amazon.awssdk--checksums--2.27.17=Apache License 2.0
295+
software.amazon.awssdk--checksums-spi--2.27.17=Apache License 2.0
296+
software.amazon.awssdk--crt-core--2.27.17=Apache License 2.0
297+
software.amazon.awssdk--endpoints-spi--2.27.17=Apache License 2.0
298+
software.amazon.awssdk--http-auth--2.27.17=Apache License 2.0
299+
software.amazon.awssdk--http-auth-aws--2.27.17=Apache License 2.0
300+
software.amazon.awssdk--http-auth-aws-eventstream--2.27.17=Apache License 2.0
301+
software.amazon.awssdk--http-auth-spi--2.27.17=Apache License 2.0
302+
software.amazon.awssdk--http-client-spi--2.27.17=Apache License 2.0
303+
software.amazon.awssdk--identity-spi--2.27.17=Apache License 2.0
304+
software.amazon.awssdk--json-utils--2.27.17=Apache License 2.0
305+
software.amazon.awssdk--metrics-spi--2.27.17=Apache License 2.0
306+
software.amazon.awssdk--netty-nio-client--2.27.17=Apache License 2.0
307+
software.amazon.awssdk--profiles--2.27.17=Apache License 2.0
308+
software.amazon.awssdk--protocol-core--2.27.17=Apache License 2.0
309+
software.amazon.awssdk--regions--2.27.17=Apache License 2.0
310+
software.amazon.awssdk--retries--2.27.17=Apache License 2.0
311+
software.amazon.awssdk--retries-spi--2.27.17=Apache License 2.0
312+
software.amazon.awssdk--s3--2.27.17=Apache License 2.0
313+
software.amazon.awssdk--s3-transfer-manager--2.27.17=Apache License 2.0
314+
software.amazon.awssdk--sdk-core--2.27.17=Apache License 2.0
315+
software.amazon.awssdk--third-party-jackson-core--2.27.17=Apache License 2.0
316+
software.amazon.awssdk--utils--2.27.17=Apache License 2.0
317+
software.amazon.eventstream--eventstream--1.0.1=Apache License 2.0
318+
273319

‎baremaps-cli/src/main/resources/log4j.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to you under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
# Root logger option
217
log4j.rootLogger=INFO, stdout
318

0 commit comments

Comments
 (0)