From 0418040be0dfae60260005eb29603c65acd95882 Mon Sep 17 00:00:00 2001 From: Maksym Bryzhko Date: Mon, 16 Dec 2024 22:44:20 +0200 Subject: [PATCH 1/4] Migrate to java 17 --- pom.xml | 32 +++++++++---------- src/main/java/org/bma/vento/VentoRemote.java | 7 ++-- .../vento/schedule/ScheduleScenarioTest.java | 2 +- .../vento/schedule/SchedulingServiceTest.java | 2 +- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 15ef6fd..e3b4842 100644 --- a/pom.xml +++ b/pom.xml @@ -4,28 +4,28 @@ org.bma vento-remote - 1.16-SNAPSHOT + 2.0-SNAPSHOT - 11 + 17 ${maven.compiler.source} UTF-8 UTF-8 1.18.30 - 5.3.31 - 5.4.2 - 2.24.0 - 3.0.0-M3 - 3.0.0-M8 + 6.1.16 + 5.10.5 + 5.14.2 + 3.5.2 + 3.5.2 2.5.3 3.1.1 1.4.13 - 1.2.9 + 1.5.12 2.2 - 1.7.25 + 2.0.16 - arm32v7/eclipse-temurin:11.0.23_9-jre-jammy + arm32v7/eclipse-temurin:17.0.13_11-jre-jammy @@ -61,12 +61,12 @@ compile - - commons-io - commons-io - 2.11.0 - compile - + + + + + + ch.qos.logback diff --git a/src/main/java/org/bma/vento/VentoRemote.java b/src/main/java/org/bma/vento/VentoRemote.java index 1ac799d..396261e 100644 --- a/src/main/java/org/bma/vento/VentoRemote.java +++ b/src/main/java/org/bma/vento/VentoRemote.java @@ -42,17 +42,14 @@ public class VentoRemote { public ScheduleProperties scheduleProperties(ResourceLoader resourceLoader) { log.debug("Loading scheduling properties from: {}", schedulePropertiedFileName); - InputStream propsInputStream = null; - try { - propsInputStream = resourceLoader.getResource(schedulePropertiedFileName).getInputStream(); + + try (InputStream propsInputStream = resourceLoader.getResource(schedulePropertiedFileName).getInputStream()) { ScheduleProperties properties = ScheduleProperties.createFrom(propsInputStream); log.info("Loaded properties: {}", properties); return properties; } catch (IOException e) { throw new IllegalStateException("Error loading properties from: " + schedulePropertiedFileName, e); - } finally { - IOUtils.closeQuietly(propsInputStream); } } diff --git a/src/test/java/org/bma/vento/schedule/ScheduleScenarioTest.java b/src/test/java/org/bma/vento/schedule/ScheduleScenarioTest.java index 33828c3..e29f259 100644 --- a/src/test/java/org/bma/vento/schedule/ScheduleScenarioTest.java +++ b/src/test/java/org/bma/vento/schedule/ScheduleScenarioTest.java @@ -61,7 +61,7 @@ public void exceptionInterruptsScenario() { scenario.run(); - Mockito.verifyZeroInteractions(cmd2); + Mockito.verifyNoInteractions(cmd2); } @Test diff --git a/src/test/java/org/bma/vento/schedule/SchedulingServiceTest.java b/src/test/java/org/bma/vento/schedule/SchedulingServiceTest.java index 3607122..cdfea98 100644 --- a/src/test/java/org/bma/vento/schedule/SchedulingServiceTest.java +++ b/src/test/java/org/bma/vento/schedule/SchedulingServiceTest.java @@ -104,7 +104,7 @@ public void shouldNotHandleMissingRunsWhenDurabilityIsNotEnabled() { service.configureTasks(taskRegistrar); Mockito.verify(testCommand, Mockito.times(0)).run(); - Mockito.verifyZeroInteractions(store); + Mockito.verifyNoInteractions(store); } private ScheduleScenario simpleScenario() { From be9fb58a3e4cdae616e1ab95f53713867b1c4005 Mon Sep 17 00:00:00 2001 From: Maksym Bryzhko Date: Tue, 17 Dec 2024 19:41:49 +0200 Subject: [PATCH 2/4] Migrate to java 17 --- pom.xml | 12 ++++++------ src/main/java/org/bma/vento/VentoRemote.java | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e3b4842..581e3cc 100644 --- a/pom.xml +++ b/pom.xml @@ -61,12 +61,12 @@ compile - - - - - - + + commons-io + commons-io + 2.18.0 + compile + ch.qos.logback diff --git a/src/main/java/org/bma/vento/VentoRemote.java b/src/main/java/org/bma/vento/VentoRemote.java index 396261e..1534919 100644 --- a/src/main/java/org/bma/vento/VentoRemote.java +++ b/src/main/java/org/bma/vento/VentoRemote.java @@ -1,7 +1,6 @@ package org.bma.vento; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; import org.bma.vento.client.DefaultVentoClient; import org.bma.vento.client.RetryableVentoClient; import org.bma.vento.client.VentoClient; From 2f61298a12300dc57c5349b122a03ae5f0acf9ed Mon Sep 17 00:00:00 2001 From: Maksym Bryzhko Date: Tue, 17 Dec 2024 19:46:44 +0200 Subject: [PATCH 3/4] Migrate to java 17 --- .github/workflows/maven-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 03ddeeb..497e8cc 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -14,9 +14,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build with Maven run: mvn -B verify --file pom.xml From f801a4030c16f9d4c18127d89ab3131909dee669 Mon Sep 17 00:00:00 2001 From: Maksym Bryzhko Date: Sat, 15 Feb 2025 18:47:05 +0200 Subject: [PATCH 4/4] docker maven plugin --- .github/workflows/maven-release.yml | 7 ++ Dockerfile | 5 +- pom.xml | 106 +++++++++++++++++++--------- 3 files changed, 80 insertions(+), 38 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 13861ef..f014e00 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -14,12 +14,19 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Configure Git user run: | git config --global committer.email "noreply@github.com" diff --git a/Dockerfile b/Dockerfile index 5371e2b..e9e241e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -ARG IMG -FROM ${IMG} -MAINTAINER Maksym Bryzhko +FROM eclipse-temurin:17.0.13_11-jre-noble +LABEL org.opencontainers.image.authors="Maksym Bryzhko " ARG JAR_FILE ADD target/${JAR_FILE} /usr/share/vento-remote/vento-remote.jar diff --git a/pom.xml b/pom.xml index 581e3cc..965e8aa 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,6 @@ 2.2 2.0.16 - arm32v7/eclipse-temurin:17.0.13_11-jre-jammy - @@ -192,49 +190,87 @@ - com.spotify - dockerfile-maven-plugin - 1.4.13 + io.fabric8 + docker-maven-plugin + 0.45.1 - docker.pkg.github.com/mbryzhko/vento-remote/${project.artifactId}-arm32v7 - - ${env.GITHUB_ACTOR} - - ${env.GITHUB_TOKEN} - - ${project.build.finalName}-jar-with-dependencies.jar - lpicanco/java11-alpine - + + + docker.pkg.github.com/mbryzhko/vento-remote/${project.artifactId}-arm32v7 + + ${project.basedir} + + + linux/arm/v7 + linux/amd64 + + + + ${project.build.finalName}-jar-with-dependencies.jar + + + ${project.version} + + + + + + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} + - arm32v7 - - build - push - - - ${project.version} - - ${docker-img-name} - - - - - arm32v7-tag-latest + docker-build build - push - - latest - - ${docker-img-name} - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +