From 5d317601e298898a283d48c7dc289de47f12d047 Mon Sep 17 00:00:00 2001 From: Kunal Patel Date: Wed, 7 Oct 2026 13:43:27 -0400 Subject: [PATCH] fix: upgrade mvn libs and maven in docker --- docker/Dockerfile.al2023 | 2 +- .../Dockerfile.nvidia.cuda.12.5.1.ubuntu22.04 | 2 +- docker/Dockerfile.python | 4 +- docker/Dockerfile.tomcat | 14 ++--- docker/Dockerfile.ubi8 | 2 +- docker/Dockerfile.ubi9 | 2 +- docker/Dockerfile.ubuntu22.04 | 2 +- docker/Dockerfile.ubuntu24.04 | 2 +- pom.xml | 53 ++++++++++++++++--- 9 files changed, 61 insertions(+), 22 deletions(-) diff --git a/docker/Dockerfile.al2023 b/docker/Dockerfile.al2023 index d555b0aec92..0a78f699bf1 100644 --- a/docker/Dockerfile.al2023 +++ b/docker/Dockerfile.al2023 @@ -16,7 +16,7 @@ ARG TOMCAT_VERSION=11.0.24 # boots cleanly while being non-compliant. ARG TOMCAT_TAG_SUFFIX= ARG JAVA_HOME=/usr/lib/jvm/zulu25 -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 #setting up the tomcat builder for later below. this is for env var expansion. FROM quay.io/semoss/tomcat-builder:${TOMCAT_VERSION}${TOMCAT_TAG_SUFFIX} AS tomcat_builder diff --git a/docker/Dockerfile.nvidia.cuda.12.5.1.ubuntu22.04 b/docker/Dockerfile.nvidia.cuda.12.5.1.ubuntu22.04 index dbba3857e1d..4e7bdd957be 100755 --- a/docker/Dockerfile.nvidia.cuda.12.5.1.ubuntu22.04 +++ b/docker/Dockerfile.nvidia.cuda.12.5.1.ubuntu22.04 @@ -15,7 +15,7 @@ ARG TOMCAT_VERSION=11.0.24 # boots cleanly while being non-compliant. ARG TOMCAT_TAG_SUFFIX= ARG JAVA_HOME=/usr/lib/jvm/zulu25 -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 #setting up the tomcat builder for later below. this is for env var expansion. FROM quay.io/semoss/tomcat-builder:${TOMCAT_VERSION}${TOMCAT_TAG_SUFFIX} AS tomcat_builder diff --git a/docker/Dockerfile.python b/docker/Dockerfile.python index f98ca1ee91b..3c7762c98d4 100644 --- a/docker/Dockerfile.python +++ b/docker/Dockerfile.python @@ -67,8 +67,10 @@ RUN uv venv --seed $VIRTUAL_ENV RUN echo "COMPUTE_TYPE=${COMPUTE_TYPE}" && echo ".[${COMPUTE_TYPE}]" +# ADD (not curl) so the layer cache invalidates whenever dev's pyproject changes; +# with curl the RUN text never changed and rebuilds reused stale resolutions. +ADD https://raw.githubusercontent.com/SEMOSS/Semoss/refs/heads/dev/py/install_config/pyproject.toml /tmp/pyproject.toml RUN cd /tmp && \ - curl -o pyproject.toml https://raw.githubusercontent.com/SEMOSS/Semoss/refs/heads/dev/py/install_config/pyproject.toml && \ uv pip install ".[${COMPUTE_TYPE}]" && \ uv pip install "levenshtein>=0.27.3" diff --git a/docker/Dockerfile.tomcat b/docker/Dockerfile.tomcat index 686294d6db4..ac57e175642 100644 --- a/docker/Dockerfile.tomcat +++ b/docker/Dockerfile.tomcat @@ -43,7 +43,7 @@ ARG BCPKIX_FIPS_VERSION=2.1.12 ARG BCUTIL_FIPS_VERSION=2.1.7 # Maven default version -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 # Tomcat default version ARG TOMCAT_VERSION=11.0.24 @@ -122,19 +122,19 @@ RUN apt-get -y install apt-transport-https ca-certificates git wget dirmngr gnup && echo '# container environment variables. Tomcat keeps its SystemPropertySource too,' >> $TOMCAT_HOME/bin/setenv.sh \ && echo '# so -D overrides still work. Used by the in conf/context.xml.' >> $TOMCAT_HOME/bin/setenv.sh \ && echo 'CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource"' >> $TOMCAT_HOME/bin/setenv.sh \ - && wget https://archive.apache.org/dist/maven/maven-3/3.9.14/binaries/apache-maven-3.9.14-bin.tar.gz\ + && wget https://archive.apache.org/dist/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.tar.gz\ && tar -zxvf apache-maven-*.tar.gz \ - && mkdir /opt/apache-maven-3.9.14 \ - && mv apache-maven-3.9.14/* /opt/apache-maven-3.9.14/ \ - && rm -r apache-maven-3.9.14 \ - && rm apache-maven-3.9.14-bin.tar.gz \ + && mkdir /opt/apache-maven-3.9.16 \ + && mv apache-maven-3.9.16/* /opt/apache-maven-3.9.16/ \ + && rm -r apache-maven-3.9.16 \ + && rm apache-maven-3.9.16-bin.tar.gz \ && apt-get -y install nano \ && echo '#!/bin/sh' > $TOMCAT_HOME/bin/start.sh \ && echo 'exec catalina.sh run' >> $TOMCAT_HOME/bin/start.sh \ && echo '#!/bin/sh' > $TOMCAT_HOME/bin/stop.sh \ && echo 'shutdown.sh -force' >> $TOMCAT_HOME/bin/stop.sh \ && chmod 777 $TOMCAT_HOME/bin/*.sh \ - && chmod 777 /opt/apache-maven-3.9.14/bin/*.cmd \ + && chmod 777 /opt/apache-maven-3.9.16/bin/*.cmd \ && apt-get clean all # --------------------------------------------------------------------------- diff --git a/docker/Dockerfile.ubi8 b/docker/Dockerfile.ubi8 index 58c9a646e0d..1fb5fee60b4 100644 --- a/docker/Dockerfile.ubi8 +++ b/docker/Dockerfile.ubi8 @@ -15,7 +15,7 @@ ARG TOMCAT_VERSION=11.0.24 # boots cleanly while being non-compliant. ARG TOMCAT_TAG_SUFFIX= ARG JAVA_HOME=/usr/lib/jvm/zulu25 -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 #setting up the tomcat builder for later below. this is for env var expansion. FROM quay.io/semoss/tomcat-builder:${TOMCAT_VERSION}${TOMCAT_TAG_SUFFIX} AS tomcat_builder diff --git a/docker/Dockerfile.ubi9 b/docker/Dockerfile.ubi9 index 72b292a7d72..3e657634303 100644 --- a/docker/Dockerfile.ubi9 +++ b/docker/Dockerfile.ubi9 @@ -15,7 +15,7 @@ ARG TOMCAT_VERSION=11.0.24 # boots cleanly while being non-compliant. ARG TOMCAT_TAG_SUFFIX= ARG JAVA_HOME=/usr/lib/jvm/zulu25 -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 #setting up the tomcat builder for later below. this is for env var expansion. FROM quay.io/semoss/tomcat-builder:${TOMCAT_VERSION}${TOMCAT_TAG_SUFFIX} AS tomcat_builder diff --git a/docker/Dockerfile.ubuntu22.04 b/docker/Dockerfile.ubuntu22.04 index 2f4e0a48c4e..18eaaeada33 100644 --- a/docker/Dockerfile.ubuntu22.04 +++ b/docker/Dockerfile.ubuntu22.04 @@ -16,7 +16,7 @@ ARG TOMCAT_VERSION=11.0.24 # boots cleanly while being non-compliant. ARG TOMCAT_TAG_SUFFIX= ARG JAVA_HOME=/usr/lib/jvm/zulu25 -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 #setting up the tomcat builder for later below. this is for env var expansion. FROM quay.io/semoss/tomcat-builder:${TOMCAT_VERSION}${TOMCAT_TAG_SUFFIX} AS tomcat_builder diff --git a/docker/Dockerfile.ubuntu24.04 b/docker/Dockerfile.ubuntu24.04 index 25416b2ba64..ee8d73ab07e 100644 --- a/docker/Dockerfile.ubuntu24.04 +++ b/docker/Dockerfile.ubuntu24.04 @@ -16,7 +16,7 @@ ARG TOMCAT_VERSION=11.0.24 # boots cleanly while being non-compliant. ARG TOMCAT_TAG_SUFFIX= ARG JAVA_HOME=/usr/lib/jvm/zulu25 -ARG MAVEN_HOME=/opt/apache-maven-3.9.14 +ARG MAVEN_HOME=/opt/apache-maven-3.9.16 #setting up the tomcat builder for later below. this is for env var expansion. FROM quay.io/semoss/tomcat-builder:${TOMCAT_VERSION}${TOMCAT_TAG_SUFFIX} AS tomcat_builder diff --git a/pom.xml b/pom.xml index 5e4463fc72a..c7e9ef0f64e 100644 --- a/pom.xml +++ b/pom.xml @@ -59,15 +59,15 @@ - 2.22.2 + 2.22.3 2.22 - 3.1.5 + 3.1.7 5.4.3 11.5.14 2.7.12 5.3.2 6.2.0 - 3.7.6 + 3.7.7 5.5.1 5.18.1 2.5.2 @@ -661,10 +661,34 @@ io.netty netty-bom - 4.1.137.Final + 4.1.138.Final pom import + + + io.projectreactor + reactor-core + 3.8.7 + + + io.projectreactor.netty + reactor-netty-core + 1.2.18 + + + io.projectreactor.netty + reactor-netty-http + 1.2.18 + + + + org.jspecify + jspecify + 1.0.1 + tools.jackson.core @@ -2642,7 +2666,7 @@ org.apache.zookeeper zookeeper - 3.9.5 + 3.9.6 commons-io @@ -2833,7 +2857,7 @@ org.xerial.snappy snappy-java - 1.1.10.8 + 1.1.10.10 @@ -3167,7 +3191,7 @@ com.googlecode.owasp-java-html-sanitizer owasp-java-html-sanitizer - 20260101.1 + 20260924.2 com.github.jai-imageio @@ -3225,7 +3249,20 @@ io.projectreactor reactor-core - 3.7.8 + 3.8.7 + + + + io.projectreactor.netty + reactor-netty-core + 1.2.18 + + + io.projectreactor.netty + reactor-netty-http + 1.2.18