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 8b8d7e1 Update version numbers 8b8d7e1 is described below commit 8b8d7e1f72b9dee6eff0ebd468340511e1298580 Author: remm <r...@apache.org> AuthorDate: Wed Nov 18 10:17:19 2020 +0100 Update version numbers Some cleanups. --- modules/cxf/pom.xml | 7 ++++--- modules/owb/pom.xml | 10 +++++----- modules/stuffed/Dockerfile | 2 +- modules/stuffed/pom.xml | 4 ++-- webapps/docs/changelog.xml | 10 ++++++++++ 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 495ec6b..57ae446 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -29,14 +29,14 @@ <name>Apache CXF for Apache Tomcat CDI</name> <description>Apache CXF packaged for Apache Tomcat CDI</description> <!-- This is the Apache CXF version --> - <version>3.4.0</version> + <version>3.4.1</version> <packaging>jar</packaging> <properties> - <geronimo-jcdi.version>1.0.1</geronimo-jcdi.version> + <geronimo-jcdi.version>1.3</geronimo-jcdi.version> <javax.json-api.version>1.1.4</javax.json-api.version> <javax.json.bind-api.version>1.0</javax.json.bind-api.version> - <johnzon.version>1.2.4</johnzon.version> + <johnzon.version>1.2.8</johnzon.version> </properties> <dependencies> @@ -132,6 +132,7 @@ <exclude>jakarta.inject:*</exclude> <exclude>jakarta.interceptor:*</exclude> <!-- Exclude other unneeded dependencies --> + <exclude>org.apache.geronimo.specs:geronimo-jta_1.1_spec</exclude> <exclude>org.apache.ant:*</exclude> <exclude>org.codehaus.woodstox:*</exclude> <exclude>org.glassfish.jaxb:*</exclude> diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index b62360d..b8a88eb 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -29,14 +29,14 @@ <name>Apache Tomcat CDI 2 support</name> <description>Apache Tomcat CDI 2 support using Apache OpenWebBeans</description> <!-- This is the Apache OpenWebBeans version --> - <version>2.0.18</version> + <version>2.0.20</version> <packaging>jar</packaging> <properties> - <geronimo-atinject.version>1.0</geronimo-atinject.version> - <geronimo-interceptor.version>1.0</geronimo-interceptor.version> - <geronimo-jcdi.version>1.0.1</geronimo-jcdi.version> - <tomcat.version>10.0.0-M8</tomcat.version> + <geronimo-atinject.version>1.2</geronimo-atinject.version> + <geronimo-interceptor.version>1.2</geronimo-interceptor.version> + <geronimo-jcdi.version>1.3</geronimo-jcdi.version> + <tomcat.version>10.0.0-M10</tomcat.version> </properties> <dependencies> diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile index 83e5b6e..3cb4176 100644 --- a/modules/stuffed/Dockerfile +++ b/modules/stuffed/Dockerfile @@ -48,7 +48,7 @@ RUN mkdir -p /opt # 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.13.0/jmx_prometheus_javaagent-0.13.0.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.14.0/jmx_prometheus_javaagent-0.14.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 c8dfa78..6d0b6b6 100644 --- a/modules/stuffed/pom.xml +++ b/modules/stuffed/pom.xml @@ -29,8 +29,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <mainClass>org.apache.catalina.startup.Tomcat</mainClass> - <tomcat.version>10.0.0-M8</tomcat.version> - <!-- <tomcat.version>9.0.38</tomcat.version> --> + <tomcat.version>10.0.0-M10</tomcat.version> + <!-- <tomcat.version>9.0.40</tomcat.version> --> </properties> <dependencies> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 68f74dd..f19b41f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -45,6 +45,16 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 10.0.0-M11 (markt)" rtext="in development"> + <subsection name="Other"> + <changelog> + <update> + Update the OWB module to Apache OpenWebBeans 2.0.20. (remm) + </update> + <update> + Update the CXF module to Apache CXF 3.4.1. (remm) + </update> + </changelog> + </subsection> </section> <section name="Tomcat 10.0.0-M10 (markt)" rtext="release in progress"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org