This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new e3b41e3 Update version numbers
e3b41e3 is described below
commit e3b41e3b6aacf660115abeed88b1b5227eb577bd
Author: remm <[email protected]>
AuthorDate: Wed Mar 20 23:08:23 2019 +0100
Update version numbers
---
res/tomcat-maven/Dockerfile | 2 +-
res/tomcat-maven/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/tomcat-maven/Dockerfile b/res/tomcat-maven/Dockerfile
index 2e5f0fa..8796dc0 100644
--- a/res/tomcat-maven/Dockerfile
+++ b/res/tomcat-maven/Dockerfile
@@ -47,7 +47,7 @@ RUN mkdir /opt
# EXPOSE $jolokiaport
# Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget
http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.10/jmx_prometheus_javaagent-0.10.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
http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.11.0/jmx_prometheus_javaagent-0.11.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/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
index 9036134..7630803 100644
--- a/res/tomcat-maven/pom.xml
+++ b/res/tomcat-maven/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mainClass>org.apache.catalina.startup.Tomcat</mainClass>
- <tomcat.version>9.0.16</tomcat.version>
+ <tomcat.version>9.0.17</tomcat.version>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
