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>

49 files changed, 51 insertions, 37 deletions

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";
diff --git a/org.eclipse.jgit.ant/plugin.properties b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties
index 7c9e5f04a4..7c9e5f04a4 100644
--- a/org.eclipse.jgit.ant/plugin.properties
+++ b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.ant/build.properties b/org.eclipse.jgit.ant/build.properties
index 43a5be6a54..17f6d12a99 100644
--- a/org.eclipse.jgit.ant/build.properties
+++ b/org.eclipse.jgit.ant/build.properties
@@ -2,8 +2,8 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
 additional.bundles = org.apache.ant,\
                      org.eclipse.jgit,\
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
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 8ca30bf777..0ae8c30600 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.gpg.bc
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
 Fragment-Host: org.eclipse.jgit;bundle-version="[6.8.0,6.9.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/gpg_bc
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
diff --git a/org.eclipse.jgit.gpg.bc/plugin.properties b/org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties
index b0914927bf..b0914927bf 100644
--- a/org.eclipse.jgit.gpg.bc/plugin.properties
+++ b/org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties
diff --git a/org.eclipse.jgit.gpg.bc/build.properties b/org.eclipse.jgit.gpg.bc/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.gpg.bc/build.properties
+++ b/org.eclipse.jgit.gpg.bc/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 4d8c3aebb1..14a5d37a18 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.http.apache
 Bundle-SymbolicName: org.eclipse.jgit.http.apache
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.http;version="[4.3.0,5.0.0)",
diff --git a/org.eclipse.jgit.http.apache/plugin.properties b/org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties
index e242829161..e242829161 100644
--- a/org.eclipse.jgit.http.apache/plugin.properties
+++ b/org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.http.apache/build.properties b/org.eclipse.jgit.http.apache/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.http.apache/build.properties
+++ b/org.eclipse.jgit.http.apache/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index e6f551a071..7e84c635a5 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.server
 Bundle-SymbolicName: org.eclipse.jgit.http.server
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.http.server;version="6.8.0",
  org.eclipse.jgit.http.server.glue;version="6.8.0";
diff --git a/org.eclipse.jgit.http.server/plugin.properties b/org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties
index bcec310397..bcec310397 100644
--- a/org.eclipse.jgit.http.server/plugin.properties
+++ b/org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.http.server/build.properties b/org.eclipse.jgit.http.server/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.http.server/build.properties
+++ b/org.eclipse.jgit.http.server/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 6a2e4f52a1..c833019468 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.http
 Bundle-SymbolicName: org.eclipse.jgit.junit.http
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.eclipse.jgit.junit.http/plugin.properties b/org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties
index 2ec05e1a5b..2ec05e1a5b 100644
--- a/org.eclipse.jgit.junit.http/plugin.properties
+++ b/org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.junit.http/build.properties b/org.eclipse.jgit.junit.http/build.properties
index aa1a008269..931e1631af 100644
--- a/org.eclipse.jgit.junit.http/build.properties
+++ b/org.eclipse.jgit.junit.http/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.properties
+               OSGI-INF/,\
+               .
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index 7001ad313b..e89faf9192 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.ssh
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.eclipse.jgit.junit.ssh/plugin.properties b/org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties
index 3af91ed4e7..3af91ed4e7 100644
--- a/org.eclipse.jgit.junit.ssh/plugin.properties
+++ b/org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.junit.ssh/build.properties b/org.eclipse.jgit.junit.ssh/build.properties
index 84f1c95cfa..408f54edfa 100644
--- a/org.eclipse.jgit.junit.ssh/build.properties
+++ b/org.eclipse.jgit.junit.ssh/build.properties
@@ -2,5 +2,5 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.properties
+               OSGI-INF/,\
+               .
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 492f28e427..7f85f0c063 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit
 Bundle-SymbolicName: org.eclipse.jgit.junit
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties
index f40f8e1d9f..f40f8e1d9f 100644
--- a/org.eclipse.jgit.junit/plugin.properties
+++ b/org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.junit/build.properties b/org.eclipse.jgit.junit/build.properties
index aa1a008269..931e1631af 100644
--- a/org.eclipse.jgit.junit/build.properties
+++ b/org.eclipse.jgit.junit/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.properties
+               OSGI-INF/,\
+               .
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index 9f9b237ce0..6c3b73ae9b 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.lfs.server;version="6.8.0";
   uses:="javax.servlet.http,
diff --git a/org.eclipse.jgit.lfs.server/plugin.properties b/org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties
index 4b9ee82fdb..4b9ee82fdb 100644
--- a/org.eclipse.jgit.lfs.server/plugin.properties
+++ b/org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.lfs.server/build.properties b/org.eclipse.jgit.lfs.server/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.lfs.server/build.properties
+++ b/org.eclipse.jgit.lfs.server/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 2873d7b1e5..f579a6eb8c 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs
 Bundle-SymbolicName: org.eclipse.jgit.lfs
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.lfs;version="6.8.0",
  org.eclipse.jgit.lfs.errors;version="6.8.0",
diff --git a/org.eclipse.jgit.lfs/plugin.properties b/org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties
index 76ead9b94f..76ead9b94f 100644
--- a/org.eclipse.jgit.lfs/plugin.properties
+++ b/org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.lfs/build.properties b/org.eclipse.jgit.lfs/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.lfs/build.properties
+++ b/org.eclipse.jgit.lfs/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 3a3e843376..7165badefe 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.pgm
 Bundle-SymbolicName: org.eclipse.jgit.pgm
 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: javax.servlet;version="[3.1.0,5.0.0)",
  org.apache.commons.logging;version="[1.2,2.0)",
diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties
index bfa216c8a1..bfa216c8a1 100644
--- a/org.eclipse.jgit.pgm/plugin.properties
+++ b/org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties
index 302dded85a..ca8f30b9ed 100644
--- a/org.eclipse.jgit.pgm/build.properties
+++ b/org.eclipse.jgit.pgm/build.properties
@@ -3,7 +3,7 @@ source.. = src/,\
            /
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html,\
                resources/simplelogger.properties
diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
index 44a844f2b7..8af012a87a 100644
--- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/agent
 Bundle-Vendor: %Bundle-Vendor
 Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.8.0,6.9.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jgit.ssh.apache.agent/plugin.properties b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties
index 86df8f2e72..86df8f2e72 100644
--- a/org.eclipse.jgit.ssh.apache.agent/plugin.properties
+++ b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties
diff --git a/org.eclipse.jgit.ssh.apache.agent/build.properties b/org.eclipse.jgit.ssh.apache.agent/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.ssh.apache.agent/build.properties
+++ b/org.eclipse.jgit.ssh.apache.agent/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index b12b3da84b..e7f817bf45 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.apache
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.eclipse.jgit.ssh.apache/plugin.properties b/org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties
index 8358cc1a78..8358cc1a78 100644
--- a/org.eclipse.jgit.ssh.apache/plugin.properties
+++ b/org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.ssh.apache/build.properties b/org.eclipse.jgit.ssh.apache/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.ssh.apache/build.properties
+++ b/org.eclipse.jgit.ssh.apache/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index ba6c405ef8..54830a4984 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
 Fragment-Host: org.eclipse.jgit;bundle-version="[6.8.0,6.9.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/jsch
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.eclipse.jgit.ssh.jsch/plugin.properties b/org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties
index 126709b961..126709b961 100644
--- a/org.eclipse.jgit.ssh.jsch/plugin.properties
+++ b/org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties
diff --git a/org.eclipse.jgit.ssh.jsch/build.properties b/org.eclipse.jgit.ssh.jsch/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.ssh.jsch/build.properties
+++ b/org.eclipse.jgit.ssh.jsch/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 67380ee4d9..05179db81e 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
diff --git a/org.eclipse.jgit.ui/plugin.properties b/org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties
index ce004ac00c..ce004ac00c 100644
--- a/org.eclipse.jgit.ui/plugin.properties
+++ b/org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.ui/build.properties b/org.eclipse.jgit.ui/build.properties
index 8148271ef3..b483ecd96b 100644
--- a/org.eclipse.jgit.ui/build.properties
+++ b/org.eclipse.jgit.ui/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 02ef988e3e..96eb188705 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit
 Bundle-SymbolicName: org.eclipse.jgit
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-ExtensibleAPI: true
 Export-Package: org.eclipse.jgit.annotations;version="6.8.0",
diff --git a/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/OSGI-INF/l10n/plugin.properties
index 3e132b01ca..3e132b01ca 100644
--- a/org.eclipse.jgit/plugin.properties
+++ b/org.eclipse.jgit/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit/build.properties b/org.eclipse.jgit/build.properties
index 0b8f825bf0..e29b88faa0 100644
--- a/org.eclipse.jgit/build.properties
+++ b/org.eclipse.jgit/build.properties
@@ -2,6 +2,6 @@ source.. = src/,\
                resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               about.html,\
-               plugin.properties
\ No newline at end of file
+               about.html
diff --git a/pom.xml b/pom.xml
index abade0115d..acd6cf8aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -439,6 +439,20 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <execution>
+            <id>copy-osgi</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <target>
+                <copy todir="${project.build.outputDirectory}" >
+                  <fileset dir="." includes="OSGI-INF/**"/>
+                </copy>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>