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 7d19b0f92c Update CXF
7d19b0f92c is described below
commit 7d19b0f92c2e582528ac1f922721f8e1c02d381e
Author: remm <r...@apache.org>
AuthorDate: Wed Mar 27 23:12:25 2024 +0100
Update CXF
Still EE 10 compatibility issues.
---
modules/cxf/pom.xml | 4 ++--
modules/cxf/src/main/java/tomcat/cxf/JsonBean.java | 6 +++---
modules/cxf/src/main/resources/META-INF/beans.xml | 6 +++---
modules/cxf/src/main/resources/META-INF/web-fragment.xml | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 2f3690c4ef..9aa15ecce1 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>4.0.3</version>
+ <version>4.0.4</version>
<packaging>jar</packaging>
<properties>
@@ -97,7 +97,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <release>21</release>
+ <release>17</release>
</configuration>
</plugin>
<plugin>
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/cxf/src/main/resources/META-INF/beans.xml
b/modules/cxf/src/main/resources/META-INF/beans.xml
index d48340296f..e21852ff29 100644
--- a/modules/cxf/src/main/resources/META-INF/beans.xml
+++ b/modules/cxf/src/main/resources/META-INF/beans.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd";
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd";
bean-discovery-mode="annotated"
- version="2.0">
+ version="4.0">
<exclude name="com.*" />
<exclude name="javax.*" />
<exclude name="mozilla.*" />
diff --git a/modules/cxf/src/main/resources/META-INF/web-fragment.xml
b/modules/cxf/src/main/resources/META-INF/web-fragment.xml
index 75ec8dbca6..e55f6921bd 100644
--- a/modules/cxf/src/main/resources/META-INF/web-fragment.xml
+++ b/modules/cxf/src/main/resources/META-INF/web-fragment.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0">
<name>tomcat-cxf</name>
<ordering>
<before>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
