Skip to content

Commit b8f45d1

Browse files
ptzieglerptziegler
committed
Mark remaining internal CORE packages as such in Manifest
This adds the x-internal attribute to all exported packages that should not be used by clients. Exceptions have been added for all WindowBuilder plugins.
1 parent 809bc2f commit b8f45d1

File tree

5 files changed

+56
-28
lines changed

5 files changed

+56
-28
lines changed

‎org.eclipse.wb.core.databinding.xsd/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.core.databinding.xsd;singleton:=true
55
Bundle-Vendor: %providerName
6-
Bundle-Version: 1.0.300.qualifier
7-
Export-Package: org.eclipse.wb.core.databinding.xsd.component
6+
Bundle-Version: 1.1.0.qualifier
7+
Export-Package: org.eclipse.wb.core.databinding.xsd.component;x-friends:="org.eclipse.wb.core.java"
88
Import-Package: jakarta.xml.bind;version="[3.0.0,5.0.0)",
99
jakarta.xml.bind.annotation;version="[3.0.0,5.0.0)",
1010
org.glassfish.jaxb.runtime.v2;version="[3.0.0,5.0.0)"

‎org.eclipse.wb.core.databinding.xsd/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<artifactId>org.eclipse.wb.core.databinding.xsd</artifactId>
1616
<packaging>eclipse-plugin</packaging>
1717
<name>[bundle] WindowBuilder XSD Core</name>
18-
<version>1.0.300-SNAPSHOT</version>
18+
<version>1.1.0-SNAPSHOT</version>
1919

2020
<parent>
2121
<groupId>org.eclipse.wb</groupId>

‎org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF‎

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.core.databinding;singleton:=true
5-
Bundle-Version: 1.9.1000.qualifier
5+
Bundle-Version: 1.10.0.qualifier
66
Bundle-Activator: org.eclipse.wb.internal.core.databinding.Activator
77
Bundle-Vendor: %providerName
88
Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
@@ -12,21 +12,49 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
1212
org.eclipse.draw2d;bundle-version="[3.20.0,4.0.0)",
1313
org.eclipse.wb.core;bundle-version="[1.20.0,2.0.0)",
1414
org.eclipse.wb.core.java;bundle-version="[1.13.100,2.0.0)"
15-
Export-Package: org.eclipse.wb.internal.core.databinding,
16-
org.eclipse.wb.internal.core.databinding.model,
17-
org.eclipse.wb.internal.core.databinding.model.presentation,
18-
org.eclipse.wb.internal.core.databinding.model.reference,
19-
org.eclipse.wb.internal.core.databinding.parser,
20-
org.eclipse.wb.internal.core.databinding.ui,
21-
org.eclipse.wb.internal.core.databinding.ui.decorate,
22-
org.eclipse.wb.internal.core.databinding.ui.editor,
23-
org.eclipse.wb.internal.core.databinding.ui.editor.contentproviders,
24-
org.eclipse.wb.internal.core.databinding.ui.editor.dialogfields,
25-
org.eclipse.wb.internal.core.databinding.ui.filter,
26-
org.eclipse.wb.internal.core.databinding.ui.property,
27-
org.eclipse.wb.internal.core.databinding.ui.providers,
28-
org.eclipse.wb.internal.core.databinding.utils,
29-
org.eclipse.wb.internal.core.databinding.wizards.autobindings
15+
Export-Package: org.eclipse.wb.internal.core.databinding;x-internal:=true,
16+
org.eclipse.wb.internal.core.databinding.model;
17+
x-friends:="org.eclipse.wb.tests,
18+
org.eclipse.wb.rcp.databinding,
19+
org.eclipse.wb.swing.databinding,
20+
org.eclipse.wb.rcp.databinding.emf",
21+
org.eclipse.wb.internal.core.databinding.model.presentation;x-friends:="org.eclipse.wb.rcp.databinding,org.eclipse.wb.swing.databinding,org.eclipse.wb.rcp.databinding.emf",
22+
org.eclipse.wb.internal.core.databinding.model.reference;
23+
x-friends:="org.eclipse.wb.rcp.databinding,
24+
org.eclipse.wb.tests,
25+
org.eclipse.wb.rcp.databinding.emf,
26+
org.eclipse.wb.swing.databinding",
27+
org.eclipse.wb.internal.core.databinding.parser;
28+
x-friends:="org.eclipse.wb.rcp.databinding,
29+
org.eclipse.wb.swing.databinding,
30+
org.eclipse.wb.tests,
31+
org.eclipse.wb.rcp.databinding.emf",
32+
org.eclipse.wb.internal.core.databinding.ui;
33+
x-friends:="org.eclipse.wb.rcp.databinding.emf,
34+
org.eclipse.wb.rcp.databinding,
35+
org.eclipse.wb.tests,
36+
org.eclipse.wb.swing.databinding",
37+
org.eclipse.wb.internal.core.databinding.ui.decorate;x-friends:="org.eclipse.wb.rcp.databinding,org.eclipse.wb.swing.databinding,org.eclipse.wb.rcp.databinding.emf",
38+
org.eclipse.wb.internal.core.databinding.ui.editor;
39+
x-friends:="org.eclipse.wb.rcp.databinding,
40+
org.eclipse.wb.swing.databinding,
41+
org.eclipse.wb.tests,
42+
org.eclipse.wb.rcp.databinding.emf",
43+
org.eclipse.wb.internal.core.databinding.ui.editor.contentproviders;
44+
x-friends:="org.eclipse.wb.rcp.databinding,
45+
org.eclipse.wb.swing.databinding,
46+
org.eclipse.wb.tests,
47+
org.eclipse.wb.rcp.databinding.emf",
48+
org.eclipse.wb.internal.core.databinding.ui.editor.dialogfields;x-internal:=true,
49+
org.eclipse.wb.internal.core.databinding.ui.filter;x-friends:="org.eclipse.wb.rcp.databinding,org.eclipse.wb.swing.databinding",
50+
org.eclipse.wb.internal.core.databinding.ui.property;x-friends:="org.eclipse.wb.rcp.databinding,org.eclipse.wb.swing.databinding",
51+
org.eclipse.wb.internal.core.databinding.ui.providers;x-friends:="org.eclipse.wb.tests,org.eclipse.wb.swing.databinding,org.eclipse.wb.rcp.databinding",
52+
org.eclipse.wb.internal.core.databinding.utils;
53+
x-friends:="org.eclipse.wb.rcp.databinding,
54+
org.eclipse.wb.tests,
55+
org.eclipse.wb.swing.databinding,
56+
org.eclipse.wb.rcp.databinding.emf",
57+
org.eclipse.wb.internal.core.databinding.wizards.autobindings;x-friends:="org.eclipse.wb.rcp.databinding,org.eclipse.wb.swing.databinding"
3058
Bundle-ActivationPolicy: lazy
3159
Bundle-RequiredExecutionEnvironment: JavaSE-21
3260
Bundle-Localization: plugin

‎org.eclipse.wb.core.ui/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.core.ui;singleton:=true
5-
Bundle-Version: 1.10.900.qualifier
5+
Bundle-Version: 1.11.0.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
1111
org.eclipse.wb.core.java;bundle-version="[1.13.100,2.0.0)"
1212
Bundle-RequiredExecutionEnvironment: JavaSE-21
1313
Bundle-ActivationPolicy: lazy
14-
Export-Package: org.eclipse.wb.internal.core.preferences,
15-
org.eclipse.wb.internal.core.wizards.actions,
16-
org.eclipse.wb.internal.core.wizards.palette
14+
Export-Package: org.eclipse.wb.internal.core.preferences;x-friends:="org.eclipse.wb.rcp,org.eclipse.wb.swing",
15+
org.eclipse.wb.internal.core.wizards.actions;x-internal:=true,
16+
org.eclipse.wb.internal.core.wizards.palette;x-internal:=true
1717
Automatic-Module-Name: org.eclipse.wb.core.ui
1818
Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)"

‎org.eclipse.wb.layout.group/META-INF/MANIFEST.MF‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.layout.group;singleton:=true
5-
Bundle-Version: 1.9.1200.qualifier
5+
Bundle-Version: 1.10.0.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Bundle-ActivationPolicy: lazy
9-
Export-Package: org.eclipse.wb.internal.layout.group.gef,
10-
org.eclipse.wb.internal.layout.group.model,
11-
org.netbeans.modules.form.layoutdesign,
12-
org.netbeans.modules.form.layoutdesign.support
9+
Export-Package: org.eclipse.wb.internal.layout.group.gef;x-friends:="org.eclipse.wb.swing.java6",
10+
org.eclipse.wb.internal.layout.group.model;x-friends:="org.eclipse.wb.swing.java6",
11+
org.netbeans.modules.form.layoutdesign;x-friends:="org.eclipse.wb.swing.java6",
12+
org.netbeans.modules.form.layoutdesign.support;x-friends:="org.eclipse.wb.swing.java6"
1313
Bundle-ClassPath: .
1414
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.20.200,4.0.0)",
1515
org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)",

0 commit comments

Comments
 (0)