Update the target platform to use newer dependencies. (eclipse-birt#1444

)

Using Platform 4.29 for now until Jetty 12 migration is complete.
There are new versions of batik, poi, and xmlbeans.
Remove batik birt.ext bundles.
Use org.eclipse.orbit.xml-apis-ext to remove org.w3c.dom.smil,
org.w3c.dom.svg, and org.w3c.css.sac,org.w3c.dom.events bundles and the
BIRT fragment org.w3c.dom.svg.extension.

UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF

@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.birt.report.model;bundle-version="[2.1.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.apache.batik.transcoder;version="1.14.0",
- org.apache.batik.transcoder.image;version="1.14.0"
+Import-Package: org.apache.batik.transcoder;version="1.17.0",
+ org.apache.batik.transcoder.image;version="1.17.0"
 Automatic-Module-Name: org.eclipse.birt.report.designer.core

UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product

@@ -432,10 +432,7 @@ United States, other countries, or both.
       <plugin id="org.mozilla.javascript"/>
       <plugin id="org.sat4j.core"/>
       <plugin id="org.sat4j.pb"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
+      <plugin id="org.eclipse.orbit.xml-apis-ext"/>
       <plugin id="org.w3c.sac"/>
       <plugin id="uk.co.spudsoft.birt.emitters.excel"/>
    </plugins>

UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product

@@ -435,11 +435,7 @@ United States, other countries, or both.
       <plugin id="org.mozilla.javascript"/>
       <plugin id="org.sat4j.core"/>
       <plugin id="org.sat4j.pb"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
-      <plugin id="org.w3c.dom.svg.extension" fragment="true"/>
+      <plugin id="org.eclipse.orbit.xml-apis-ext"/>
       <plugin id="org.w3c.sac"/>
       <plugin id="uk.co.spudsoft.birt.emitters.excel"/>
    </plugins>

build/birt-packages/birt-charts/DeploymentRuntime/category.xml

@@ -41,8 +41,5 @@
    <bundle id="org.eclipse.emf.ecore">
       <category name="ChartEngine"/>
    </bundle>
-   <bundle id="org.w3c.dom.events">
-      <category name="ChartEngine"/>
-   </bundle>
    <category-def name="ChartEngine" label="BIRT Chart Engine"/>
 </site>

build/org.eclipse.birt.releng/BIRT.setup

@@ -213,7 +213,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      value="${eclipse.target.platform.latest}"
+      value="2023-09"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.p2:P2Task"
@@ -440,7 +440,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
         <repository
             url="https://download.eclipse.org/oomph/simrel-orbit-legacy/milestone/latest"/>
         <repository

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="19">
+<target name="Generated from BIRT" sequenceNumber="20">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -10,22 +10,17 @@
       <unit id="bcpg" version="0.0.0"/>
       <unit id="bcprov" version="0.0.0"/>
       <unit id="biz.aQute.bnd.util" version="0.0.0"/>
-      <unit id="biz.aQute.bndlib" version="0.0.0"/>
       <unit id="com.github.librepdf.openpdf" version="0.0.0"/>
-      <unit id="com.google.gson" version="0.0.0"/>
+      <unit id="com.github.virtuald.curvesapi" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
       <unit id="com.google.guava.failureaccess" version="0.0.0"/>
       <unit id="com.google.javascript" version="0.0.0"/>
-      <unit id="com.google.protobuf" version="0.0.0"/>
       <unit id="com.ibm.icu" version="0.0.0"/>
-      <unit id="com.jcraft.jsch" version="0.0.0"/>
-      <unit id="com.sun.el.javax.el" version="0.0.0"/>
       <unit id="com.sun.jna" version="0.0.0"/>
       <unit id="com.sun.jna.platform" version="0.0.0"/>
+      <unit id="com.zaxxer.sparsebits" version="0.0.0"/>
       <unit id="jakarta.annotation-api" version="0.0.0"/>
-      <unit id="jakarta.el" version="0.0.0"/>
       <unit id="jakarta.servlet-api" version="0.0.0"/>
-      <unit id="jakarta.servlet.jsp" version="0.0.0"/>
       <unit id="javax.el-api" version="0.0.0"/>
       <unit id="javax.servlet-api" version="0.0.0"/>
       <unit id="javax.servlet.jsp-api" version="0.0.0"/>
@@ -42,7 +37,6 @@
       <unit id="junit-platform-suite-commons" version="0.0.0"/>
       <unit id="junit-platform-suite-engine" version="0.0.0"/>
       <unit id="junit-vintage-engine" version="0.0.0"/>
-      <unit id="org.apache.ant" version="0.0.0"/>
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
       <unit id="org.apache.axis.ant" version="0.0.0"/>
       <unit id="org.apache.batik.anim" version="0.0.0"/>
@@ -62,7 +56,8 @@
       <unit id="org.apache.batik.transcoder" version="0.0.0"/>
       <unit id="org.apache.batik.util" version="0.0.0"/>
       <unit id="org.apache.batik.xml" version="0.0.0"/>
-      <unit id="org.apache.commons.collections4" version="0.0.0"/>
+      <unit id="org.apache.commons.commons-codec" version="0.0.0"/>
+      <unit id="org.apache.commons.commons-collections4" version="0.0.0"/>
       <unit id="org.apache.commons.commons-compress" version="0.0.0"/>
       <unit id="org.apache.commons.commons-io" version="0.0.0"/>
       <unit id="org.apache.commons.discovery" version="0.0.0"/>
@@ -73,6 +68,7 @@
       <unit id="org.apache.felix.scr" version="0.0.0"/>
       <unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
       <unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
+      <unit id="org.apache.logging.log4j.api" version="0.0.0"/>
       <unit id="org.apache.lucene.analysis-common" version="0.0.0"/>
       <unit id="org.apache.lucene.analysis-smartcn" version="0.0.0"/>
       <unit id="org.apache.lucene.core" version="0.0.0"/>
@@ -83,20 +79,17 @@
       <unit id="org.apache.poi.ooxml" version="0.0.0"/>
       <unit id="org.apache.poi.ooxml.schemas" version="0.0.0"/>
       <unit id="org.apache.wsil4j" version="0.0.0"/>
-      <unit id="org.apache.xerces" version="0.0.0"/>
-      <unit id="org.apache.xml.resolver" version="0.0.0"/>
       <unit id="org.apache.xmlbeans" version="0.0.0"/>
-      <unit id="org.apache.xmlgraphics" version="0.0.0"/>
       <unit id="org.apiguardian.api" version="0.0.0"/>
       <unit id="org.dom4j" version="0.0.0"/>
       <unit id="org.eclipse.jetty.servlet-api" version="0.0.0"/>
-      <unit id="org.eclipse.orbit.mongodb" version="0.0.0"/>
+      <unit id="org.eclipse.orbit.xml-apis-ext" version="0.0.0"/>
       <unit id="org.hamcrest" version="0.0.0"/>
       <unit id="org.hamcrest.core" version="0.0.0"/>
       <unit id="org.junit" version="0.0.0"/>
-      <unit id="org.mortbay.jasper.apache-el" version="0.0.0"/>
-      <unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
-      <unit id="org.mozilla.javascript" 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.52"/>
+      <unit id="org.mortbay.jasper.apache-jsp" version="9.0.52"/>
       <unit id="org.objectweb.asm" version="0.0.0"/>
       <unit id="org.objectweb.asm.commons" version="0.0.0"/>
       <unit id="org.objectweb.asm.tree" version="0.0.0"/>
@@ -130,7 +123,7 @@
       <unit id="org.uddi4j" version="0.0.0"/>
       <unit id="slf4j.api" version="0.0.0"/>
       <unit id="slf4j.simple" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="javax.activation" version="0.0.0"/>
@@ -152,6 +145,7 @@
       <unit id="org.apache.lucene.analysis" version="0.0.0"/>
       <unit id="org.apache.lucene.core" version="0.0.0"/>
       <unit id="org.apache.xml.serializer" version="0.0.0"/>
+      <unit id="org.eclipse.orbit.mongodb" version="0.0.0"/>
       <unit id="org.w3c.css.sac" version="0.0.0"/>
       <unit id="org.w3c.dom.events" version="0.0.0"/>
       <unit id="org.w3c.dom.smil" version="0.0.0"/>
@@ -170,12 +164,13 @@
       <unit id="org.eclipse.jetty.server" version="0.0.0"/>
       <unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
       <unit id="org.eclipse.jetty.util" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.util.ajax" version="0.0.0"/>
       <unit id="org.eclipse.jetty.webapp" version="0.0.0"/>
       <unit id="org.eclipse.jetty.xml" version="0.0.0"/>
       <repository location="https://download.eclipse.org/oomph/jetty/release/10.0.16"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.apache.xerces" version="0.0.0"/>
+      <unit id="org.apache.xml.resolver" version="0.0.0"/>
       <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="0.0.0"/>
@@ -231,6 +226,12 @@
       <unit id="org.eclipse.jem.beaninfo.vm.common" version="0.0.0"/>
       <unit id="org.eclipse.jem.proxy" version="0.0.0"/>
       <unit id="org.eclipse.jem.workbench" 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.security" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.server" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.util" version="0.0.0"/>
       <unit id="org.eclipse.jst.common.annotations.controller" version="0.0.0"/>
       <unit id="org.eclipse.jst.common.annotations.core" version="0.0.0"/>
       <unit id="org.eclipse.jst.common.annotations.ui" version="0.0.0"/>
@@ -316,6 +317,7 @@
       <unit id="org.eclipse.wst.wsdl.ui" version="0.0.0"/>
       <unit id="org.eclipse.wst.wsi.ui" version="0.0.0"/>
       <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="0.0.0"/>
+      <unit id="org.mozilla.javascript" version="0.0.0"/>
       <repository location="https://download.eclipse.org/webtools/repository/latest"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -327,18 +329,18 @@
       <repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="biz.aQute.bndlib" version="0.0.0"/>
       <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/>
       <unit id="org.eclipse.e4.tools.services" version="0.0.0"/>
       <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ecf.filetransfer.httpclientjava.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.rcp.configuration.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.search.core" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000"/>
     </location>
   </locations>
 </target>

chart/org.eclipse.birt.chart.device.pdf/META-INF/MANIFEST.MF

@@ -14,6 +14,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .,
  lib/fop-2.6.jar
 Automatic-Module-Name: org.eclipse.birt.chart.device.pdf
-Import-Package: org.apache.batik.ext.awt.color;version="1.13.0",
- org.apache.batik.transcoder;version="1.14.0",
+Import-Package: org.apache.batik.ext.awt.color;version="1.17.0",
+ org.apache.batik.transcoder;version="1.17.0",
  org.w3c.dom.events

chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF

@@ -38,6 +38,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0",
  org.eclipse.birt.tests.core;bundle-version="4.13.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.apache.batik.transcoder;version="[1.14.0,2.0.0)",
- org.apache.batik.transcoder.image;version="[1.14.0,2.0.0)"
+Import-Package: org.apache.batik.transcoder;version="[1.17.0,2.0.0)",
+ org.apache.batik.transcoder.image;version="[1.17.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.birt.chart.tests

chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml

@@ -141,6 +141,7 @@
 				<include name="org.eclipse.emf.ecore_*.jar" />
 			</fileset>
 			<fileset dir="${buildDirectory}/plugins">
+				<include name="org.eclipse.orbit.xml-apis-ext_*.jar"/>
 				<include name="org.w3c.css.sac_*.jar"/>
 				<include name="org.w3c.dom*.jar"/>
 				<include name="org.apache.commons.codec_*.jar"/>