Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Required-Bundle o.e.osgi.services and remove unused dependencies #155

Merged
merged 2 commits into from
Jun 23, 2022
Merged

Replace Required-Bundle o.e.osgi.services and remove unused dependencies #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62961c2
Replace Required-Bundle o.e.osgi.services by package imports
HannesWell Jun 18, 2022
4f05fba
Remove unused required bundles
HannesWell Jun 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)",
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.core.di,
org.eclipse.e4.core.di.extensions,
org.eclipse.osgi.services,
org.eclipse.e4.core.services;bundle-version="2.0.0",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
org.eclipse.urischeme;bundle-version="[1.0.0,2.0.0)",
org.eclipse.e4.ui.di
Export-Package: org.eclipse.ui.internal.ide.application;x-internal:=true,
org.eclipse.ui.internal.ide.application.addons;x-internal:=true,
org.eclipse.ui.internal.ide.application.dialogs;x-internal:=true
Import-Package: javax.inject
Import-Package: javax.inject,
org.osgi.service.event;version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.ui.ide.application
10 changes: 3 additions & 7 deletions bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.17.0,4.0.0)";resol
org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
org.eclipse.swt;bundle-version="[3.107.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.125.0,4.0.0)",
org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
Expand All @@ -63,15 +61,13 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.17.0,4.0.0)";resol
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[1.3.0,2.0.0)",
org.eclipse.e4.core.commands;bundle-version="1.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.e4.ui.ide;bundle-version="[3.15.0,4.0.0)";visibility:=reexport,
org.eclipse.e4.core.di;bundle-version="[1.6.0,2.0.0)",
org.eclipse.e4.core.di.extensions;bundle-version="[0.14.0,1.0.0)",
org.eclipse.osgi.services;bundle-version="3.5.0",
org.eclipse.ui.navigator;bundle-version="3.7.400",
org.eclipse.jface;bundle-version="[3.18.0,4.0.0)"
org.eclipse.ui.navigator;bundle-version="3.7.400"
Import-Package: javax.annotation,
javax.inject
javax.inject,
org.osgi.service.event;version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.ui.ide

6 changes: 3 additions & 3 deletions tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.e4.ui.tests;singleton:=true
Bundle-Version: 0.14.700.qualifier
Bundle-Version: 0.14.800.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand All @@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0",
org.junit;bundle-version="3.8.2",
org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0";visibility:=reexport,
org.eclipse.osgi.services;bundle-version="3.2.0",
org.eclipse.e4.core.commands;bundle-version="0.9.0",
org.eclipse.e4.ui.bindings;bundle-version="0.9.0",
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.9.1",
Expand All @@ -44,7 +43,8 @@ Export-Package: org.eclipse.e4.ui.tests.model.test,
org.eclipse.e4.ui.tests.model.test.util
Bundle-ActivationPolicy: lazy
Import-Package: javax.annotation,
javax.inject;version="1.0.0"
javax.inject;version="1.0.0",
org.osgi.service.event
Eclipse-BundleShape: dir
Automatic-Module-Name: org.eclipse.e4.ui.tests

2 changes: 1 addition & 1 deletion tests/org.eclipse.e4.ui.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.e4.ui.tests</artifactId>
<version>0.14.700-SNAPSHOT</version>
<version>0.14.800-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<build>
Expand Down