Remove references to non-BIRT bundles from features

- Use jgit timestamp provider for product qualifiers. - Add org.apache.batik.ext.awt.image.codec.imageio where org.apache.batik.transcoder.image is used. - Reduce the content of the all-in-one product, mostly to remove redundant includes. - Ensure the runtime product is complete enough after the features have been simplified such tha the OSGi runtime test still works.
eclipse-birt · Jul 16, 2024 · 37da6d1 · 37da6d1
1 parent dab8cc5
commit 37da6d1
Show file tree

Hide file tree

Showing 19 changed files with 259 additions and 2,328 deletions.
diff --git a/UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@ 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.17.0",
+Import-Package: org.apache.batik.ext.awt.image.codec.imageio;version="1.17.0",
+ 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
diff --git a/build/birt-packages/birt-report-all-in-one/BIRT.product b/build/birt-packages/birt-report-all-in-one/BIRT.product
@@ -254,44 +254,14 @@ United States, other countries, or both.
       <feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" installMode="root"/>
       <feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" installMode="root"/>
       <feature id="org.eclipse.datatools.sqltools.doc.user" installMode="root"/>
-      <feature id="org.eclipse.draw2d" installMode="root"/>
-      <feature id="org.eclipse.e4.rcp" installMode="root"/>
-      <feature id="org.eclipse.emf.codegen.ecore.ui" installMode="root"/>
-      <feature id="org.eclipse.emf.codegen.ecore" installMode="root"/>
-      <feature id="org.eclipse.emf.codegen.ui" installMode="root"/>
-      <feature id="org.eclipse.emf.codegen" installMode="root"/>
-      <feature id="org.eclipse.emf.common.ui" installMode="root"/>
-      <feature id="org.eclipse.emf.common" installMode="root"/>
-      <feature id="org.eclipse.emf.converter" installMode="root"/>
-      <feature id="org.eclipse.emf.databinding.edit" installMode="root"/>
-      <feature id="org.eclipse.emf.databinding" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore.editor" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore.edit" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore" installMode="root"/>
-      <feature id="org.eclipse.emf.edit.ui" installMode="root"/>
-      <feature id="org.eclipse.emf.edit" installMode="root"/>
-      <feature id="org.eclipse.emf.mapping.ecore.editor" installMode="root"/>
-      <feature id="org.eclipse.emf.mapping.ecore" installMode="root"/>
-      <feature id="org.eclipse.emf.mapping.ui" installMode="root"/>
-      <feature id="org.eclipse.emf.mapping" installMode="root"/>
-      <feature id="org.eclipse.emf" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.core.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
-      <feature id="org.eclipse.gef" installMode="root"/>
-      <feature id="org.eclipse.help" installMode="root"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
       <feature id="org.eclipse.pde" installMode="root"/>
       <feature id="org.eclipse.platform" installMode="root"/>
-      <feature id="org.eclipse.rcp" installMode="root"/>
       <feature id="org.eclipse.wst.common_core.feature" installMode="root"/>
       <feature id="org.eclipse.wst.common_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_core.feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_userdoc.feature" installMode="root"/>
-      <feature id="org.eclipse.xsd.edit" installMode="root"/>
-      <feature id="org.eclipse.xsd" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
    </features>
 

diff --git a/build/birt-packages/birt-runtime-osgi/reportengine.product b/build/birt-packages/birt-runtime-osgi/reportengine.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="BIRT Engine Runtime" uid="org.eclipse.birt.engine.runtime" version="4.17.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product name="BIRT Engine Runtime" uid="org.eclipse.birt.engine.runtime" version="4.17.0.qualifier" type="features" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -170,14 +170,17 @@ United States, other countries, or both.
    <features>
       <feature id="org.eclipse.birt.engine.runtime"/>
       <feature id="org.eclipse.birt.chart.osgi.runtime"/>
+      <feature id="org.eclipse.rcp" installMode="root"/>
    </features>
 
    <configurations>
       <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <!--
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
+      -->
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <property name="org.eclipse.update.reconcile" value="false" />
    </configurations>

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="44">
+<target name="Generated from BIRT" sequenceNumber="45">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="bcpg" version="0.0.0"/>
@@ -13,26 +13,24 @@
       <unit id="com.github.jtidy" version="0.0.0"/>
       <unit id="com.github.librepdf.openpdf" version="0.0.0"/>
       <unit id="com.github.virtuald.curvesapi" version="0.0.0"/>
-      <unit id="com.google.guava.failureaccess" version="0.0.0"/>
       <unit id="com.sun.el.javax.el" version="0.0.0"/>
       <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.enterprise.cdi-api" 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.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.servlet.jsp-api" version="0.0.0"/>
-      <unit id="javax.xml.bind" version="0.0.0"/>
       <unit id="javax.xml.rpc-api" version="0.0.0"/>
-      <unit id="javax.xml.stream" 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"/>
+      <unit id="org.apache.axis" version="0.0.0"/>
       <unit id="org.apache.batik.anim" version="0.0.0"/>
       <unit id="org.apache.batik.awt.util" version="0.0.0"/>
       <unit id="org.apache.batik.bridge" version="0.0.0"/>
@@ -55,12 +53,11 @@
       <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"/>
+      <unit id="org.apache.commons.logging" version="0.0.0"/>
       <unit id="org.apache.commons.math3" version="0.0.0"/>
       <unit id="org.apache.derby" version="0.0.0"/>
       <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.jasper.glassfish" version="0.0.0"/>
       <unit id="org.apache.logging.log4j.api" version="0.0.0"/>
       <unit id="org.apache.lucene.queries" version="0.0.0"/>
       <unit id="org.apache.lucene.sandbox" version="0.0.0"/>
@@ -97,6 +94,7 @@
       <unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <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"/>
@@ -115,17 +113,14 @@
       <unit id="org.eclipse.jetty.session" version="0.0.0"/>
       <unit id="org.eclipse.jetty.util" version="0.0.0"/>
       <unit id="org.eclipse.jetty.xml" version="0.0.0"/>
-      <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jst.jsp.ui" version="0.0.0"/>
+      <unit id="org.eclipse.jst.servlet.ui" version="0.0.0"/>
       <unit id="org.eclipse.justj.epp.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.license.feature.group" 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.eclipse.osgi.services" version="0.0.0"/>
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
       <unit id="org.mongodb.mongo-java-driver" version="0.0.0"/>
@@ -137,8 +132,8 @@
       <unit id="org.osgi.namespace.extender" version="0.0.0"/>
       <unit id="org.osgi.namespace.service" version="0.0.0"/>
       <unit id="org.osgi.service.coordinator" version="0.0.0"/>
+      <unit id="org.osgi.service.http.whiteboard" version="0.0.0"/>
       <unit id="org.osgi.service.repository" version="0.0.0"/>
-      <unit id="org.osgi.util.tracker" 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/eclipse/updates/4.33-I-builds"/>

diff --git a/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
@@ -86,9 +86,10 @@ Automatic-Module-Name: org.eclipse.birt.report.engine
 Import-Package: org.apache.batik.css.engine;version="1.17.0",
  org.apache.batik.css.engine.value;version="1.17.0",
  org.apache.batik.css.parser;version="1.17.0",
+ org.apache.batik.ext.awt.image.codec.imageio;version="1.17.0",
  org.apache.batik.i18n;version="1.17.0",
  org.apache.batik.transcoder;version="1.17.0",
  org.apache.batik.transcoder.image;version="1.17.0",
  org.apache.commons.cli,
- org.w3c.tidy,
- org.w3c.css.sac;version="1.3.0"
+ org.w3c.css.sac;version="1.3.0",
+ org.w3c.tidy
diff --git a/features/org.eclipse.birt.chart.doc.isv.feature/feature.xml b/features/org.eclipse.birt.chart.doc.isv.feature/feature.xml
@@ -39,15 +39,8 @@
       <discovery label="%updateSiteName" url="https://download.eclipse.org/birt/updates/release/latest"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.birt.chart.doc.isv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>