From e3798df6e810ab08d821f158e83fe0fd3fd0eb18 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 11 Sep 2023 20:58:15 +0200 Subject: 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 --- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit.ant/META-INF') diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 87a510c338..5a4e31c954 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 6.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.8.0,6.9.0)" -Bundle-Localization: plugin +Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.ant;version="6.8.0", org.eclipse.jgit.ant.tasks;version="6.8.0"; -- cgit v1.2.3