Skip to content

Commit

Permalink
Handle the internal refactoring packages moving bundles
Browse files Browse the repository at this point in the history
The org.eclipse.jdt.internal.corext.refactoring packages have
been moved to org.eclipse.jdt.core.manipulation.

This change modifies the bndtools.bnd to import sub packages of
org.eclipse.jdt.internal.corext.refactoring with no attributes
to avoid resolution errors on the version of Eclipse that
moves these packages.

Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

---
 Signed-off-by: Peter Kriens <Peter.Kriens@aQute.biz>
  • Loading branch information
tjwatson authored and pkriens committed Sep 27, 2023
1 parent b764ee8 commit 5f700d2
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions cnf/includes/bndtools.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,22 @@ Bundle-Copyright: Copyright (c) Neil Bartlett (2009, ${tstamp;yyyy}) and others.
Bundle-DocURL: https://bndtools.org/

# Import-Package clauses for Eclipse packages
#
# We use bundle-symbolic-name and bundle-version because Eclipse is
# terrible at managing packages and Require-Bundle is too promiscuous.
#
# For org.eclipse.jdt.internal.corext.refactoring we do not use
# bundle-symbolic-name or bundle-version. This package is not
# considered API by the Eclipse project and therefore is free
# to move to another bundle.
eclipse.importpackage: \
org.eclipse.jdt.internal.corext.refactoring.*;version=!;ui.workbench=!;common=!;registry=!;texteditor=!;text=!,\
org.eclipse.*;bundle-symbolic-name="${@bundlesymbolicname}";bundle-version="${range;[==,+);${@bundleversion}}";version=!;ui.workbench=!;common=!;registry=!;texteditor=!;text=!

# Decorate Equinox OSGi framework dependency
-buildpath+.equinox: "org.eclipse.osgi";maven-scope=provided

# Add a fixup for the Unsued import on the refactoring package from above.
# This package is only used by a small number of bundles (only bndtools.core)
-fixupmessages.eclipserefactor: "Unused Import-Package instructions: \\[org.eclipse.jdt.internal.corext.refactoring.*\\]

0 comments on commit 5f700d2

Please sign in to comment.