From 06c30e8017d69f70e8dbafc31c6530c980aeb5fa Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Wed, 13 Sep 2023 19:24:15 +0200 Subject: [PATCH] Remove bundle org.w3c.css.sac require (#1113) Replace with org.w3c.css.sac package import where needed https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1349 --- bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF | 7 ++++--- .../org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF | 6 +++--- bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF | 6 +++--- .../org.eclipse.e4.ui.tests.css.core/META-INF/MANIFEST.MF | 8 ++++---- .../org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 3 +-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF index 3040c71807a..41399b37b7d 100644 --- a/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.ui.css.core;singleton:=true Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 0.14.100.qualifier +Bundle-Version: 0.14.200.qualifier Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true, org.eclipse.e4.ui.css.core.css2;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.jface", org.eclipse.e4.ui.css.core.dom;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.forms", @@ -38,8 +38,9 @@ Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true, org.eclipse.e4.ui.css.core.util.impl.resources;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt", org.eclipse.e4.ui.css.core.util.resources;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt", org.eclipse.e4.ui.css.core.utils;x-friends:="org.eclipse.e4.ui.css.swt" -Require-Bundle: org.w3c.css.sac;bundle-version="1.3.0", - org.apache.batik.css;bundle-version="[1.9.1,2.0.0)", +Import-Package: org.w3c.css.sac;version="1.3.0", + org.w3c.css.sac.helpers;version="1.3.0" +Require-Bundle: org.apache.batik.css;bundle-version="[1.9.1,2.0.0)", org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF index 3c6446e11e3..33bb8701d18 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt.theme;singleton:=true -Bundle-Version: 0.14.100.qualifier +Bundle-Version: 0.14.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -9,7 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.swt;bundle-version="[3.6.0,4.0.0)", org.eclipse.e4.ui.css.swt;bundle-version="0.13.100", org.eclipse.e4.ui.css.core;bundle-version="0.12.200", - org.w3c.css.sac;bundle-version="1.3.0", org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)" Service-Component: OSGI-INF/org.eclipse.e4.ui.css.swt.internal.theme.ThemeEngineManager.xml Bundle-ActivationPolicy: lazy @@ -17,7 +16,8 @@ Export-Package: org.eclipse.e4.ui.css.swt.internal.theme;x-internal:=true, org.eclipse.e4.ui.css.swt.theme;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.workbench" Import-Package: org.eclipse.osgi.service.datalocation;version="1.3.0", org.osgi.framework;version="[1.5.0,2.0.0)", - org.osgi.service.event;version="[1.3.0,2.0.0)" + org.osgi.service.event;version="[1.3.0,2.0.0)", + org.w3c.css.sac;version="1.3.0" Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))" Automatic-Module-Name: org.eclipse.e4.ui.css.swt.theme diff --git a/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF index 2bf21170e79..d05c2849dd4 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt;singleton:=true -Bundle-Version: 0.15.100.qualifier +Bundle-Version: 0.15.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -29,9 +29,9 @@ Export-Package: org.eclipse.e4.ui.css.swt;x-friends:="org.eclipse.ui.workbench", org.eclipse.e4.ui.internal.css.swt.definition;x-friends:="org.eclipse.ui.workbench" Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="0.12.200", org.eclipse.swt;bundle-version="[3.106.0,4.0.0)", - org.w3c.css.sac;bundle-version="1.3.0", org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.jface.resource +Import-Package: org.eclipse.jface.resource, + org.w3c.css.sac;version="1.3.0" Automatic-Module-Name: org.eclipse.e4.ui.css.swt diff --git a/tests/org.eclipse.e4.ui.tests.css.core/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests.css.core/META-INF/MANIFEST.MF index 1764b9738ae..bc6e378f4b6 100644 --- a/tests/org.eclipse.e4.ui.tests.css.core/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests.css.core/META-INF/MANIFEST.MF @@ -2,12 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.ui.tests.css.core -Bundle-Version: 1.302.200.qualifier +Bundle-Version: 1.302.300.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.swt, org.eclipse.e4.ui.css.core, - org.eclipse.e4.ui.css.swt, - org.w3c.css.sac + org.eclipse.e4.ui.css.swt Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir @@ -16,6 +15,7 @@ Export-Package: org.eclipse.e4.ui.tests.css.core;x-internal:=true, org.eclipse.e4.ui.tests.css.core.util;x-internal:=true Automatic-Module-Name: org.eclipse.e4.ui.tests.css.core Import-Package: org.junit.jupiter.api, - org.junit.platform.suite.api + org.junit.platform.suite.api, + org.w3c.css.sac;version="1.3.0" Bundle-Vendor: %Bundle-Vendor diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF index e1a5b398db2..a3b45becde0 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF @@ -2,10 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.ui.tests.css.swt; singleton:=true -Bundle-Version: 0.12.300.qualifier +Bundle-Version: 0.12.400.qualifier Require-Bundle: org.eclipse.e4.ui.css.core, org.eclipse.e4.ui.css.swt, - org.w3c.css.sac, org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1", org.mockito.mockito-core;bundle-version="2.13.0", org.eclipse.equinox.preferences;bundle-version="3.5.200", @@ -17,7 +16,8 @@ Import-Package: org.eclipse.core.runtime;version="3.5.0", org.junit.jupiter.api.function, org.junit.platform.suite.api;version="1.9.1", org.osgi.framework;version="[1.7.0,2.0.0)", - org.osgi.service.event;version="[1.3.0,2.0.0)" + org.osgi.service.event;version="[1.3.0,2.0.0)", + org.w3c.css.sac;version="1.3.0" Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.e4.ui.tests.css.swt Bundle-Vendor: %Bundle-Vendor diff --git a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF index 6c316eab054..f475e537b47 100644 --- a/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF +++ b/tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true -Bundle-Version: 4.9.100.qualifier +Bundle-Version: 4.9.200.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.29.0", @@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.e4.ui.workbench;bundle-version="0.9.1", org.eclipse.e4.ui.css.core;bundle-version="0.9.0", org.eclipse.e4.ui.css.swt;bundle-version="0.9.1", - org.w3c.css.sac;bundle-version="1.3.0", org.eclipse.pde.core;bundle-version="3.6.0", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.jdt.core;bundle-version="3.6.0",