Skip to content

Commit 06c30e8

Browse files
authored
Remove bundle org.w3c.css.sac require (#1113)
Replace with org.w3c.css.sac package import where needed eclipse-platform/eclipse.platform.releng.aggregator#1349
1 parent bcd027a commit 06c30e8

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.ui.css.core;singleton:=true
44
Bundle-Name: %pluginName
55
Bundle-Vendor: %providerName
66
Bundle-Localization: plugin
7-
Bundle-Version: 0.14.100.qualifier
7+
Bundle-Version: 0.14.200.qualifier
88
Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true,
99
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",
1010
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,
3838
org.eclipse.e4.ui.css.core.util.impl.resources;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt",
3939
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",
4040
org.eclipse.e4.ui.css.core.utils;x-friends:="org.eclipse.e4.ui.css.swt"
41-
Require-Bundle: org.w3c.css.sac;bundle-version="1.3.0",
42-
org.apache.batik.css;bundle-version="[1.9.1,2.0.0)",
41+
Import-Package: org.w3c.css.sac;version="1.3.0",
42+
org.w3c.css.sac.helpers;version="1.3.0"
43+
Require-Bundle: org.apache.batik.css;bundle-version="[1.9.1,2.0.0)",
4344
org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)",
4445
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)"
4546
Bundle-RequiredExecutionEnvironment: JavaSE-17
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.e4.ui.css.swt.theme;singleton:=true
4-
Bundle-Version: 0.14.100.qualifier
4+
Bundle-Version: 0.14.200.qualifier
55
Bundle-Name: %pluginName
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Require-Bundle: org.eclipse.swt;bundle-version="[3.6.0,4.0.0)",
1010
org.eclipse.e4.ui.css.swt;bundle-version="0.13.100",
1111
org.eclipse.e4.ui.css.core;bundle-version="0.12.200",
12-
org.w3c.css.sac;bundle-version="1.3.0",
1312
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)"
1413
Service-Component: OSGI-INF/org.eclipse.e4.ui.css.swt.internal.theme.ThemeEngineManager.xml
1514
Bundle-ActivationPolicy: lazy
1615
Export-Package: org.eclipse.e4.ui.css.swt.internal.theme;x-internal:=true,
1716
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"
1817
Import-Package: org.eclipse.osgi.service.datalocation;version="1.3.0",
1918
org.osgi.framework;version="[1.5.0,2.0.0)",
20-
org.osgi.service.event;version="[1.3.0,2.0.0)"
19+
org.osgi.service.event;version="[1.3.0,2.0.0)",
20+
org.w3c.css.sac;version="1.3.0"
2121
Require-Capability: osgi.extender;
2222
filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))"
2323
Automatic-Module-Name: org.eclipse.e4.ui.css.swt.theme

bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.e4.ui.css.swt;singleton:=true
4-
Bundle-Version: 0.15.100.qualifier
4+
Bundle-Version: 0.15.200.qualifier
55
Bundle-Name: %pluginName
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
@@ -29,9 +29,9 @@ Export-Package: org.eclipse.e4.ui.css.swt;x-friends:="org.eclipse.ui.workbench",
2929
org.eclipse.e4.ui.internal.css.swt.definition;x-friends:="org.eclipse.ui.workbench"
3030
Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="0.12.200",
3131
org.eclipse.swt;bundle-version="[3.106.0,4.0.0)",
32-
org.w3c.css.sac;bundle-version="1.3.0",
3332
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)"
3433
Bundle-RequiredExecutionEnvironment: JavaSE-17
3534
Bundle-ActivationPolicy: lazy
36-
Import-Package: org.eclipse.jface.resource
35+
Import-Package: org.eclipse.jface.resource,
36+
org.w3c.css.sac;version="1.3.0"
3737
Automatic-Module-Name: org.eclipse.e4.ui.css.swt

tests/org.eclipse.e4.ui.tests.css.core/META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.e4.ui.tests.css.core
5-
Bundle-Version: 1.302.200.qualifier
5+
Bundle-Version: 1.302.300.qualifier
66
Require-Bundle: org.eclipse.core.runtime,
77
org.eclipse.swt,
88
org.eclipse.e4.ui.css.core,
9-
org.eclipse.e4.ui.css.swt,
10-
org.w3c.css.sac
9+
org.eclipse.e4.ui.css.swt
1110
Bundle-ActivationPolicy: lazy
1211
Bundle-RequiredExecutionEnvironment: JavaSE-17
1312
Eclipse-BundleShape: dir
@@ -16,6 +15,7 @@ Export-Package: org.eclipse.e4.ui.tests.css.core;x-internal:=true,
1615
org.eclipse.e4.ui.tests.css.core.util;x-internal:=true
1716
Automatic-Module-Name: org.eclipse.e4.ui.tests.css.core
1817
Import-Package: org.junit.jupiter.api,
19-
org.junit.platform.suite.api
18+
org.junit.platform.suite.api,
19+
org.w3c.css.sac;version="1.3.0"
2020
Bundle-Vendor: %Bundle-Vendor
2121

tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.e4.ui.tests.css.swt; singleton:=true
5-
Bundle-Version: 0.12.300.qualifier
5+
Bundle-Version: 0.12.400.qualifier
66
Require-Bundle: org.eclipse.e4.ui.css.core,
77
org.eclipse.e4.ui.css.swt,
8-
org.w3c.css.sac,
98
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
109
org.mockito.mockito-core;bundle-version="2.13.0",
1110
org.eclipse.equinox.preferences;bundle-version="3.5.200",
@@ -17,7 +16,8 @@ Import-Package: org.eclipse.core.runtime;version="3.5.0",
1716
org.junit.jupiter.api.function,
1817
org.junit.platform.suite.api;version="1.9.1",
1918
org.osgi.framework;version="[1.7.0,2.0.0)",
20-
org.osgi.service.event;version="[1.3.0,2.0.0)"
19+
org.osgi.service.event;version="[1.3.0,2.0.0)",
20+
org.w3c.css.sac;version="1.3.0"
2121
Eclipse-BundleShape: dir
2222
Automatic-Module-Name: org.eclipse.e4.ui.tests.css.swt
2323
Bundle-Vendor: %Bundle-Vendor

tools/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true
5-
Bundle-Version: 4.9.100.qualifier
5+
Bundle-Version: 4.9.200.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-17
77
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
88
org.eclipse.core.runtime;bundle-version="3.29.0",
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
1212
org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
1313
org.eclipse.e4.ui.css.core;bundle-version="0.9.0",
1414
org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
15-
org.w3c.css.sac;bundle-version="1.3.0",
1615
org.eclipse.pde.core;bundle-version="3.6.0",
1716
org.eclipse.core.resources;bundle-version="3.6.0",
1817
org.eclipse.jdt.core;bundle-version="3.6.0",

0 commit comments

Comments
 (0)