From 1f5a05e4fdda2e96a7ff823f008dc7a2452ce1fe Mon Sep 17 00:00:00 2001 From: Miguel Ceriani Date: Sun, 11 May 2025 10:52:37 +0200 Subject: [PATCH 1/6] Fix war plugin version --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2eefed4..2374054 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,11 @@ tomcat7-maven-plugin 2.2 + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + org.eclipse.jetty jetty-maven-plugin From ca0a30cf56c225514024385c00c32f9e03133ac7 Mon Sep 17 00:00:00 2001 From: Miguel Ceriani Date: Wed, 11 Mar 2026 13:03:20 +0100 Subject: [PATCH 2/6] Update maven war plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2374054..7605535 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ org.apache.maven.plugins maven-war-plugin - 3.4.0 + 3.5.1 org.eclipse.jetty From d615d7909f19b1b48aed3436aaea7942bb93cec3 Mon Sep 17 00:00:00 2001 From: Miguel Ceriani Date: Wed, 11 Mar 2026 13:10:01 +0100 Subject: [PATCH 3/6] Update Jena version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7605535..153033a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.apache.jena apache-jena-libs pom - 4.4.0 + 6.0.0 From ac0c8de08a3023e9c6a3c6873fa95a4b9f2cc114 Mon Sep 17 00:00:00 2001 From: Miguel Ceriani Date: Wed, 11 Mar 2026 13:12:06 +0100 Subject: [PATCH 4/6] Go back to Jena version 4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 153033a..0e4390a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.apache.jena apache-jena-libs pom - 6.0.0 + 4.10.0 From 4d79d5811acbfe810b3f5b95e4f3a8f8491405e6 Mon Sep 17 00:00:00 2001 From: Miguel Ceriani Date: Wed, 11 Mar 2026 15:34:55 +0100 Subject: [PATCH 5/6] Back to Jena version 4.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e4390a..7605535 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.apache.jena apache-jena-libs pom - 4.10.0 + 4.4.0 From 544a26de4a06d7f10289868876a8c8e6da1a85ee Mon Sep 17 00:00:00 2001 From: Miguel Ceriani Date: Thu, 12 Mar 2026 08:32:30 +0100 Subject: [PATCH 6/6] Fix JDK version for Tomcat image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4f1430..52e4190 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY . /app RUN mvn compile war:war # Tomcat 10 needs further changes, see https://tomcat.apache.org/migration-10.html -FROM tomcat:9 +FROM tomcat:9-jdk11 LABEL maintainer=adrian.gschwend@zazuko.com ENV CATALINA_OPTS="-XX:+UseSerialGC" COPY --from=builder /app/target/lodview.war /usr/local/tomcat/webapps/lodview.war