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 d2f30cf Update to CXF 3.4.0
new 38e42dd Merge branch 'master' of g...@github.com:apache/tomcat.git
d2f30cf is described below
commit d2f30cf0760c0ef3f6a2b3945411618fe8411a46
Author: remm <r...@apache.org>
AuthorDate: Thu Sep 24 15:08:06 2020 +0200
Update to CXF 3.4.0
---
modules/cxf/pom.xml | 10 ++++------
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 220ae64..aa869ad 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
<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.3.6</version>
+ <version>3.4.0</version>
<packaging>jar</packaging>
<properties>
@@ -127,11 +127,9 @@
<!-- Already present in Tomcat or in the
CDI bundle -->
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.el:*</exclude>
-
<exclude>javax.annotation:javax.annotation-api</exclude>
- <exclude>javax.el:*</exclude>
-
<exclude>javax.enterprise:cdi-api</exclude>
-
<exclude>javax.inject:*</exclude>
-
<exclude>javax.interceptor:*</exclude>
+
<exclude>jakarta.enterprise:jakarta.enterprise.cdi-api</exclude>
+
<exclude>jakarta.inject:*</exclude>
+
<exclude>jakarta.interceptor:*</exclude>
<!--
Exclude other unneeded dependencies -->
<exclude>org.apache.ant:*</exclude>
<exclude>org.codehaus.woodstox:*</exclude>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a6d3b84..f58a592 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,6 +159,9 @@
<update>
Update the OWB module to Apache OpenWebBeans 2.0.18. (remm)
</update>
+ <update>
+ Update the CXF module to Apache CXF 3.4.0. (remm)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
