diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 678a499..f004105 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6ca5e4a..1309519 100644 --- 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: "oss@post.ch" 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 index 075e413..7682a11 100644 --- a/apikana-maven-plugin/pom.xml +++ b/apikana-maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.swisspush.apikana apikana - 0.4.25-SNAPSHOT + 0.5.0-SNAPSHOT org.swisspush.maven.plugins 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 index 88415d7..277a2ac 100644 --- 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 index af5c809..d2c6bed 100644 --- 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 index 4db2b45..11df355 100644 --- a/apikana-parent/pom.xml +++ b/apikana-parent/pom.xml @@ -5,7 +5,7 @@ org.swisspush.apikana apikana - 0.4.25-SNAPSHOT + 0.5.0-SNAPSHOT apikana-parent @@ -54,17 +54,13 @@ - - commons-lang - commons-lang - com.fasterxml.jackson.core jackson-databind - javax.validation - validation-api + jakarta.validation + jakarta.validation-api joda-time diff --git a/pom.xml b/pom.xml index a5705bf..7ba6dd1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.swisspush.apikana apikana - 0.4.25-SNAPSHOT + 0.5.0-SNAPSHOT pom ${project.artifactId} @@ -49,27 +49,22 @@ ch.qos.logback logback-classic - 1.4.7 + 1.5.12 com.fasterxml.jackson.core jackson-databind - 2.15.0 + 2.18.2 - commons-lang - commons-lang - 2.6 - - - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + 3.1.0 joda-time joda-time - 2.12.5 + 2.13.0 junit @@ -79,32 +74,32 @@ org.apache.maven maven-artifact - 3.3.9 + 3.9.9 org.apache.maven maven-core - 3.3.9 + 3.9.9 org.apache.maven maven-model - 3.3.9 + 3.9.9 org.apache.maven.plugin-tools maven-plugin-annotations - 3.5 + 3.15.1 org.apache.maven maven-plugin-api - 3.3.9 + 3.9.9 org.eclipse.jetty jetty-server - 9.3.15.v20161220 + 9.4.53.v20231009 org.twdata.maven @@ -114,7 +109,7 @@ org.yaml snakeyaml - 2.0 + 2.3