Some small other transitions to jakarta namespace
Signed-off-by: Jean-Louis Monteiro <jlmonteiro@tomitribe.com>
diff --git a/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java b/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java
index 7334b3d..a1fd9c4 100644
--- a/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java
+++ b/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java
@@ -41,7 +41,7 @@
public static OSGi<?> ifPossible() {
if (tryLoadingCdi()) {
return register(
- javax.enterprise.inject.spi.Extension.class,
+ jakarta.enterprise.inject.spi.Extension.class,
new org.apache.johnzon.osgi.cdi.CdiExtensionFactory(),
getCdiExtensionProperties()
);
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index 7d255b6..c4539a4 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -29,7 +29,7 @@
<name>Johnzon :: WebSocket</name>
<properties>
- <tomcat.version>8.5.9</tomcat.version>
+ <tomcat.version>10.1.4</tomcat.version>
<tomee.version>8.0.13</tomee.version>
<staging.directory>${project.parent.reporting.outputDirectory}</staging.directory>
</properties>
@@ -69,6 +69,19 @@
</dependency>
<dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>1.1.11.Final</version>
