Skip to content

Commit

Permalink
cleanup bundle relations
Browse files Browse the repository at this point in the history
* Remove additional.bundles from build.properties (except for testing
dependencies). Those are NOT meant for hiding runtime dependencies, but
just development time and testing dependencies.
* Make e4 dependency non-optional. Our minimum target platform always
contains e4.
* Make team provider dependency non-optional. The way the Eclipse CS
code is written, those are required (we would have to defer class
loading if this were an actual optional dependency).
* Add org.eclipse.help dependency to doc bundle. That bundle provides
the help extension and therefore also should depend on the help system.
* remove build property which is only relevant for PDE export. We build
with Tycho.
  • Loading branch information
Bananeweizen authored and Calixte committed Feb 2, 2024
1 parent 33759ad commit 129ee01
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions net.sf.eclipsecs.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ Import-Package: org.dom4j;version="2.1.3",
org.eclipse.jdt.internal.ui.preferences.formatter,
org.eclipse.jface.text,
org.eclipse.osgi.util,
org.eclipse.team.core;resolution:=optional,
org.eclipse.team.core.subscribers;resolution:=optional,
org.eclipse.team.core.synchronize;resolution:=optional,
org.eclipse.team.core,
org.eclipse.team.core.subscribers,
org.eclipse.team.core.synchronize,
org.osgi.framework,
org.osgi.service.prefs,
org.yaml.snakeyaml;version="1.33.0"
Expand Down
1 change: 1 addition & 0 deletions net.sf.eclipsecs.doc/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: net.sf.eclipsecs.doc;singleton:=true
Bundle-Version: 10.12.6.qualifier
Require-Bundle: org.eclipse.help;bundle-version="3.9.0"
Bundle-Vendor: %Bundle-Vendor
Automatic-Module-Name: net.sf.eclipsecs.doc
1 change: 0 additions & 1 deletion net.sf.eclipsecs.doc/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ bin.includes = META-INF/,\
toc.xml,\
plugin.xml,\
OSGI-INF/
generateSourceBundle=false
3 changes: 2 additions & 1 deletion net.sf.eclipsecs.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ Import-Package: org.apache.commons.lang3;version="3.12.0",
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
org.eclipse.core.runtime.preferences,
org.eclipse.e4.ui.model.application;resolution:=optional,
org.eclipse.e4.ui.model.application,
org.eclipse.jdt.core,
org.eclipse.jdt.core.dom,
org.eclipse.jdt.core.formatter,
org.eclipse.jdt.ui,
org.eclipse.jface.action,
org.eclipse.jface.contentassist,
Expand Down
4 changes: 1 addition & 3 deletions net.sf.eclipsecs.ui/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ bin.includes = icons/,\
OSGI-INF/
jars.compile.order = .
source.. = src/
additional.bundles = org.eclipse.jdt.core,\
org.eclipse.core.runtime,\
assertj-core
additional.bundles = assertj-core
javacDefaultEncoding.. = UTF-8

0 comments on commit 129ee01

Please sign in to comment.