From 25c65fd1e1f017e5dd709f54687b16f38aa51310 Mon Sep 17 00:00:00 2001 From: Vitor Hugo Schwaab Date: Mon, 24 Jul 2023 09:25:01 +0200 Subject: [PATCH] chore: use JDK 17 (#38) * ci: upgrade build system to use JDK 17 * feat(docker): use JDK 17 on images * chore: bump version to 1.4.0 * chore(deps): bump maven plugins * chore(deps): bump prometheus from 0.14.0 to 0.19.0 --- .github/workflows/docker.yml | 2 +- .github/workflows/release-maven.yml | 4 ++-- README.md | 2 +- dockerfiles/Dockerfile | 4 ++-- mk/prometheus-agent-src.mk | 2 +- pom.xml | 10 +++++----- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6badb47..395c4ed 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,7 +33,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 17 - name: Set Release Version # use the version specified in the pom.xml as the tag diff --git a/.github/workflows/release-maven.yml b/.github/workflows/release-maven.yml index 888c137..645117d 100644 --- a/.github/workflows/release-maven.yml +++ b/.github/workflows/release-maven.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 17 - name: Build with Maven run: mvn -DskipTests package @@ -31,7 +31,7 @@ jobs: uses: actions/setup-java@v3 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' - java-version: 8 + java-version: 17 server-id: ossrh server-username: OSSRH_USERNAME server-password: OSSRH_PASSWORD diff --git a/README.md b/README.md index f6681b2..cec9485 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ See makefiles in [mk](mk) directory. com.wire cryptobox4j - 1.3.0 + 1.4.0 ``` diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 24bdcc2..7d6d860 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-jdk as cryptobox +FROM eclipse-temurin:17-jdk as cryptobox # disable prompts from the txdata ENV DEBIAN_FRONTEND=noninteractive @@ -47,7 +47,7 @@ RUN make dist ENV LD_LIBRARY_PATH=/wire/cryptobox/dist/lib -FROM eclipse-temurin:11-jre as runtime +FROM eclipse-temurin:17-jre as runtime RUN mkdir -p /opt/wire/lib # make Java to take this as java.library.path diff --git a/mk/prometheus-agent-src.mk b/mk/prometheus-agent-src.mk index 6aa18ac..e5036eb 100644 --- a/mk/prometheus-agent-src.mk +++ b/mk/prometheus-agent-src.mk @@ -1,4 +1,4 @@ -PROMETHEUS_AGENT_VERSION := 0.14.0 +PROMETHEUS_AGENT_VERSION := 0.19.0 PROMETHEUS_AGENT_NAME := prometheus-java-agent PROMETHEUS_AGENT_GIT_URL := https://github.com/prometheus/jmx_exporter.git diff --git a/pom.xml b/pom.xml index a1c8d85..54e44e9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.wire cryptobox4j - 1.3.0 + 1.4.0 Cryptobox4J CryptoBox for Wire Bots @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M8 + 3.1.2