This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a95b1e8c5f Update version numbers
a95b1e8c5f is described below
commit a95b1e8c5ff5b83f83b18e9bf344cb6a49e240d7
Author: remm <[email protected]>
AuthorDate: Fri Jan 12 12:14:57 2024 +0100
Update version numbers
---
modules/openssl-foreign/pom.xml | 2 +-
modules/owb/pom.xml | 2 +-
modules/stuffed/Dockerfile | 9 +++------
modules/stuffed/pom.xml | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/modules/openssl-foreign/pom.xml b/modules/openssl-foreign/pom.xml
index 97aab2b6e7..4d2ff94042 100644
--- a/modules/openssl-foreign/pom.xml
+++ b/modules/openssl-foreign/pom.xml
@@ -31,7 +31,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
- <tomcat.version>10.1.16</tomcat.version>
+ <tomcat.version>10.1.18</tomcat.version>
<project.build.outputTimestamp>2021-12-02T12:00:00Z</project.build.outputTimestamp>
</properties>
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 25ec78f678..3bc4c63ac0 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -37,7 +37,7 @@
<jakarta-interceptor.version>2.1.0</jakarta-interceptor.version>
<jakarta-enterprise-cdi.version>4.0.1</jakarta-enterprise-cdi.version>
<jakarta-annotation-api.version>2.1.1</jakarta-annotation-api.version>
- <tomcat.version>10.1.15</tomcat.version>
+ <tomcat.version>10.1.18</tomcat.version>
</properties>
<dependencies>
diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 08484b9a2f..0ab94d3156 100644
--- a/modules/stuffed/Dockerfile
+++ b/modules/stuffed/Dockerfile
@@ -14,10 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:11-jre
-# FROM openjdk:17-jdk
-# Tomcat 10.1+ no longer supports Java 8
-# FROM openjdk:8-jre
+FROM eclipse-temurin:11-jre
VOLUME /tmp
USER root
@@ -49,13 +46,13 @@ RUN sh -c 'touch app.jar'
RUN mkdir -p /opt
# Optional: Add Jolokia agent for JMX monitoring and management
-# RUN mkdir /opt/jolokia && wget
https://repo.maven.apache.org/maven2/org/jolokia/jolokia-jvm/1.7.1/jolokia-jvm-1.7.1.jar
-O /opt/jolokia/jolokia.jar
+# RUN mkdir /opt/jolokia && wget
https://repo.maven.apache.org/maven2/org/jolokia/jolokia-jvm/1.7.2/jolokia-jvm-1.7.2.jar
-O /opt/jolokia/jolokia.jar
# ARG jolokiaport=8778
# ENV
JAVA_OPTS="-javaagent:/opt/jolokia/jolokia.jar=host=*,port=$jolokiaport,protocol=https,authIgnoreCerts=true
${JAVA_OPTS}"
# EXPOSE $jolokiaport
# Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar
-O /opt/prometheus/prometheus.jar && wget
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
-O conf/prometheus.yaml
+# RUN mkdir /opt/prometheus && wget
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar
-O /opt/prometheus/prometheus.jar && wget
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
-O conf/prometheus.yaml
# ARG prometheusport=9404
# ENV
JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml
${JAVA_OPTS}"
# EXPOSE $prometheusport
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index e418a11795..66d99c3a71 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mainClass>org.apache.catalina.startup.Tomcat</mainClass>
- <tomcat.version>10.1.16</tomcat.version>
+ <tomcat.version>10.1.18</tomcat.version>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
