Skip to content

Commit

Permalink
Replace (partly unused) dependency to org.eclipse.osgi.services
Browse files Browse the repository at this point in the history
The bundle 'o.e.osgi.services' is deprecated for removal as part of
eclipse-equinox/equinox#18
and already has been replaced to only re-export the 'official' OSGi
artifacts published to Maven-Central.

It should be replaced by imports of the desired org.osgi.service.*
packages so that the runtime can choose a suitable provider
independently of the bundle name.

Change-Id: I7cd641671a3298fcb7b0d9dbdd3d0c2ef970a6c3
  • Loading branch information
HannesWell authored and msohn committed Dec 23, 2023
1 parent 33712c1 commit eb2608b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions org.eclipse.egit.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)",
org.eclipse.equinox.security;bundle-version="[1.3.1000,2.0.0)",
org.eclipse.core.variables;bundle-version="[3.5.100,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.7.200,4.0.0)",
org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)"
org.eclipse.core.filebuffers;bundle-version="[3.7.200,4.0.0)"
Export-Package: org.eclipse.egit.core;version="6.9.0";
x-friends:="org.eclipse.egit.ui,
org.eclipse.egit.ui.test,
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.egit.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)";resolution:=optional,
org.eclipse.jdt.ui;bundle-version="[3.27.100,4.0.0)";resolution:=optional,
org.eclipse.ui.views;bundle-version="[3.11.300,4.0.0)",
org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.11.0,2.0.0)",
org.eclipse.e4.core.services;bundle-version="[2.3.400,3.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[1.14.0,2.0.0)",
Expand Down Expand Up @@ -83,7 +82,8 @@ Import-Package: org.eclipse.egit.core;version="[6.9.0,6.10.0)",
org.eclipse.jgit.treewalk;version="[6.9.0,6.10.0)",
org.eclipse.jgit.treewalk.filter;version="[6.9.0,6.10.0)",
org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
org.eclipse.jgit.util.io;version="[6.9.0,6.10.0)"
org.eclipse.jgit.util.io;version="[6.9.0,6.10.0)",
org.osgi.service.event;version="[1.4.0,2.0.0)"
Export-Package: org.eclipse.egit.ui;version="6.9.0";x-friends:="org.eclipse.egit.gitflow.ui",
org.eclipse.egit.ui.history;version="6.9.0",
org.eclipse.egit.ui.internal;version="6.9.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui",
Expand Down

0 comments on commit eb2608b

Please sign in to comment.