From 89c1d69cddffef192fd9bb37c6b4a65ab3daf265 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Thu, 28 Sep 2023 07:56:38 +0200 Subject: [PATCH] Remove ECF from products THe products are over-specified and include directly things that are also indirectly induced by other things. In this case, the Platform's evolving use of ECF is causing a problem. https://github.com/eclipse-birt/birt/pull/1433 --- .../BIRT-headless.product | 6 -- .../BIRT.product | 6 -- .../birt-report-all-in-one/BIRT.product | 4 - .../birt-report-rcp/BIRT.product | 4 - build/org.eclipse.birt.releng/BIRT.setup | 4 +- .../org.eclipse.birt.target.target | 93 ++++++++++++------- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- 8 files changed, 62 insertions(+), 61 deletions(-) diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product b/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product index af076e7216..2f53a4b341 100644 --- a/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product +++ b/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product @@ -358,12 +358,6 @@ United States, other countries, or both. - - - - - - diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product b/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product index bea4a581c8..34e881bf6f 100644 --- a/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product +++ b/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product @@ -361,12 +361,6 @@ United States, other countries, or both. - - - - - - diff --git a/build/birt-packages/birt-report-all-in-one/BIRT.product b/build/birt-packages/birt-report-all-in-one/BIRT.product index 8f550d4ebe..93157626fc 100644 --- a/build/birt-packages/birt-report-all-in-one/BIRT.product +++ b/build/birt-packages/birt-report-all-in-one/BIRT.product @@ -253,10 +253,6 @@ United States, other countries, or both. - - - - diff --git a/build/birt-packages/birt-report-rcp/BIRT.product b/build/birt-packages/birt-report-rcp/BIRT.product index cab575f408..734e09b7c2 100644 --- a/build/birt-packages/birt-report-rcp/BIRT.product +++ b/build/birt-packages/birt-report-rcp/BIRT.product @@ -252,10 +252,6 @@ United States, other countries, or both. - - - - diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup index bda13c66f3..01f2cd9d73 100644 --- a/build/org.eclipse.birt.releng/BIRT.setup +++ b/build/org.eclipse.birt.releng/BIRT.setup @@ -440,11 +440,11 @@ + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/> + url="https://download.eclipse.org/oomph/jetty/release/10.0.16"/> - + + + + + + + + - - - - + + + + + + + + + + + + + @@ -46,25 +62,27 @@ - - - - + + + - - - - + + + + + + + @@ -74,6 +92,8 @@ + + @@ -82,6 +102,7 @@ + @@ -105,21 +126,23 @@ - - - - - - + + + + + + + + @@ -129,22 +152,30 @@ + + + + + + + + + + + - + - - - @@ -192,9 +223,8 @@ - - - + + @@ -286,7 +316,6 @@ - @@ -298,20 +327,12 @@ - - - - - - - - - + diff --git a/common/org.apache.batik.transcoder.birt.ext/META-INF/MANIFEST.MF b/common/org.apache.batik.transcoder.birt.ext/META-INF/MANIFEST.MF index 010b8c8e45..871950380f 100644 --- a/common/org.apache.batik.transcoder.birt.ext/META-INF/MANIFEST.MF +++ b/common/org.apache.batik.transcoder.birt.ext/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Batik Transcoder Extension Bundle-SymbolicName: org.apache.batik.transcoder.birt.ext;singleton:=true Bundle-Version: 1.14.0.qualifier -Fragment-Host: org.apache.batik.transcoder;bundle-version="[1.16.0,1.17.0)" +Fragment-Host: org.apache.batik.transcoder;bundle-version="[1.17.0,1.18.0)" Bundle-Vendor: Eclipse BIRT Automatic-Module-Name: org.apache.batik.ext.awt.extension Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.apache.batik.codec;bundle-version="[1.16.0,1.17.0)" +Require-Bundle: org.apache.batik.codec;bundle-version="[1.17.0,1.18.0)" diff --git a/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF b/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF index f9ea004525..1e0259b574 100644 --- a/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF +++ b/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0", org.apache.poi.ooxml;bundle-version="[4.1.1,5.0.0)", org.apache.poi.ooxml.schemas;bundle-version="[4.1.1,5.0.0)", org.apache.xmlbeans;bundle-version="[3.1.0,4.0.0)", - org.apache.commons.compress;bundle-version="[1.19.0,2.0.0)" + org.apache.commons.commons-compress;bundle-version="[1.24.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: ., lib/commons-codec-1.5.jar