Ensure that all features can be installed in 2023-06

And a touch point to add to the available repositories https://download.eclipse.org/eclipse/birt/updates/release/latest Use org.eclipse.justj.epp which provide a touch point to add the repository for JustJ updates. Make the category.xml categories more consistent. #1286
eclipse-birt · Jun 10, 2023 · d77209f · d77209f
1 parent 066ce3c
commit d77209f
Show file tree

Hide file tree

Showing 14 changed files with 619 additions and 410 deletions.
diff --git a/README.md b/README.md
@@ -14,24 +14,21 @@ BIRT is built with [Apache Maven](http://maven.apache.org) through [Tycho](https
 
 To build BIRT with the latest Eclipse platform, run:
 
-    mvn package -DskipTests 
+    mvn clean verify -DskipTests=true
 
 ### Building environment
-* JDK 11
-* Maven 3.6.3
+* JDK 17
+* Maven 3.9.0
 
 ## Eclipse Version
-If you want to install BIRT as a plugin, please be aware that BIRT 4.12 requires Eclipse 4.25 and higher
+If you want to install BIRT as a plug-in, please be aware that BIRT 4.13 requires Eclipse 4.25 and higher
 
 ## Latest version 4.13.0
-* https://download.eclipse.org/birt/downloads/drops/latest
-* https://download.eclipse.org/birt/update-site/latest
+* https://download.eclipse.org/birt/updates/release/latest
 
 ## Current version 4.13.0
-* https://download.eclipse.org/birt/downloads/drops/R-R1-4.13.0-202303022006/
-* https://download.eclipse.org/birt/update-site/4.13.0/
+* https://download.eclipse.org/birt/updates/release/4.13.0/
 
 ## Latest snapshots towards 4.14.0
-* https://download.eclipse.org/birt/downloads/drops/snapshot/
-* https://download.eclipse.org/birt/update-site/snapshot/
+* https://download.eclipse.org/birt/updates/nightly/latest
 
diff --git a/build/birt-packages/birt-epp/category.xml b/build/birt-packages/birt-epp/category.xml
@@ -62,7 +62,7 @@
    <category-def name="Birt" label="BIRT Reporting SDK"/>
    <category-def name="Chart" label="BIRT Charting SDK"/>
    <category-def name="OSGi" label="BIRT Engine OSGi Runtime SDK"/>
-   <category-def name="wtpIntegration" label="BIRT WTP Integration SDK"/>
-   <category-def name="birtTest" label="Birt Unit Test"/>
+   <category-def name="wtpIntegration" label="BIRT Web Tools Integration SDK"/>
+   <category-def name="birtTest" label="BIRT Unit Test"/>
    <category-def name="BirtNL" label="BIRT Language Package"/>
 </site>
diff --git a/build/birt-packages/birt-report-all-in-one/BIRT.product b/build/birt-packages/birt-report-all-in-one/BIRT.product
diff --git a/build/birt-packages/birt-report-rcp/BIRT.product b/build/birt-packages/birt-report-rcp/BIRT.product
diff --git a/build/org.eclipse.birt.p2updatesite/category.xml b/build/org.eclipse.birt.p2updatesite/category.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
+<!--
+ *******************************************************************************
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *   See git history
+ *******************************************************************************
 -->
 <site>
    <feature id="org.eclipse.birt">
@@ -75,11 +75,11 @@
    <category-def name="Chart" label="BIRT Charting SDK"/>
    <category-def name="OSGi" label="BIRT Engine OSGi Runtime SDK"/>
    <category-def name="wtpIntegration" label="BIRT WTP Integration SDK"/>
-   <category-def name="BirtTest" label="Birt Unit Test"/>
+   <category-def name="BirtTest" label="BIRT Unit Test"/>
    <category-def name="BirtNL" label="BIRT Language Package"/>
-   <category-def name="BirtRcp" label="BIRT RCP -do not install in your ide-">
+   <category-def name="BirtRcp" label="BIRT RCP - Do not install in your IDE">
       <description>
-         Contains the rcp bundle for the designer product. Do not install in your IDE!
+         Contains the RCP bundle for the Designer product. Do not install in your IDE!
       </description>
    </category-def>
 </site>
diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup
@@ -429,6 +429,8 @@
       </annotation>
       <requirement
           name="org.eclipse.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group"/>
       <requirement
           name="*"/>
       <sourceLocator

diff --git a/build/org.eclipse.birt.site/.project b/build/org.eclipse.birt.site/.project
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="8">
+<target name="Generated from BIRT" sequenceNumber="9">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -344,6 +344,10 @@
       <unit id="org.eclipse.jetty.xml" version="0.0.0"/>
       <repository location="https://download.eclipse.org/oomph/jetty/release/10.0.15"/>
     </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.justj.epp.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/justj/epp/release/latest/"/>
+    </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
       <repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>

diff --git a/...tests/src/org/eclipse/birt/report/engine/emitter/pptx/tests/designs/pptx_project/.project b/...tests/src/org/eclipse/birt/report/engine/emitter/pptx/tests/designs/pptx_project/.project
diff --git a/features/org.eclipse.birt.engine.runtime/feature.xml b/features/org.eclipse.birt.engine.runtime/feature.xml
@@ -680,4 +680,39 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.collections4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.math3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.ooxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.ooxml.schemas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xmlbeans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.birt.feature/build.properties b/features/org.eclipse.birt.feature/build.properties
@@ -11,5 +11,6 @@
 # *   See git history
 # *******************************************************************************/
 bin.includes = feature.xml,\
-               feature.properties
+               feature.properties,\
+               p2.inf
 
diff --git a/features/org.eclipse.birt.feature/feature.xml b/features/org.eclipse.birt.feature/feature.xml
@@ -34,11 +34,6 @@
       %license
    </license>
 
-   <url>
-      <update label="%updateSiteName" url="https://download.eclipse.org/birt/update-site/latest/"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/birt/update-site/latest"/>
-   </url>
-
    <includes
          id="org.eclipse.birt.report.designer.editor.xml.wtp"
          version="0.0.0"
@@ -911,4 +906,109 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.collections4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.math3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.ooxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.ooxml.schemas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.birt.report.designer.ui.preview"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.osgi.boot"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mortbay.jasper.apache-el"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mortbay.jasper.apache-jsp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.apache-jsp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.osgi.util.tracker"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.deploy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="jakarta.servlet-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.servlet-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xmlbeans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.birt.feature/p2.inf b/features/org.eclipse.birt.feature/p2.inf
@@ -0,0 +1,16 @@
+#/*******************************************************************************
+# * Copyright (c) 2023 Contributors to the Eclipse Foundation
+# * 
+# * This program and the accompanying materials are made available under the
+# * terms of the Eclipse Public License 2.0 which is available at
+# * https://www.eclipse.org/legal/epl-2.0/.
+# * 
+# * SPDX-License-Identifier: EPL-2.0
+# * 
+# * Contributors:
+# *   See git history
+# *******************************************************************************/
+
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/birt/updates/release/latest,name:BIRT Project Updates);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/birt/updates/release/latest,name:BIRT Project Updates);