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 8deed86273 Bump version number
8deed86273 is described below
commit 8deed8627362a0a0e202f833ec1e0541b2671402
Author: remm <[email protected]>
AuthorDate: Mon Mar 24 15:01:32 2025 +0100
Bump version number
Forgotten javax API use.
---
modules/cxf/pom.xml | 8 ++++----
modules/cxf/src/main/java/tomcat/cxf/JsonBean.java | 6 +++---
modules/jdbc-pool/pom.xml | 9 ++++-----
modules/owb/pom.xml | 6 +++---
modules/stuffed/pom.xml | 10 +++++++---
5 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index ee6f6a6368..8bb21b021b 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>33</version>
+ <version>34</version>
</parent>
<groupId>org.apache.tomcat</groupId>
@@ -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>4.1.0</version>
+ <version>4.1.1</version>
<packaging>jar</packaging>
<properties>
<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>
+ <jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
+ <johnzon.version>2.0.1</johnzon.version>
</properties>
<dependencies>
diff --git a/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java
b/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java
index 88ce138543..019d48cf75 100644
--- a/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java
+++ b/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java
@@ -16,9 +16,9 @@
*/
package tomcat.cxf;
-import javax.enterprise.context.Dependent;
-import javax.ws.rs.Produces;
-import javax.ws.rs.ext.Provider;
+import jakarta.enterprise.context.Dependent;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.ext.Provider;
import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider;
diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 986b90d959..30fee646ed 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>15</version>
+ <version>34</version>
</parent>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
- <version>8.0.15-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
- <version>10.1.0-M8</version>
+ <version>10.1.39</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
- <version>10.1.0-M8</version>
+ <version>10.1.39</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -111,7 +111,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>sign-artifacts</id>
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 27b996b7dc..eb6d4772ad 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>30</version>
+ <version>34</version>
</parent>
<groupId>org.apache.tomcat</groupId>
@@ -29,7 +29,7 @@
<name>Apache Tomcat CDI 4 support</name>
<description>Apache Tomcat CDI 4 support using Apache
OpenWebBeans</description>
<!-- This is the Apache OpenWebBeans version -->
- <version>4.0.2</version>
+ <version>4.0.3</version>
<packaging>jar</packaging>
<properties>
@@ -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.26</tomcat.version>
+ <tomcat.version>10.1.39</tomcat.version>
</properties>
<dependencies>
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index e759324e93..0e0e28206e 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -21,6 +21,12 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>34</version>
+ </parent>
+
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-stuffed</artifactId>
<version>1.0</version>
@@ -29,7 +35,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mainClass>org.apache.catalina.startup.Tomcat</mainClass>
- <tomcat.version>10.1.26</tomcat.version>
+ <tomcat.version>10.1.39</tomcat.version>
</properties>
<dependencies>
@@ -76,7 +82,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
<configuration>
<release>11</release>
</configuration>
@@ -84,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
