Skip to content

Commit

Permalink
Fix module-info private packages for about_files
Browse files Browse the repository at this point in the history
The framework org.eclipse.osgi cannot be used with jlink
because the module-info is not including the about_files
directory in its list of private content for the module.

The generation of the module-info from BND is not including
this folder because it is only included as a root resource
in the bundle at packaging time from the build.properties.

This change moves the about_files folder into a source folder
so that it is included in the root of the bundle just like
any other resources from the compiled source folders. This
allows BND to see the resource and generate the module-info
class correctly.
  • Loading branch information
tjwatson committed Jun 14, 2024
1 parent b5d2453 commit d54699b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Bundle-Activator: org.eclipse.osgi.internal.framework.SystemBundleActivator
Bundle-Description: %systemBundle
Bundle-Copyright: %copyright
Bundle-Vendor: %eclipse.org
Bundle-Version: 3.20.0.qualifier
Bundle-Version: 3.20.100.qualifier
Bundle-Localization: systembundle
Bundle-DocUrl: http://www.eclipse.org
Eclipse-ExtensibleAPI: true
Expand Down
4 changes: 1 addition & 3 deletions bundles/org.eclipse.osgi/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ bin.includes = .options,\
systembundle.properties,\
*.profile,\
profile.list,\
about_files/,\
plugin.xml
src.includes = about.html,\
about_files/
src.includes = about.html
source.. = osgi/src,\
felix/src/,\
supplement/src/,\
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.20.0-SNAPSHOT</version>
<version>3.20.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<!-- The actual TCKs are executed in the org.eclipse.osgi.tck module because of reference to other service implementations -->
Expand Down

0 comments on commit d54699b

Please sign in to comment.