diff options
| author | Thomas Wolf <twolf@apache.org> | 2023-09-11 20:58:15 +0200 |
|---|---|---|
| committer | Thomas Wolf <twolf@apache.org> | 2023-09-12 20:27:59 +0200 |
| commit | e3798df6e810ab08d821f158e83fe0fd3fd0eb18 (patch) | |
| tree | c9e4f6fd4fc5aaede9754bd394a157b3784489f9 /org.eclipse.jgit.archive | |
| parent | 82c6638c72cd9525bab94b02438c167747132be9 (diff) | |
| download | jgit-e3798df6e810ab08d821f158e83fe0fd3fd0eb18.tar.gz jgit-e3798df6e810ab08d821f158e83fe0fd3fd0eb18.zip | |
OSGi: move plugin localization to subdirectory
OSGi can have its plugin localization at an arbitrary place; there is
no need to have it in a top-level plugin.properties file. In non-OSGi
environments having the files at the root level may mean that these
files clash with each other, or, as in the referenced bug, with some
third-party plug-in's plugin.properties, which may not even have
anything to do with localization.
Move our OSGi localization to a subfolder OSGI-INF/l10n. For OSGi
environments, that's just as good, and for non-OSGi environments it
avoid clashes with other root level items on the classpath or in a fat
JAR.
For fragments, use neither plugin.properties (which would clash with the
host plug-in's plugin.properties) nor fragment.properties (which might
clash with other fragments for the same fragment host bundle). Instead
use names "relative" to the host bundle.
Bug: 582394
Change-Id: Ifbcd046d912e2cfe86c0f7259c5ca8de599d9aa1
Signed-off-by: Thomas Wolf <twolf@apache.org>
Diffstat (limited to 'org.eclipse.jgit.archive')
| -rw-r--r-- | org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties (renamed from org.eclipse.jgit.archive/plugin.properties) | 0 | ||||
| -rw-r--r-- | org.eclipse.jgit.archive/build.properties | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 456496337b..486acd9899 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive Bundle-Version: 6.8.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-Localization: plugin +Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.archivers.tar;version="[1.4,2.0)", diff --git a/org.eclipse.jgit.archive/plugin.properties b/org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties index fe22ce863c..fe22ce863c 100644 --- a/org.eclipse.jgit.archive/plugin.properties +++ b/org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties diff --git a/org.eclipse.jgit.archive/build.properties b/org.eclipse.jgit.archive/build.properties index d944674ba0..4482a12632 100644 --- a/org.eclipse.jgit.archive/build.properties +++ b/org.eclipse.jgit.archive/build.properties @@ -1,6 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ + OSGI-INF/,\ .,\ - about.html,\ - plugin.properties + about.html |