This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 199f501 Update to CXF 3.4.0 199f501 is described below commit 199f501ad225154fcb8a307ddd645f83bd6dada8 Author: remm <r...@apache.org> AuthorDate: Thu Sep 24 16:04:22 2020 +0200 Update to CXF 3.4.0 --- modules/cxf/pom.xml | 14 ++++++++------ webapps/docs/changelog.xml | 3 +++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 5fe8f7d..84aec80 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> @@ -125,11 +125,12 @@ <artifactSet> <excludes> <!-- Already present in Tomcat or in the CDI bundle --> - <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.activation:*</exclude> + <exclude>jakarta.annotation:jakarta.annotation-api</exclude> + <exclude>jakarta.el:*</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> @@ -152,6 +153,7 @@ <exclude>META-INF/NOTICE.txt</exclude> <exclude>META-INF/NOTICE</exclude> <!-- Unneeded configuration files --> + <exclude>module-info.class</exclude> <exclude>META-INF/cxf/cxf.*</exclude> <exclude>META-INF/cxf/cxf-servlet.*</exclude> <exclude>META-INF/cxf/org.apache.cxf.bus.factory</exclude> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index be4a6f9..32c2ba7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -163,6 +163,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