You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2023/12/13 18:03:54 UTC

(servicemix-bundles) branch master updated: SM-5649: Fix jakarta namespace in Spring 6 bundles

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a35fc089 SM-5649: Fix jakarta namespace in Spring 6 bundles
2a35fc089 is described below

commit 2a35fc089f46834cc0c1eccbdfc2eb5bb30c8ec5
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Dec 13 19:02:10 2023 +0100

    SM-5649: Fix jakarta namespace in Spring 6 bundles
---
 pom.xml                               | 19 ++++++++++++++++++
 spring-aspects-6.0.12/pom.xml         |  4 ++--
 spring-beans-6.0.12/pom.xml           |  6 +++---
 spring-context-6.0.12/pom.xml         | 36 +++++++++++++++++------------------
 spring-context-support-6.0.12/pom.xml |  6 +++---
 spring-core-6.0.12/pom.xml            | 18 +++++++++---------
 spring-jdbc-6.0.12/pom.xml            |  4 ++--
 spring-jms-6.0.12/pom.xml             |  6 +++---
 spring-messaging-6.0.12/pom.xml       |  4 ++--
 spring-orm-6.0.12/pom.xml             | 16 ++++++++--------
 spring-oxm-6.0.12/pom.xml             | 30 ++++++++++++++---------------
 spring-test-6.0.12/pom.xml            | 34 ++++++++++++++++-----------------
 spring-tx-6.0.12/pom.xml              |  6 +++---
 spring-web-6.0.12/pom.xml             | 20 +++++++++----------
 spring-webmvc-6.0.12/pom.xml          | 12 ++++++------
 spring-websocket-6.0.12/pom.xml       |  8 ++++----
 16 files changed, 124 insertions(+), 105 deletions(-)

diff --git a/pom.xml b/pom.xml
index d33a325d3..e86d2b265 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,25 @@
       <module>kafka-streams-3.6.1</module>
       <module>kafka_2.12-3.6.1</module>
       <module>kafka_2.13-3.6.1</module>
+      <module>spring-aop-6.0.12</module>
+      <module>spring-aspects-6.0.12</module>
+      <module>spring-beans-6.0.12</module>
+      <module>spring-context-6.0.12</module>
+      <module>spring-context-suiupport-6.0.12</module>
+      <module>spring-core-6.0.12</module>
+      <module>spring-expression-6.0.12</moduile>
+      <module>spring-instrument-6.0.12</module>i
+      <module>spring-jdbc-6.0.12</module>
+      <module>spring-jms-6.0.12</module>
+      <module>spring-messaging-6.0.12</module>
+      <module>spring-orm-6.0.12</module>
+      <module>spring-oxm-6.0.12</module>
+      <module>spring-test-6.0.12</module>
+      <module>spring-tx-6.0.12</module>
+      <module>spring-web-6.0.12</module>
+      <module>spring-webflux-6.0.12</module>
+      <module>spring-webmvc-6.0.12</module>
+      <module>spring-websocket-6.0.12</module>
     </modules>
 
 </project>
diff --git a/spring-aspects-6.0.12/pom.xml b/spring-aspects-6.0.12/pom.xml
index 628ee8883..db4e7806c 100644
--- a/spring-aspects-6.0.12/pom.xml
+++ b/spring-aspects-6.0.12/pom.xml
@@ -51,8 +51,8 @@
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             javax.cache.annotation;resolution:=optional,
-            javax.interceptor;resolution:=optional,
-            javax.transaction;version="[1.2,2)";resolution:=optional,
+            jakarta.interceptor;resolution:=optional,
+            jakarta.transaction;version="[1.2,2)";resolution:=optional,
             org.aspectj.internal.lang.annotation;version="[1.8.6,2)";resolution:=optional,
             org.aspectj.lang;version="[1.8.6,2)";resolution:=optional,
             org.aspectj.lang.annotation;version="[1.8.6,2)";resolution:=optional,
diff --git a/spring-beans-6.0.12/pom.xml b/spring-beans-6.0.12/pom.xml
index 8a4d16a70..382857431 100644
--- a/spring-beans-6.0.12/pom.xml
+++ b/spring-beans-6.0.12/pom.xml
@@ -50,9 +50,9 @@
             org.springframework
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            javax.el;version="[1,3)";resolution:=optional,
-            javax.inject;version="[1,2)";resolution:=optional,
-            javax.xml.parsers;resolution:=optional,
+            jakarta.el;version="[1,3)";resolution:=optional,
+            jakarta.inject;version="[1,2)";resolution:=optional,
+            jakarta.xml.parsers;resolution:=optional,
             groovy.lang;resolution:=optional,
             groovy.xml;resolution:=optional,
             org.codehaus.groovy.reflection;resolution:=optional,
diff --git a/spring-context-6.0.12/pom.xml b/spring-context-6.0.12/pom.xml
index 1ac2318ea..0fdc2ca6f 100644
--- a/spring-context-6.0.12/pom.xml
+++ b/spring-context-6.0.12/pom.xml
@@ -55,12 +55,12 @@
             com.sun.net.httpserver;resolution:=optional,
             edu.emory.mathcs.backport.java.util.concurrent;version="[3,4)";resolution:=optional,
             groovy.lang;version="[2.4,3)";resolution:=optional,
-            javax.annotation;resolution:=optional,
-            javax.ejb;resolution:=optional,
-            javax.enterprise.concurrent;resolution:=optional,
-            javax.inject;resolution:=optional,
-            javax.interceptor;resolution:=optional,
-            javax.jms;resolution:=optional,
+            jakarta.annotation;resolution:=optional,
+            jakarta.ejb;resolution:=optional,
+            jakarta.enterprise.concurrent;resolution:=optional,
+            jakarta.inject;resolution:=optional,
+            jakarta.interceptor;resolution:=optional,
+            jakarta.jms;resolution:=optional,
             javax.management;resolution:=optional,
             javax.management.modelmbean;resolution:=optional,
             javax.management.openmbean;resolution:=optional,
@@ -68,20 +68,20 @@
             javax.money;resolution:=optional, 
             javax.money.format;resolution:=optional,
             javax.naming;resolution:=optional,
-            javax.persistence;resolution:=optional,
-            javax.persistence.spi;resolution:=optional,
+            jakarta.persistence;resolution:=optional,
+            jakarta.persistence.spi;resolution:=optional,
             javax.rmi;resolution:=optional,
             javax.script;resolution:=optional,
-            javax.validation;resolution:=optional,
-            javax.validation.bootstrap;resolution:=optional,
-            javax.validation.constraints;resolution:=optional,
-            javax.validation.constraintvalidation;resolution:=optional,
-            javax.validation.executable;resolution:=optional,
-            javax.validation.groups;resolution:=optional,
-            javax.validation.metadata;resolution:=optional,
-            javax.validation.spi;resolution:=optional,
-            javax.xml.namespace;resolution:=optional,
-            javax.xml.ws;resolution:=optional,
+            jakarta.validation;resolution:=optional,
+            jakarta.validation.bootstrap;resolution:=optional,
+            jakarta.validation.constraints;resolution:=optional,
+            jakarta.validation.constraintvalidation;resolution:=optional,
+            jakarta.validation.executable;resolution:=optional,
+            jakarta.validation.groups;resolution:=optional,
+            jakarta.validation.metadata;resolution:=optional,
+            jakarta.validation.spi;resolution:=optional,
+            jakarta.xml.namespace;resolution:=optional,
+            jakarta.xml.ws;resolution:=optional,
             org.aopalliance.aop;version="[1,2)";resolution:=optional,
             org.aopalliance.intercept;version="[1,2)";resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
diff --git a/spring-context-support-6.0.12/pom.xml b/spring-context-support-6.0.12/pom.xml
index e6c4f7040..6378ef00e 100644
--- a/spring-context-support-6.0.12/pom.xml
+++ b/spring-context-support-6.0.12/pom.xml
@@ -58,12 +58,12 @@
             commonj.work;version="[1.1.0,2)";resolution:=optional,
             freemarker.cache;version="[2.3,3)";resolution:=optional,
             freemarker.template;version="[2.3,3)";resolution:=optional,
-            javax.activation;resolution:=optional,
+            jakarta.activation;resolution:=optional,
             javax.cache;resolution:=optional,
             javax.cache.annotation;resolution:=optional,
             javax.cache.spi;resolution:=optional,
-            javax.mail;resolution:=optional,
-            javax.mail.internet;resolution:=optional,
+            jakarta.mail;resolution:=optional,
+            jakarta.mail.internet;resolution:=optional,
             javax.naming;resolution:=optional,
             javax.sql;resolution:=optional,
             net.sf.ehcache;version="[2,3)";resolution:=optional,
diff --git a/spring-core-6.0.12/pom.xml b/spring-core-6.0.12/pom.xml
index 359a31f71..ea90780c3 100644
--- a/spring-core-6.0.12/pom.xml
+++ b/spring-core-6.0.12/pom.xml
@@ -52,15 +52,15 @@
         <servicemix.osgi.import.pkg>
             io.netty.buffer;resolution:=optional,
             javax.net;resolution:=optional,
-            javax.xml;resolution:=optional,
-            javax.xml.bind;resolution:=optional,
-            javax.xml.namespace;resolution:=optional,
-            javax.xml.stream;resolution:=optional,
-            javax.xml.stream.events;resolution:=optional,
-            javax.xml.stream.util;resolution:=optional,
-            javax.xml.transform;resolution:=optional,
-            javax.xml.transform.sax;resolution:=optional,
-            javax.xml.transform.stax;resolution:=optional,
+            jakarta.xml;resolution:=optional,
+            jakarta.xml.bind;resolution:=optional,
+            jakarta.xml.namespace;resolution:=optional,
+            jakarta.xml.stream;resolution:=optional,
+            jakarta.xml.stream.events;resolution:=optional,
+            jakarta.xml.stream.util;resolution:=optional,
+            jakarta.xml.transform;resolution:=optional,
+            jakarta.xml.transform.sax;resolution:=optional,
+            jakarta.xml.transform.stax;resolution:=optional,
             joptsimple;version="[4,5)";resolution:=optional,
             net.sf.cglib.beans;version="[3,4)";resolution:=optional,
             sun.misc;resolution:=optional,
diff --git a/spring-jdbc-6.0.12/pom.xml b/spring-jdbc-6.0.12/pom.xml
index 26c60071c..3ea7a5fd4 100644
--- a/spring-jdbc-6.0.12/pom.xml
+++ b/spring-jdbc-6.0.12/pom.xml
@@ -58,8 +58,8 @@
             javax.sql,
             javax.sql.rowset,
             javax.transaction;resolution:=optional,
-            javax.xml.transform;resolution:=optional,
-            javax.xml.transform.dom;resolution:=optional,
+            jakarta.xml.transform;resolution:=optional,
+            jakarta.xml.transform.dom;resolution:=optional,
             oracle.jdbc;resolution:=optional,
             oracle.sql;resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
diff --git a/spring-jms-6.0.12/pom.xml b/spring-jms-6.0.12/pom.xml
index 5b69a4855..6cf7b1d5a 100644
--- a/spring-jms-6.0.12/pom.xml
+++ b/spring-jms-6.0.12/pom.xml
@@ -57,13 +57,13 @@
             io.netty.channel;resolution:=optional,
             io.netty.channel.nio;resolution:=optional,
             io.netty.util.concurrent;resolution:=optional,
-            javax.jms,
+            jakarta.jms,
             javax.naming;resolution:=optional,
             javax.resource;resolution:=optional,
             javax.resource.spi;resolution:=optional,
             javax.resource.spi.endpoint;resolution:=optional,
-            javax.xml.transform;resolution:=optional,
-            javax.xml.transform.stream;resolution:=optional,
+            jakarta.xml.transform;resolution:=optional,
+            jakarta.xml.transform.stream;resolution:=optional,
             org.aopalliance.intercept;version="[1,2)";resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
             org.codehaus.jackson.map;version="[2,3)";resolution:=optional,
diff --git a/spring-messaging-6.0.12/pom.xml b/spring-messaging-6.0.12/pom.xml
index 62f78be4f..ae49daf88 100644
--- a/spring-messaging-6.0.12/pom.xml
+++ b/spring-messaging-6.0.12/pom.xml
@@ -56,8 +56,8 @@
             io.netty.channel;version="[4,5)";resolution:=optional,
             io.netty.channel.nio;version="[4,5)";resolution:=optional,
             io.netty.util.concurrent;version="[4,5)";resolution:=optional,
-            javax.xml.transform;resolution:=optional,
-            javax.xml.transform.stream;resolution:=optional,
+            jakarta.xml.transform;resolution:=optional,
+            jakarta.xml.transform.stream;resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
             org.reactivestreams;resolution:=optional,
             org.springframework.beans;version="[${pkgVersion},6.1)";resolution:=optional,
diff --git a/spring-orm-6.0.12/pom.xml b/spring-orm-6.0.12/pom.xml
index 6f2092dde..8978dde77 100644
--- a/spring-orm-6.0.12/pom.xml
+++ b/spring-orm-6.0.12/pom.xml
@@ -60,15 +60,15 @@
             com.ibatis.sqlmap.engine.type;resolution:=optional,
             javax.jdo;resolution:=optional,
             javax.jdo.datastore;resolution:=optional,
-            javax.persistence;resolution:=optional,
-            javax.persistence.criteria;resolution:=optional,
-            javax.persistence.metamodel;resolution:=optional,
-            javax.persistence.spi;resolution:=optional,
-            javax.servlet;resolution:=optional,
-            javax.servlet.http;resolution:=optional,
+            jakarta.persistence;resolution:=optional,
+            jakarta.persistence.criteria;resolution:=optional,
+            jakarta.persistence.metamodel;resolution:=optional,
+            jakarta.persistence.spi;resolution:=optional,
+            jakarta.servlet;resolution:=optional,
+            jakarta.servlet.http;resolution:=optional,
             javax.sql;resolution:=optional,
-            javax.transaction;resolution:=optional,
-            javax.xml.parsers;resolution:=optional,
+            jakarta.transaction;resolution:=optional,
+            jakarta.xml.parsers;resolution:=optional,
             oracle.toplink.essentials.ejb.cmp3;resolution:=optional,
             oracle.toplink.essentials.expressions;resolution:=optional,
             oracle.toplink.essentials.internal.databaseaccess;resolution:=optional,
diff --git a/spring-oxm-6.0.12/pom.xml b/spring-oxm-6.0.12/pom.xml
index b1fc2a6b5..9cb505f2c 100644
--- a/spring-oxm-6.0.12/pom.xml
+++ b/spring-oxm-6.0.12/pom.xml
@@ -60,21 +60,21 @@
             com.thoughtworks.xstream.io.xml;version="[1.4,2)";resolution:=optional,
             com.thoughtworks.xstream.mapper;version="[1.4,2)";resolution:=optional,
             com.thoughtworks.xstream.security;version="[1.4,2)";resolution:=optional,
-            javax.activation;resolution:=optional,
-            javax.xml;resolution:=optional,
-            javax.xml.bind;resolution:=optional,
-            javax.xml.bind.annotation;resolution:=optional,
-            javax.xml.bind.annotation.adapters;resolution:=optional,
-            javax.xml.bind.attachment;resolution:=optional,
-            javax.xml.datatype,
-            javax.xml.namespace,
-            javax.xml.parsers,
-            javax.xml.stream,
-            javax.xml.transform,
-            javax.xml.transform.dom,
-            javax.xml.transform.sax,
-            javax.xml.transform.stream,
-            javax.xml.validation,
+            jakarta.activation;resolution:=optional,
+            jakarta.xml;resolution:=optional,
+            jakarta.xml.bind;resolution:=optional,
+            jakarta.xml.bind.annotation;resolution:=optional,
+            jakarta.xml.bind.annotation.adapters;resolution:=optional,
+            jakarta.xml.bind.attachment;resolution:=optional,
+            jakarta.xml.datatype,
+            jakarta.xml.namespace,
+            jakarta.xml.parsers,
+            jakarta.xml.stream,
+            jakarta.xml.transform,
+            jakarta.xml.transform.dom,
+            jakarta.xml.transform.sax,
+            jakarta.xml.transform.stream,
+            jakarta.xml.validation,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
             org.apache.xmlbeans;version="[2.6,3)";resolution:=optional,
             org.exolab.castor.mapping;version="[1.3,2)";resolution:=optional,
diff --git a/spring-test-6.0.12/pom.xml b/spring-test-6.0.12/pom.xml
index c9d864e19..abae13f94 100644
--- a/spring-test-6.0.12/pom.xml
+++ b/spring-test-6.0.12/pom.xml
@@ -53,27 +53,27 @@
             com.jayway.jsonpath;version="[1,3)";resolution:=optional,
             com.gargoylesoftware.htmlunit;resolution:=optional,
             com.gargoylesoftware.htmlunit.util;resolution:=optional,
-            javax.activation;resolution:=optional,
-            javax.el;resolution:=optional,
+            jakarta.activation;resolution:=optional,
+            jakarta.el;resolution:=optional,
             javax.naming;resolution:=optional,
             javax.naming.spi;resolution:=optional,
-            javax.persistence;resolution:=optional,
+            jakarta.persistence;resolution:=optional,
             javax.portlet;resolution:=optional,
-            javax.servlet;resolution:=optional,
-            javax.servlet.descriptor;resolution:=optional,
-            javax.servlet.http;resolution:=optional,
-            javax.servlet.jsp;resolution:=optional,
-            javax.servlet.jsp.el;resolution:=optional,
-            javax.servlet.jsp.tagext;resolution:=optional,
+            jakarta.servlet;resolution:=optional,
+            jakarta.servlet.descriptor;resolution:=optional,
+            jakarta.servlet.http;resolution:=optional,
+            jakarta.servlet.jsp;resolution:=optional,
+            jakarta.servlet.jsp.el;resolution:=optional,
+            jakarta.servlet.jsp.tagext;resolution:=optional,
             javax.sql;resolution:=optional,
-            javax.xml;resolution:=optional,
-            javax.xml.namespace;resolution:=optional,
-            javax.xml.parsers;resolution:=optional,
-            javax.xml.transform,
-            javax.xml.transform.dom,
-            javax.xml.xpath;resolution:=optional,
-            javax.websocket;resolution:=optional, 
-            javax.websocket.server;resolution:=optional, 
+            jakarta.xml;resolution:=optional,
+            jakarta.xml.namespace;resolution:=optional,
+            jakarta.xml.parsers;resolution:=optional,
+            jakarta.xml.transform,
+            jakarta.xml.transform.dom,
+            jakarta.xml.xpath;resolution:=optional,
+            jakarta.websocket;resolution:=optional, 
+            jakarta.websocket.server;resolution:=optional, 
             junit.framework;version="[4,5)";resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
             org.apache.http.cookie;resolution:=optional,
diff --git a/spring-tx-6.0.12/pom.xml b/spring-tx-6.0.12/pom.xml
index 6334201f8..039808b80 100644
--- a/spring-tx-6.0.12/pom.xml
+++ b/spring-tx-6.0.12/pom.xml
@@ -52,7 +52,7 @@
         <servicemix.osgi.import.pkg>
             com.ibm.websphere.uow;resolution:=optional,
             com.ibm.wsspi.uow;resolution:=optional,
-            javax.ejb;resolution:=optional,
+            jakarta.ejb;resolution:=optional,
             javax.management;resolution:=optional,
             javax.naming;resolution:=optional,
             javax.resource;resolution:=optional,
@@ -60,8 +60,8 @@
             javax.resource.spi;resolution:=optional,
             javax.resource.spi.endpoint;resolution:=optional,
             javax.resource.spi.work;resolution:=optional,
-            javax.transaction;version="[1.2,2)";resolution:=optional,
-            javax.transaction.xa;version="[1.2,2)";resolution:=optional,
+            jakarta.transaction;version="[1.2,2)";resolution:=optional,
+            jakarta.transaction.xa;version="[1.2,2)";resolution:=optional,
             org.aopalliance.aop;version="[1,2)";resolution:=optional,
             org.aopalliance.intercept;version="[1,2)";resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
diff --git a/spring-web-6.0.12/pom.xml b/spring-web-6.0.12/pom.xml
index 8c739c30b..f7ac42513 100644
--- a/spring-web-6.0.12/pom.xml
+++ b/spring-web-6.0.12/pom.xml
@@ -75,19 +75,19 @@
             io.netty.handler.ssl;resolution:=optional, 
             io.netty.handler.timeout;resolution:=optional, 
             io.netty.util.concurrent;resolution:=optional,
-            javax.activation.*;resolution:=optional,
-            javax.el.*;resolution:=optional,
-            javax.faces.*;resolution:=optional,
+            jakarta.activation.*;resolution:=optional,
+            jakarta.el.*;resolution:=optional,
+            jakarta.faces.*;resolution:=optional,
             javax.imageio.*;resolution:=optional,
             javax.jws.*;resolution:=optional,
-            javax.mail.internet;resolution:=optional,
+            jakarta.mail.internet;resolution:=optional,
             javax.portlet.*;resolution:=optional,
-            javax.servlet,
-            javax.servlet.http,
-            javax.servlet.annotation;resolution:=optional,
-            javax.servlet.jsp.*;resolution:=optional,
-            javax.validation;resolution:=optional,
-            javax.xml.*;resolution:=optional,
+            jakarta.servlet,
+            jakarta.servlet.http,
+            jakarta.servlet.annotation;resolution:=optional,
+            jakarta.servlet.jsp.*;resolution:=optional,
+            jakarta.validation;resolution:=optional,
+            jakarta.xml.*;resolution:=optional,
             okhttp3;resolution:=optional,
             org.aopalliance.*;version="[1,2)",
             org.apache.commons.fileupload.*;version="[1.3,2)";resolution:=optional,
diff --git a/spring-webmvc-6.0.12/pom.xml b/spring-webmvc-6.0.12/pom.xml
index 52d3676e8..4c4e3089e 100644
--- a/spring-webmvc-6.0.12/pom.xml
+++ b/spring-webmvc-6.0.12/pom.xml
@@ -50,7 +50,7 @@
             org.springframework
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            javax.validation;resolution:=optional,
+            jakarta.validation;resolution:=optional,
             com.lowagie.text.*;version="[2,3)";resolution:=optional,
             com.rometools.rome.feed;version="[1.5,2)";resolution:=optional,
             com.rometools.rome.feed.atom;version="[1.5,2)";resolution:=optional,
@@ -60,13 +60,13 @@
             groovy.lang;version="[2.4,3)";resolution:=optional,
             groovy.text;version="[2.4,3)";resolution:=optional,
             groovy.text.markup;version="[2.4,3)";resolution:=optional,
-            javax.el.*;resolution:=optional,
+            jakarta.el.*;resolution:=optional,
             javax.sql.*;resolution:=optional,
             javax.script;resolution:=optional,
-            javax.servlet,
-            javax.servlet.http,
-            javax.servlet.jsp.*;resolution:=optional,
-            javax.xml.*;resolution:=optional,
+            jakarta.servlet,
+            jakarta.servlet.http,
+            jakarta.servlet.jsp.*;resolution:=optional,
+            jakarta.xml.*;resolution:=optional,
             jxl.*;version="[2.6,3)";resolution:=optional,
             net.sf.jasperreports.*;version="[5,7)";resolution:=optional,
             org.aopalliance.aop;resolution:=optional,
diff --git a/spring-websocket-6.0.12/pom.xml b/spring-websocket-6.0.12/pom.xml
index 8742befc6..5f87efdc4 100644
--- a/spring-websocket-6.0.12/pom.xml
+++ b/spring-websocket-6.0.12/pom.xml
@@ -67,10 +67,10 @@
             io.undertow.websockets.jsr.annotated;resolution:=optional,
             io.undertow.websockets.jsr.handshake;resolution:=optional,
             io.undertow.websockets.spi;resolution:=optional,
-            javax.servlet;resolution:=optional,
-            javax.servlet.http;resolution:=optional,
-            javax.websocket;resolution:=optional,
-            javax.websocket.server;resolution:=optional,
+            jakarta.servlet;resolution:=optional,
+            jakarta.servlet.http;resolution:=optional,
+            jakarta.websocket;resolution:=optional,
+            jakarta.websocket.server;resolution:=optional,
             org.apache.commons.logging;version="[1.1.1,2)";resolution:=optional,
             org.apache.tomcat.websocket.server;resolution:=optional,
             org.eclipse.jetty.client;resolution:=optional,