This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new ee8682bd Upgrade maven dependencies and fix minor issues (#838)
ee8682bd is described below
commit ee8682bd70b70e0add198780459d9ddd1be434b7
Author: Bertil Chapuis <[email protected]>
AuthorDate: Fri Mar 1 10:48:54 2024 +0100
Upgrade maven dependencies and fix minor issues (#838)
* Upgrade maven dependencies
* Fix broken resource link
* Fix the daylight style
---
baremaps-core/pom.xml | 2 +-
.../src/main/resources/static/server.html | 2 +-
daylight/style.js | 12 +++---
pom.xml | 50 +++++++++++-----------
4 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/baremaps-core/pom.xml b/baremaps-core/pom.xml
index 2b40f130..5552c114 100644
--- a/baremaps-core/pom.xml
+++ b/baremaps-core/pom.xml
@@ -151,7 +151,7 @@ limitations under the License.
<goal>test-compile</goal>
</goals>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.19.3:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${version.lib.protobuf}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
</execution>
</executions>
diff --git a/baremaps-server/src/main/resources/static/server.html
b/baremaps-server/src/main/resources/static/server.html
index 43d1b2fa..f903e4c5 100644
--- a/baremaps-server/src/main/resources/static/server.html
+++ b/baremaps-server/src/main/resources/static/server.html
@@ -20,7 +20,7 @@ limitations under the License.
<script
src='https://unpkg.com/[email protected]/dist/maplibre-gl.js'></script>
<script
src='https://baremaps.apache.org/assets/maplibre/maplibre-gl-inspect.js'></script>
<script
src='https://baremaps.apache.org/assets/maplibre/maplibre-gl-tile-boundaries.js'></script>
- <link href='https://unpkg.com/[email protected]/dist/maplibre-gl.css'
rel='stylesheet' />
+ <link href='https://unpkg.com/[email protected]/dist/maplibre-gl.css'
rel='stylesheet' />
<link
href='https://baremaps.apache.org/assets/maplibre/maplibre-gl-inspect.css'
rel='stylesheet' />
<link
href='https://baremaps.apache.org/assets/maplibre/maplibre-gl-tile-boundaries.css'
rel='stylesheet' />
<link rel="icon" type="image/x-icon"
href="https://baremaps.apache.org/assets/favicon/favicon.ico";>
diff --git a/daylight/style.js b/daylight/style.js
index 5617b020..38775b1d 100644
--- a/daylight/style.js
+++ b/daylight/style.js
@@ -52,9 +52,9 @@ import ocean_overlay from
'../basemap/layers/ocean/overlay.js';
import route_line from "../basemap/layers/route/style.js"
import building_fill from "../basemap/layers/building/fill.js";
import building_extrusion from "../basemap/layers/building/extrusion.js";
-import man_made_bridge from "../basemap/layers/man_made/bridge.js";
-import man_made_pier_line from "../basemap/layers/man_made/pier_line.js";
-import man_made_pier_label from "../basemap/layers/man_made/pier_label.js";
+import man_made_fill from "../basemap/layers/man_made/man_made_fill.js";
+import man_made_line from "../basemap/layers/man_made/man_made_line.js";
+import man_made_label from "../basemap/layers/man_made/man_made_label.js";
import waterway_line from "../basemap/layers/waterway/line.js"
import waterway_area from "../basemap/layers/waterway/area.js"
import waterway_label from "../basemap/layers/waterway/label.js"
@@ -94,7 +94,9 @@ export default {
// landcover,
waterway_line,
waterway_area,
- man_made_bridge,
+ man_made_fill,
+ man_made_line,
+ man_made_label,
amenity_fountain,
highway_tunnel_outline,
highway_tunnel_line,
@@ -112,8 +114,6 @@ export default {
route_line,
power_cable,
power_tower,
- man_made_pier_line,
- man_made_pier_label,
natural_tree,
natural_trunk,
boundary_line,
diff --git a/pom.xml b/pom.xml
index bd1744c9..d68733bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,36 +79,34 @@ limitations under the License.
<sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
<sonar.organization>apache</sonar.organization>
<sonar.projectKey>apache_baremaps</sonar.projectKey>
- <version.lib.armeria>1.26.4</version.lib.armeria>
+ <version.lib.armeria>1.27.2</version.lib.armeria>
<version.lib.awaitability>4.2.0</version.lib.awaitability>
- <version.lib.awssdk>2.21.5</version.lib.awssdk>
+ <version.lib.awssdk>2.24.13</version.lib.awssdk>
<version.lib.caffeine>3.1.8</version.lib.caffeine>
- <version.lib.calcite>1.35.0</version.lib.calcite>
- <version.lib.commons-compress>1.24.0</version.lib.commons-compress>
- <version.lib.fastutil>8.5.12</version.lib.fastutil>
- <version.lib.flatgeobuf>3.26.1</version.lib.flatgeobuf>
- <version.lib.geopackage>6.6.3</version.lib.geopackage>
- <version.lib.graalvm>23.0.2</version.lib.graalvm>
- <version.lib.guava>32.1.3-jre</version.lib.guava>
- <version.lib.hikari>5.0.1</version.lib.hikari>
+ <version.lib.calcite>1.36.0</version.lib.calcite>
+ <version.lib.commons-compress>1.26.0</version.lib.commons-compress>
+ <version.lib.fastutil>8.5.13</version.lib.fastutil>
+ <version.lib.flatgeobuf>3.26.2</version.lib.flatgeobuf>
+ <version.lib.geopackage>6.6.4</version.lib.geopackage>
+ <version.lib.graalvm>23.0.3</version.lib.graalvm>
+ <version.lib.guava>33.0.0-jre</version.lib.guava>
+ <version.lib.hikari>5.1.0</version.lib.hikari>
<version.lib.ipresource>1.52</version.lib.ipresource>
<version.lib.jackson>2.16.1</version.lib.jackson>
- <version.lib.jmh>1.35</version.lib.jmh>
+ <version.lib.jmh>1.37</version.lib.jmh>
<version.lib.jts>1.19.0</version.lib.jts>
- <version.lib.junit>5.10.0</version.lib.junit>
- <version.lib.junit-vintage>5.10.0</version.lib.junit-vintage>
- <version.lib.log4j>3.0.0-alpha1</version.lib.log4j>
- <version.lib.lucene>9.4.2</version.lib.lucene>
- <version.lib.lucene-spatial>9.4.2</version.lib.lucene-spatial>
+ <version.lib.junit>5.10.2</version.lib.junit>
+ <version.lib.log4j>3.0.0-beta2</version.lib.log4j>
+ <version.lib.lucene>9.10.0</version.lib.lucene>
<version.lib.pgbulkinsert>8.1.2</version.lib.pgbulkinsert>
<version.lib.picocli>4.7.5</version.lib.picocli>
- <version.lib.postgresql>42.6.0</version.lib.postgresql>
+ <version.lib.postgresql>42.7.2</version.lib.postgresql>
<version.lib.proj4j>1.3.0</version.lib.proj4j>
- <version.lib.protobuf>3.21.6</version.lib.protobuf>
- <version.lib.roaringbitmap>1.0.0</version.lib.roaringbitmap>
- <version.lib.slf4j>2.0.9</version.lib.slf4j>
- <version.lib.sqlite>3.43.2.1</version.lib.sqlite>
- <version.lib.testcontainers>1.19.1</version.lib.testcontainers>
+ <version.lib.protobuf>3.25.3</version.lib.protobuf>
+ <version.lib.roaringbitmap>1.0.1</version.lib.roaringbitmap>
+ <version.lib.slf4j>2.0.12</version.lib.slf4j>
+ <version.lib.sqlite>3.45.1.0</version.lib.sqlite>
+ <version.lib.testcontainers>1.19.6</version.lib.testcontainers>
<version.plugin.jacoco-maven-plugin>0.8.11</version.plugin.jacoco-maven-plugin>
<version.plugin.jib-maven-plugin>3.0.0</version.plugin.jib-maven-plugin>
<version.plugin.maven-compiler-plugin>3.10.1</version.plugin.maven-compiler-plugin>
@@ -125,7 +123,7 @@ limitations under the License.
<version.plugin.nexus-staging-maven-plugin>1.6.13</version.plugin.nexus-staging-maven-plugin>
<version.plugin.os-maven-plugin>1.7.0</version.plugin.os-maven-plugin>
<version.plugin.protobuf-maven-plugin>0.6.1</version.plugin.protobuf-maven-plugin>
-
<version.plugin.spotless-maven-plugin>2.40.0</version.plugin.spotless-maven-plugin>
+
<version.plugin.spotless-maven-plugin>2.43.0</version.plugin.spotless-maven-plugin>
</properties>
<dependencyManagement>
@@ -340,7 +338,7 @@ limitations under the License.
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>${version.lib.junit-vintage}</version>
+ <version>${version.lib.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -511,8 +509,8 @@ limitations under the License.
<importOrder />
<removeUnusedImports />
<eclipse>
- <!-- versions 4.20.0 and newer don't with records -->
- <version>4.19.0</version>
+ <!-- versions 4.20.0 and newer don't work with records -->
+ <version>4.19</version>
<file>${maven.multiModuleProjectDirectory}/codestyle.xml</file>
</eclipse>
<licenseHeader>
