Merge pull request #34 from MonsieurBon/java-21

SDCISA-18359 update build to java 21
swisspost · Nov 29, 2024 · 70562bf · 70562bf
2 parents c20cf52 + f0aeb4f
commit 70562bf
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,12 +10,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up JDK 1.8
-      uses: joschi/setup-jdk@v2
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: '21'
+        distribution: 'temurin'
+        architecture: 'x64'
 
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,8 +5,8 @@ on:
       - master
 
 env:
-  RELEASE_VERSION: "0.4.24"
-  DEVELOP_VERSION: "0.4.25-SNAPSHOT"
+  RELEASE_VERSION: "0.5.0"
+  DEVELOP_VERSION: "0.5.1-SNAPSHOT"
   GIT_AUTHOR_NAME: "@swisspost-devs"
   GIT_AUTHOR_EMAIL: "[email protected]"
   GIT_COMMITTER_NAME: "swisspost-devs"
@@ -17,12 +17,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up JDK 1.8
-      uses: joschi/setup-jdk@v2
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: '21'
+        distribution: 'temurin'
+        architecture: 'x64'
         server-id: sonatype-nexus-staging # Value of the distributionManagement/repository/id field of the pom.xml
         server-username: CI_DEPLOY_USERNAME # env variable for username in deploy
         server-password: CI_DEPLOY_PASSWORD # env variable for token in deploy

diff --git a/apikana-maven-plugin/pom.xml b/apikana-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.swisspush.apikana</groupId>
         <artifactId>apikana</artifactId>
-        <version>0.4.25-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.swisspush.maven.plugins</groupId>

diff --git a/apikana-maven-plugin/src/main/java/org/swisspush/apikana/ApiServer.java b/apikana-maven-plugin/src/main/java/org/swisspush/apikana/ApiServer.java
@@ -6,17 +6,9 @@
 import org.eclipse.jetty.util.UrlEncoded;
 import org.eclipse.jetty.util.resource.Resource;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.io.*;
 import java.net.URI;
-import java.net.URL;
-import java.util.*;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 
 public class ApiServer {
     private static final int PORT = 8334;

diff --git a/apikana-maven-plugin/src/main/java/org/swisspush/apikana/GenerateMojo.java b/apikana-maven-plugin/src/main/java/org/swisspush/apikana/GenerateMojo.java
@@ -1,6 +1,5 @@
 package org.swisspush.apikana;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.*;
 import org.codehaus.plexus.util.FileUtils;

diff --git a/apikana-parent/pom.xml b/apikana-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.swisspush.apikana</groupId>
         <artifactId>apikana</artifactId>
-        <version>0.4.25-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apikana-parent</artifactId>
@@ -54,17 +54,13 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.swisspush.apikana</groupId>
     <artifactId>apikana</artifactId>
-    <version>0.4.25-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -49,27 +49,22 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.4.7</version>
+                <version>1.5.12</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.15.0</version>
+                <version>2.18.2</version>
             </dependency>
             <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>2.0.1.Final</version>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>3.1.0</version>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.12.5</version>
+                <version>2.13.0</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -79,32 +74,32 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-artifact</artifactId>
-                <version>3.3.9</version>
+                <version>3.9.9</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>3.3.9</version>
+                <version>3.9.9</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-model</artifactId>
-                <version>3.3.9</version>
+                <version>3.9.9</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugin-tools</groupId>
                 <artifactId>maven-plugin-annotations</artifactId>
-                <version>3.5</version>
+                <version>3.15.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>3.3.9</version>
+                <version>3.9.9</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>9.3.15.v20161220</version>
+                <version>9.4.53.v20231009</version>
             </dependency>
             <dependency>
                 <groupId>org.twdata.maven</groupId>
@@ -114,7 +109,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>2.0</version>
+                <version>2.3</version>
             </dependency>
         </dependencies>
     </dependencyManagement>