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 8c60d0e Update CDI and CXF support 8c60d0e is described below commit 8c60d0e573c5745ec8100a7814216b9b92596cfc Author: remm <r...@apache.org> AuthorDate: Tue Feb 25 16:27:19 2020 +0100 Update CDI and CXF support Document support in Tomcat 10 after testing it, the tool works out. CDI shade JAR should be migrated to Jakarta by the tool. A MP webapp should go through the tool as a whole. --- modules/cxf/pom.xml | 10 ++++++---- modules/owb/pom.xml | 6 +++--- webapps/docs/cdi.xml | 8 +++++++- webapps/docs/changelog.xml | 10 ++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 2015ff0..a8d54c5 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.3.4</version> + <version>3.3.5</version> <packaging>jar</packaging> <properties> <geronimo-jcdi.version>1.0.1</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.1</johnzon.version> + <johnzon.version>1.2.3</johnzon.version> </properties> <dependencies> @@ -96,7 +96,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.8.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -105,7 +105,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> + <version>3.2.1</version> <executions> <execution> <phase>package</phase> @@ -127,6 +127,8 @@ <!-- 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> diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index 087bc07..4f512c1 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.13</version> + <version>2.0.15</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>9.0.30</tomcat.version> + <tomcat.version>10.0.0-M1</tomcat.version> </properties> <dependencies> @@ -86,7 +86,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.8.1</version> <configuration> <source>1.8</source> <target>1.8</target> diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml index e9cea2c..5c814c2 100644 --- a/webapps/docs/cdi.xml +++ b/webapps/docs/cdi.xml @@ -59,7 +59,8 @@ mvn clean && mvn package]]></source> The resulting JAR at <code>target/tomcat-owb-x.y.z.jar</code> (where x.y.z depends on the Apache OpenWebBeans version used during the build) - should then be placed into the <code>lib</code> folder of the Tomcat + should be processed by the Tomcat migration tool for Jakarta EE, and + then be placed into the <code>lib</code> folder of the Tomcat installation.<br/> CDI support can then be enabled for all webapps in the container by adding the following listener in <code>server.xml</code> nested inside the @@ -107,6 +108,11 @@ mvn clean && mvn package]]></source> desired root path where JAX-RS resources will be available. </p> + <p> + The webapp as a whole should be processed by the Tomcat migration tool for + Jakarta EE. + </p> + </section> <section name="Eclipse Microprofile support"> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cb4b51f..5632768 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -85,6 +85,16 @@ </fix> </changelog> </subsection> + <subsection name="Other"> + <changelog> + <update> + Update the OWB module to Apache OpenWebBeans 2.0.15. (remm) + </update> + <update> + Update the CXF module to Apache CXF 3.3.5. (remm) + </update> + </changelog> + </subsection> </section> <section name="Tomcat 10.0.0-M1 (markt)" rtext="2020-02-20"> <subsection name="General"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org