Migration to Jakarta EE

eclipse-birt · Jul 17, 2024 · 3ea5ed0 · 3ea5ed0
1 parent 9c001d8
commit 3ea5ed0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch b/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch
@@ -35,9 +35,9 @@
         <setEntry value="com.jcraft.jsch@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="javax.activation@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="jakarta.activation@default:default"/>
+        <setEntry value="jakarta.annotation@default:default"/>
+        <setEntry value="jakarta.inject@default:default"/>
         <setEntry value="javax.wsdl@default:default"/>
         <setEntry value="javax.xml@default:default"/>
         <setEntry value="org.apache.ant@default:default"/>

diff --git a/build/org.eclipse.birt.target/BIRT all-in-one.launch b/build/org.eclipse.birt.target/BIRT all-in-one.launch
@@ -43,9 +43,9 @@
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
         <setEntry value="jakarta.xml.bind@default:default"/>
-        <setEntry value="javax.activation@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="jakarta.activation@default:default"/>
+        <setEntry value="jakarta.annotation@default:default"/>
+        <setEntry value="jakarta.inject@default:default"/>
         <setEntry value="javax.wsdl@default:default"/>
         <setEntry value="javax.xml@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>

diff --git a/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Bundle-ActivationPolicy: lazy
 Import-Package: com.mongodb;version="[3.2.2,4.0.0)",
  com.mongodb.client;version="3.2.2",
  com.mongodb.util;version="[3.2.2,4.0.0)",
- javax.xml.bind;version="2.2.0",
+ jakarta.xml.bind;version="[4.0.0,5.0.0)",
  org.bson;version="3.2.2",
  org.bson.conversions;version="3.2.2",
  org.bson.types;version="3.2.2"

diff --git a/...clipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java b/...clipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java
@@ -27,8 +27,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.xml.bind.DatatypeConverter;
-
 import org.bson.Document;
 import org.bson.types.BSONTimestamp;
 import org.eclipse.birt.data.oda.mongodb.internal.impl.DriverUtil;
@@ -46,6 +44,8 @@
 import com.mongodb.BasicDBList;
 import com.mongodb.DBCursor;
 
+import jakarta.xml.bind.DatatypeConverter;
+
 /**
  * Implementation class of IResultSet for the MongoDB ODA runtime driver.
  */