Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile.al2023
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.nvidia.cuda.12.5.1.ubuntu22.04
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile.python
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
14 changes: 7 additions & 7 deletions docker/Dockerfile.tomcat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <Manager> 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

# ---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubi8
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubi9
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubuntu22.04
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubuntu24.04
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 45 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@
<!-- Jackson 2.x. jackson-annotations tracks the minor line (2.22), while
core/databind/datatype ship patch releases off it (2.22.2), so the two
cannot share a single property. -->
<jackson2.version>2.22.2</jackson2.version>
<jackson2.version>2.22.3</jackson2.version>
<jackson2.annotations.version>2.22</jackson2.annotations.version>
<jackson3.version>3.1.5</jackson3.version>
<jackson3.version>3.1.7</jackson3.version>
<httpcore5.version>5.4.3</httpcore5.version>
<docx4j.version>11.5.14</docx4j.version>
<sesame.version>2.7.12</sesame.version>
<rdf4j.version>5.3.2</rdf4j.version>
<jena.version>6.2.0</jena.version>
<tinkerpop.version>3.7.6</tinkerpop.version>
<tinkerpop.version>3.7.7</tinkerpop.version>
<poi.version>5.5.1</poi.version>
<jna.version>5.18.1</jna.version>
<quartz.version>2.5.2</quartz.version>
Expand Down Expand Up @@ -661,10 +661,34 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.137.Final</version>
<version>4.1.138.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- converge reactor for the enforcer: reactor-netty 1.2.18 declares reactor-core 3.7.19 and
azure-core-http-netty declares reactor-netty 1.2.8. Also declared directly below so
the versions carry into Monolith. -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.8.7</version>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
<version>1.2.18</version>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.2.18</version>
</dependency>
<!-- reactor-core 3.8 brings jspecify 1.0.1; caffeine/selenium still declare 1.0.0 -->
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>1.0.1</version>
</dependency>
<!-- Source: https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
<dependency>
<groupId>tools.jackson.core</groupId>
Expand Down Expand Up @@ -2642,7 +2666,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.9.5</version>
<version>3.9.6</version>
<exclusions>
<exclusion>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -2833,7 +2857,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.8</version>
<version>1.1.10.10</version>
</dependency>
<!-- Source: https://mvnrepository.com/artifact/org.apache.tika/tika-core -->
<dependency>
Expand Down Expand Up @@ -3167,7 +3191,7 @@
<dependency>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
<artifactId>owasp-java-html-sanitizer</artifactId>
<version>20260101.1</version>
<version>20260924.2</version>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
Expand Down Expand Up @@ -3225,7 +3249,20 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.7.8</version>
<version>3.8.7</version>
</dependency>
<!-- Stay on reactor-netty 1.2.x: 1.3.x requires Netty 4.2 and we are on 4.1. 1.2.18 is the
latest 1.2.x and runs on reactor-core 3.8. Declared directly, not managed, so the
version also wins in Monolith (azure-core-http-netty would otherwise pull 1.2.8) -->
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
<version>1.2.18</version>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>1.2.18</version>
</dependency>
<!-- Source: https://mvnrepository.com/artifact/com.fasterxml.uuid/java-uuid-generator -->
<dependency>
Expand Down