Run ci on more versions (#1294)

.github/workflows/maven.yml

@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        jdk: [ 21 ]
+        jdk: [ 21, 23, 24 ]
         include:
         - os: ubuntu-latest
           jdk: 21

planetiler-benchmarks/pom.xml

@@ -53,10 +53,11 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
         <configuration>
           <!-- we don't want to deploy this module -->
-          <skip>true</skip>
+          <skipPublishing>true</skipPublishing>
         </configuration>
       </plugin>
     </plugins>

planetiler-core/src/test/java/com/onthegomap/planetiler/stats/PrometheusStatsTest.java

@@ -18,6 +18,7 @@ import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.io.TempDir;
 
 class PrometheusStatsTest {
+  private static final String NUMBER = "[0-9\\.E\\-+]+$";
 
   @TestFactory
   Stream<DynamicTest> testInitialStat() {
@@ -27,7 +28,7 @@ class PrometheusStatsTest {
       "^jvm_thread_cpu_time_seconds_total\\{",
       "^jvm_thread_user_time_seconds_total\\{",
       "^jvm_system_load_avg ",
-      "^jvm_available_processors [0-9\\.]+$"
+      "^jvm_available_processors " + NUMBER
     );
   }
 
@@ -36,13 +37,13 @@ class PrometheusStatsTest {
     PrometheusStats stats = new PrometheusStats("job");
     var timer = stats.startStage("task1");
     assertContainsStat("^planetiler_task1_running 1", stats);
-    assertContainsStat("^planetiler_task1_elapsed_time_seconds [0-9\\.]+$", stats);
-    assertContainsStat("^planetiler_task1_cpu_time_seconds [0-9\\.]+$", stats);
+    assertContainsStat("^planetiler_task1_elapsed_time_seconds " + NUMBER, stats);
+    assertContainsStat("^planetiler_task1_cpu_time_seconds " + NUMBER, stats);
     timer.stop();
 
     assertContainsStat("^planetiler_task1_running 0", stats);
-    assertContainsStat("^planetiler_task1_elapsed_time_seconds [0-9\\.]+$", stats);
-    assertContainsStat("^planetiler_task1_cpu_time_seconds [0-9\\.]+$", stats);
+    assertContainsStat("^planetiler_task1_elapsed_time_seconds " + NUMBER, stats);
+    assertContainsStat("^planetiler_task1_cpu_time_seconds " + NUMBER, stats);
 
     assertFalse(stats.timers().all().get("task1").timer().running());
   }

planetiler-custommap/pom.xml

@@ -56,10 +56,11 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
         <configuration>
           <!-- we don't want to deploy this module -->
-          <skip>true</skip>
+          <skipPublishing>true</skipPublishing>
         </configuration>
       </plugin>
     </plugins>

planetiler-custommap/src/main/java/com/onthegomap/planetiler/custommap/BooleanExpressionParser.java

@@ -127,11 +127,11 @@ public class BooleanExpressionParser<T extends ScriptContext> {
         }
         var result = matchAnyTyped(null, expression, values);
         if (!values.isEmpty() && result.pattern() == null && !result.isMatchAnything() && !result.matchWhenMissing() &&
-          expression instanceof ConfigExpression.Variable<?, ?>(var ignored,var name)) {
-          if (name.equals("feature.source")) {
+          expression instanceof ConfigExpression.Variable<?, ?> variable) {
+          if (variable.name().equals("feature.source")) {
             return or(values.stream().filter(String.class::isInstance).map(String.class::cast)
               .map(Expression::matchSource).toList());
-          } else if (name.equals("feature.source_layer")) {
+          } else if (variable.name().equals("feature.source_layer")) {
             return or(values.stream().filter(String.class::isInstance).map(String.class::cast)
               .map(Expression::matchSourceLayer).toList());
           }

planetiler-dist/pom.xml

@@ -138,10 +138,11 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
         <configuration>
           <!-- we don't want to deploy this module -->
-          <skip>true</skip>
+          <skipPublishing>true</skipPublishing>
         </configuration>
       </plugin>
     </plugins>

planetiler-examples/pom.xml

@@ -39,10 +39,11 @@
         <artifactId>reproducible-build-maven-plugin</artifactId>
       </plugin>
       <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
         <configuration>
           <!-- we don't want to deploy this module -->
-          <skip>true</skip>
+          <skipPublishing>true</skipPublishing>
         </configuration>
       </plugin>
     </plugins>

planetiler-openmaptiles

@@ -1 +1 @@
-Subproject commit f0e530faa5d69bcc48e75819fbc0155a8d84041f
+Subproject commit 9c828febfbea390df7c94b0e0060347e49aacb6d

planetiler-openmaptiles.pom.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This pom.xml gets used when this repo loaded as a submodule within https://github.com/onthegomap/planetiler -->
-<!-- TODO it should be in planetiler-openmaptiles/submodule.pom.xml when this is fixed: https://github.com/dependabot/dependabot-core/issues/9193 -->
-<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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.openmaptiles</groupId>
-  <artifactId>planetiler-openmaptiles</artifactId>
-
-  <parent>
-    <groupId>com.onthegomap.planetiler</groupId>
-    <artifactId>planetiler-parent</artifactId>
-    <version>${revision}</version>
-    <relativePath>./</relativePath>
-  </parent>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.onthegomap.planetiler</groupId>
-      <artifactId>planetiler-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.commonmark</groupId>
-      <artifactId>commonmark</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.onthegomap.planetiler</groupId>
-      <artifactId>planetiler-core</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>planetiler-openmaptiles/src/main/java</sourceDirectory>
-    <testSourceDirectory>planetiler-openmaptiles/src/test/java</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>io.github.zlika</groupId>
-        <artifactId>reproducible-build-maven-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <!-- we don't want to deploy this module -->
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

pom.xml

@@ -17,8 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
+    <maven.compiler.release>21</maven.compiler.release>
     <maven.source.excludeResources>true</maven.source.excludeResources>
     <jackson.version>2.19.1</jackson.version>
     <junit.version>5.13.3</junit.version>
@@ -73,17 +72,6 @@
     </repository>
   </repositories>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
   <modules>
     <module>planetiler-core</module>
     <module>planetiler-openmaptiles/submodule.pom.xml</module>
@@ -252,9 +240,15 @@
         <version>3.5.3</version>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.4</version>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
+        <version>0.8.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <publishingServerId>central</publishingServerId>
+          <autoPublish>true</autoPublish>
+          <waitUntil>published</waitUntil>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>