From 33c3c76723f5263019fdfd6172be34668293ab69 Mon Sep 17 00:00:00 2001 From: Lucas Welscher Date: Sun, 2 Jun 2024 17:44:25 +0200 Subject: [PATCH 1/4] fix build by using a fixed maven version --- Dockerfile | 2 +- artemis-java-template/build.gradle | 2 +- artemis-java-template/pom.xml | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c5b8f9..a055081 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3-eclipse-temurin-17 +FROM maven:3.9.3-eclipse-temurin-17 MAINTAINER Stephan Krusche diff --git a/artemis-java-template/build.gradle b/artemis-java-template/build.gradle index e932203..e5db5c2 100644 --- a/artemis-java-template/build.gradle +++ b/artemis-java-template/build.gradle @@ -110,7 +110,7 @@ pmd { ruleSets = ["$scaConfigDirectory/pmd-configuration.xml"] rulesMinimumPriority = 5 ignoreFailures = true - toolVersion = '7.0.0' + toolVersion = '7.2.0' // exclude the test files pmdTest.enabled = false pmdMain.reports { diff --git a/artemis-java-template/pom.xml b/artemis-java-template/pom.xml index 060b2d3..6b32867 100644 --- a/artemis-java-template/pom.xml +++ b/artemis-java-template/pom.xml @@ -9,10 +9,10 @@ UTF-8 -Dfile.encoding=UTF-8 - 17.0.8 - 5.11.0 - 3.2.4 - 1.14.13 + 17.0.11 + 5.12.0 + 3.3.0 + 1.14.17 ${project.basedir}/staticCodeAnalysisConfig false @@ -77,7 +77,7 @@ com.fasterxml.jackson.core jackson-databind - 2.17.0 + 2.17.1 org.jsonschema2pojo @@ -260,7 +260,7 @@ org.eclipse.tycho tycho-compiler-jdt - 4.0.7 + 4.0.8 @@ -339,7 +339,7 @@ com.puppycrawl.tools checkstyle - 10.15.0 + 10.17.0 @@ -359,12 +359,12 @@ net.sourceforge.pmd pmd-core - 7.0.0 + 7.2.0 net.sourceforge.pmd pmd-java - 7.0.0 + 7.2.0 From 41901d9750fdc85b95840002628f250e63114ca8 Mon Sep 17 00:00:00 2001 From: Lucas Welscher Date: Sun, 2 Jun 2024 17:51:58 +0200 Subject: [PATCH 2/4] try reverting javafx version upgrade --- artemis-java-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artemis-java-template/pom.xml b/artemis-java-template/pom.xml index 6b32867..849f428 100644 --- a/artemis-java-template/pom.xml +++ b/artemis-java-template/pom.xml @@ -9,7 +9,7 @@ UTF-8 -Dfile.encoding=UTF-8 - 17.0.11 + 17.0.8 5.12.0 3.3.0 1.14.17 From 0ac9be7bb4b10d664e75e790311cba7e8b5f9eec Mon Sep 17 00:00:00 2001 From: Lucas Welscher Date: Sun, 2 Jun 2024 18:44:15 +0200 Subject: [PATCH 3/4] Update Dockerfile Co-authored-by: Stephan Krusche --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a055081..4dfb0a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.9.3-eclipse-temurin-17 +FROM maven:3.9.7-eclipse-temurin-17 MAINTAINER Stephan Krusche From 384beff87feb1027c564dea0d1771da187bb886e Mon Sep 17 00:00:00 2001 From: Lucas Welscher Date: Sun, 2 Jun 2024 18:47:20 +0200 Subject: [PATCH 4/4] use 3.9.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4dfb0a8..2ecd1d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.9.7-eclipse-temurin-17 +FROM maven:3.9.6-eclipse-temurin-17 MAINTAINER Stephan Krusche