This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d429feef43 Update version numbers
d429feef43 is described below
commit d429feef43833ff9a5987f21ef36f8203e4b2cda
Author: remm <[email protected]>
AuthorDate: Fri Jan 12 12:11:27 2024 +0100
Update version numbers
---
modules/cxf/pom.xml | 45 ++++++++++++++++++++++++++-------------------
modules/owb/pom.xml | 4 ++--
modules/stuffed/Dockerfile | 9 +++------
modules/stuffed/pom.xml | 2 +-
4 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index ac7ed8fce3..2f3690c4ef 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>26</version>
+ <version>30</version>
</parent>
<groupId>org.apache.tomcat</groupId>
@@ -29,32 +29,32 @@
<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.5.3</version>
+ <version>4.0.3</version>
<packaging>jar</packaging>
<properties>
- <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.18</johnzon.version>
+ <jakarta-enterprise-cdi.version>4.0.1</jakarta-enterprise-cdi.version>
+ <jakarta.json-api.version>2.1.3</jakarta.json-api.version>
+ <jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
+ <johnzon.version>2.0.0</johnzon.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>${geronimo-jcdi.version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- <version>${javax.json-api.version}</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jakarta.json-api.version}</version>
</dependency>
<dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
- <version>${javax.json.bind-api.version}</version>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
+ <version>${jakarta.json.bind-api.version}</version>
</dependency>
<!-- Apache CXF -->
<dependency>
@@ -96,16 +96,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>21</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -143,14 +140,24 @@
</excludes>
</artifactSet>
<filters>
+ <filter>
+
<artifact>org.apache.johnzon:johnzon-jsonb</artifact>
+ <excludes>
+
<exclude>META-INF/services/jakarta.enterprise.inject.spi.Extension</exclude>
+ </excludes>
+ </filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
+
<exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/LICENSE.md</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/NOTICE.md</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
<exclude>META-INF/NOTICE</exclude>
<!-- Unneeded configuration files -->
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 25ec78f678..3d7ba5f8cc 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>11.0.0-M16</tomcat.version>
</properties>
<dependencies>
@@ -98,7 +98,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <release>11</release>
+ <release>21</release>
</configuration>
</plugin>
<plugin>
diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 08484b9a2f..14eabd10dd 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:21-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 0185fbb1a3..a45c58b901 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>11.0.0-M14</tomcat.version>
+ <tomcat.version>11.0.0-M16</tomcat.version>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
