Migration to Jakarta EE

eclipse-birt · Jul 17, 2024 · 71f42ab · 71f42ab
1 parent d8ebc42
commit 71f42ab
Show file tree

Hide file tree

Showing 83 changed files with 417 additions and 685 deletions.
diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup
@@ -478,6 +478,8 @@
             url="https://download.eclipse.org/justj/epp/milestone/latest"/>
         <repository
             url="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
+        <repository
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
       </repositoryList>
       <repositoryList
           name="4.16">

diff --git a/build/org.eclipse.birt.target/BIRT Chart Test.launch b/build/org.eclipse.birt.target/BIRT Chart Test.launch
@@ -60,8 +60,8 @@
         <setEntry value="javax.el@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
-        <setEntry value="javax.servlet.jsp-api@default:default"/>
+        <setEntry value="jakarta.servlet-api@default:default"/>
+        <setEntry value="jakarta.servlet.jsp-api@default:default"/>
         <setEntry value="javax.transaction@default:false"/>
         <setEntry value="javax.wsdl@default:default"/>
         <setEntry value="javax.xml.soap@default:default"/>

diff --git a/build/org.eclipse.birt.target/BIRT Report Engine Test.launch b/build/org.eclipse.birt.target/BIRT Report Engine Test.launch
@@ -60,7 +60,7 @@
         <setEntry value="javax.el@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
+        <setEntry value="jakarta.servlet-api@default:default"/>
         <setEntry value="javax.transaction@default:false"/>
         <setEntry value="javax.wsdl@default:default"/>
         <setEntry value="javax.xml.soap@default:default"/>

diff --git a/build/org.eclipse.birt.target/BIRT Report Model Test.launch b/build/org.eclipse.birt.target/BIRT Report Model Test.launch
@@ -60,7 +60,7 @@
         <setEntry value="javax.el@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
+        <setEntry value="jakarta.servlet-api@default:default"/>
         <setEntry value="javax.transaction@default:false"/>
         <setEntry value="javax.wsdl@default:default"/>
         <setEntry value="javax.xml.soap@default:default"/>

diff --git a/build/org.eclipse.birt.target/BIRT Report Tests Engine Test.launch b/build/org.eclipse.birt.target/BIRT Report Tests Engine Test.launch
@@ -60,7 +60,7 @@
         <setEntry value="javax.el@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
+        <setEntry value="jakarta.servlet-api@default:default"/>
         <setEntry value="javax.transaction@default:false"/>
         <setEntry value="javax.wsdl@default:default"/>
         <setEntry value="javax.xml.soap@default:default"/>

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
diff --git a/build/org.eclipse.birt.target/BIRT all-in-one.launch b/build/org.eclipse.birt.target/BIRT all-in-one.launch
diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from BIRT" sequenceNumber="45">
+<target name="Generated from BIRT" sequenceNumber="46">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="bcpg" version="0.0.0"/>
@@ -17,16 +17,18 @@
       <unit id="com.zaxxer.sparsebits" version="0.0.0"/>
       <unit id="jakarta.activation-api" version="0.0.0"/>
       <unit id="jakarta.annotation-api" version="0.0.0"/>
+      <unit id="jakarta.el-api" version="0.0.0"/>
       <unit id="jakarta.enterprise.cdi-api" version="0.0.0"/>
+      <unit id="jakarta.enterprise.lang-model" version="0.0.0"/>
       <unit id="jakarta.inject.jakarta.inject-api" version="0.0.0"/>
       <unit id="jakarta.interceptor-api" version="0.0.0"/>
+      <unit id="jakarta.servlet-api" version="0.0.0"/>
+      <unit id="jakarta.servlet.jsp-api" version="0.0.0"/>
       <unit id="jakarta.transaction-api" version="0.0.0"/>
       <unit id="jakarta.xml.bind" version="0.0.0"/>
       <unit id="jakarta.xml.bind-api" version="0.0.0"/>
       <unit id="javax.activation" version="0.0.0"/>
       <unit id="javax.annotation" version="0.0.0"/>
-      <unit id="javax.inject" version="0.0.0"/>
-      <unit id="javax.servlet-api" version="0.0.0"/>
       <unit id="javax.xml.rpc-api" version="0.0.0"/>
       <unit id="javax.xml.soap" version="0.0.0"/>
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
@@ -97,12 +99,13 @@
       <unit id="org.eclipse.equinox.http.service.api" version="0.0.0"/>
       <unit id="org.eclipse.jetty.deploy" version="0.0.0"/>
       <unit id="org.eclipse.jetty.ee" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.apache-jsp" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.plus" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.apache-jsp" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.plus" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.servlet" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.webapp" version="0.0.0"/>
       <unit id="org.eclipse.jetty.ee8.security" version="0.0.0"/>
       <unit id="org.eclipse.jetty.ee8.server" version="0.0.0"/>
       <unit id="org.eclipse.jetty.ee8.servlet" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.webapp" version="0.0.0"/>
       <unit id="org.eclipse.jetty.http" version="0.0.0"/>
       <unit id="org.eclipse.jetty.io" version="0.0.0"/>
       <unit id="org.eclipse.jetty.osgi" version="0.0.0"/>
@@ -125,7 +128,9 @@
       <unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
       <unit id="org.mongodb.mongo-java-driver" version="0.0.0"/>
       <unit id="org.mortbay.jasper.apache-el" version="9.0.90"/>
+      <unit id="org.mortbay.jasper.apache-el" version="10.1.25"/>
       <unit id="org.mortbay.jasper.apache-jsp" version="9.0.90"/>
+      <unit id="org.mortbay.jasper.apache-jsp" version="10.1.25"/>
       <unit id="org.mozilla.rhino" version="0.0.0"/>
       <unit id="org.objectweb.asm.commons" version="0.0.0"/>
       <unit id="org.osgi.namespace.contract" version="0.0.0"/>

diff --git a/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF
@@ -27,5 +27,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.chart.examples.radar.ui.series,
  org.eclipse.birt.chart.examples.radar.ui.type
 Automatic-Module-Name: org.eclipse.birt.chart.examples
-Import-Package: javax.servlet;version="3.1.0",
- javax.servlet.http;version="3.1.0"
+Import-Package: jakarta.servlet;version="6.0.0",
+ jakarta.servlet.http;version="6.0.0"
diff --git a/....chart.examples/src/org/eclipse/birt/chart/examples/api/preference/PreferenceServlet.java b/....chart.examples/src/org/eclipse/birt/chart/examples/api/preference/PreferenceServlet.java
@@ -20,11 +20,11 @@
 import java.util.Enumeration;
 
 import javax.imageio.ImageIO;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.eclipse.birt.chart.device.IDeviceRenderer;
 import org.eclipse.birt.chart.exception.ChartException;

diff --git a/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.birt.chart.engine;bundle-version="4.13.0",
  org.eclipse.birt.chart.engine.extension;bundle-version="4.13.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: javax.servlet;version="3.1.0",
- javax.servlet.http;version="3.1.0",
- javax.servlet.jsp;version="2.1.0",
- javax.servlet.jsp.tagext;version="2.1.0"
+Import-Package: jakarta.servlet;version="6.0.0",
+ jakarta.servlet.http;version="6.0.0",
+ jakarta.servlet.jsp;version="3.0.0",
+ jakarta.servlet.jsp.tagext;version="3.0.0"
 Automatic-Module-Name: org.eclipse.birt.chart.viewer
diff --git a/...clipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/ChartRendererTag.java b/...clipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/ChartRendererTag.java
@@ -17,10 +17,10 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator;
 import org.eclipse.birt.chart.factory.RunTimeContext;

diff --git a/....viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartHttpSessionListener.java b/....viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartHttpSessionListener.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.birt.chart.viewer.internal.listener;
 
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 
 import org.eclipse.birt.chart.viewer.internal.util.ChartImageManager;
 
@@ -29,7 +29,7 @@ public class ChartHttpSessionListener implements HttpSessionListener
 	/**
 	 * After session created
 	 * 
-	 * @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent)
+	 * @see jakarta.servlet.http.HttpSessionListener#sessionCreated(jakarta.servlet.http.HttpSessionEvent)
 	 */
 	public void sessionCreated( HttpSessionEvent event )
 	{
@@ -38,7 +38,7 @@ public void sessionCreated( HttpSessionEvent event )
 	/**
 	 * When session destroyed
 	 * 
-	 * @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent)
+	 * @see jakarta.servlet.http.HttpSessionListener#sessionDestroyed(jakarta.servlet.http.HttpSessionEvent)
 	 */
 	public void sessionDestroyed( HttpSessionEvent event )
 	{

diff --git a/...ewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartServletContextListener.java b/...ewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartServletContextListener.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.birt.chart.viewer.internal.listener;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 import org.eclipse.birt.chart.viewer.internal.util.ChartImageManager;
 

diff --git a/....birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartImageManager.java b/....birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartImageManager.java
@@ -26,8 +26,8 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.eclipse.birt.chart.api.ChartEngine;
 import org.eclipse.birt.chart.device.EmptyUpdateNotifier;

diff --git a/...pse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartWebHelper.java b/...pse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartWebHelper.java
@@ -20,7 +20,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.eclipse.birt.chart.exception.ChartException;
 import org.eclipse.birt.chart.model.Chart;

diff --git a/core/org.eclipse.birt.core/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core/META-INF/MANIFEST.MF
@@ -42,4 +42,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibili
 Bundle-ActivationPolicy: lazy
 Eclipse-ExtensibleAPI: true
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: javax.servlet
+Import-Package: jakarta.servlet
diff --git a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/framework/PlatformServletContext.java b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/framework/PlatformServletContext.java
@@ -21,7 +21,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * An platform context that is based on resource operations instead of file
@@ -76,7 +76,7 @@ private void deploy() {
 		}
 		platform = context.getRealPath(RESOURCE_BASE);
 		if (platform == null || !new File(platform).exists()) {
-			File contextTemp = (File) context.getAttribute("javax.servlet.context.tempdir"); //$NON-NLS-1$
+			File contextTemp = (File) context.getAttribute("jakarta.servlet.context.tempdir"); //$NON-NLS-1$
 			File platformFolder = new File(contextTemp, "platform");
 			// Weblogic try to remove the platform but it fails,
 			// so try to copy the platform each time.

diff --git a/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Fragment-Host: org.eclipse.birt.report.viewer;bundle-version="2.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.report.viewer
 Require-Bundle: org.junit;bundle-version="3.8.1";resolution:=optional;visibility:=reexport,
- javax.servlet-api;bundle-version="3.1.0"
+ jakarta.servlet-api;bundle-version="6.0.0"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.viewer.tests