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>

diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index 87a510c33843f9a50c3059b2247b3fa3acb4ad16..5a4e31c954f4b100b44939887628bd3c8e1c3df4 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..7c9e5f0
--- /dev/null
+++ b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.jgit.ant
+Bundle-Name = JGit Ant Tasks
+Bundle-Vendor = Eclipse JGit
\ No newline at end of file

diff --git a/org.eclipse.jgit.ant/build.properties b/org.eclipse.jgit.ant/build.properties
index 43a5be6a54b4b2c246302c8c2a4714c214b79689..17f6d12a9949b98280130f9b1725cb9e7baf5ba1 100644 (file)
--- 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.ant/plugin.properties b/org.eclipse.jgit.ant/plugin.properties
deleted file mode 100644 (file)
index 7c9e5f0..0000000
--- a/org.eclipse.jgit.ant/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.jgit.ant
-Bundle-Name = JGit Ant Tasks
-Bundle-Vendor = Eclipse JGit
\ No newline at end of file

diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 456496337bbf85ab202b26cb6a7fcc679055fc44..486acd9899c1981e75af3bce549a41f61d864c16 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..fe22ce8
--- /dev/null
+++ b/org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit Archive Formats
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.archive/build.properties b/org.eclipse.jgit.archive/build.properties
index d944674ba0b2d63b3a7b1a112347309e5a659ee2..4482a126324b4a328cb61c4352d6833f7de9cf30 100644 (file)
--- 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.archive/plugin.properties b/org.eclipse.jgit.archive/plugin.properties
deleted file mode 100644 (file)
index fe22ce8..0000000
--- a/org.eclipse.jgit.archive/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Archive Formats
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 8ca30bf77706244e659ec053c291f6ee804ed040..0ae8c30600d2c30695f891c7900d9b4cd7fe45a9 100644 (file)
--- 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/OSGI-INF/l10n/gpg_bc.properties b/org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties
new file mode 100644 (file)
index 0000000..b091492
--- /dev/null
+++ b/org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit GPG support based on bouncycastle
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.gpg.bc/build.properties b/org.eclipse.jgit.gpg.bc/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.gpg.bc/plugin.properties b/org.eclipse.jgit.gpg.bc/plugin.properties
deleted file mode 100644 (file)
index b091492..0000000
--- a/org.eclipse.jgit.gpg.bc/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit GPG support based on bouncycastle
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 4d8c3aebb169dee12c569c18633e415ecfe7835e..14a5d37a1866abe59822a7528a18c66f181e6dd6 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..e242829
--- /dev/null
+++ b/org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.jgit.http.apache
+Bundle-Name = JGit Apache httpclient based HTTP support
+Bundle-Vendor = Eclipse JGit
\ No newline at end of file

diff --git a/org.eclipse.jgit.http.apache/build.properties b/org.eclipse.jgit.http.apache/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.apache/plugin.properties b/org.eclipse.jgit.http.apache/plugin.properties
deleted file mode 100644 (file)
index e242829..0000000
--- a/org.eclipse.jgit.http.apache/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.jgit.http.apache
-Bundle-Name = JGit Apache httpclient based HTTP support
-Bundle-Vendor = Eclipse JGit
\ No newline at end of file

diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index e6f551a07156e1ecd4282826c21655172d1bdd23..7e84c635a5a8491e4f5529e7ca04dc3e5ee977fa 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..bcec310
--- /dev/null
+++ b/org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit HTTP Server
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.http.server/build.properties b/org.eclipse.jgit.http.server/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.http.server/plugin.properties b/org.eclipse.jgit.http.server/plugin.properties
deleted file mode 100644 (file)
index bcec310..0000000
--- a/org.eclipse.jgit.http.server/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit HTTP Server
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 6a2e4f52a11d0c6d92a9dd437b7e78b2c87cfb94..c8330194688c39880ed8e5ddf5db64bf72c2e915 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..2ec05e1
--- /dev/null
+++ b/org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit JUnit Http Utility Classes
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.junit.http/build.properties b/org.eclipse.jgit.junit.http/build.properties
index aa1a0082691202e9c8cc650976d2b2d128cae35b..931e1631afabc65a63bc77af655ab6e8bcf1c697 100644 (file)
--- 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.http/plugin.properties b/org.eclipse.jgit.junit.http/plugin.properties
deleted file mode 100644 (file)
index 2ec05e1..0000000
--- a/org.eclipse.jgit.junit.http/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit JUnit Http Utility Classes
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index 7001ad313b9ab5e19c1bab1b5d908bdced99758e..e89faf91928c8ff22756fc1587c8e2aeea4fe04e 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..3af91ed
--- /dev/null
+++ b/org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit JUnit Ssh Utility Classes
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.junit.ssh/build.properties b/org.eclipse.jgit.junit.ssh/build.properties
index 84f1c95cfa94470bc5d00e43bb6b9681a3d431e2..408f54edfaca7ad078f2c1d101ff40b531060352 100644 (file)
--- 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.ssh/plugin.properties b/org.eclipse.jgit.junit.ssh/plugin.properties
deleted file mode 100644 (file)
index 3af91ed..0000000
--- a/org.eclipse.jgit.junit.ssh/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit JUnit Ssh Utility Classes
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 492f28e42709221fe494547a0b692b8a5adcc527..7f85f0c063bf6f09807d2392db108ef71e148677 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..f40f8e1
--- /dev/null
+++ b/org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit JUnit Utility Classes
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.junit/build.properties b/org.eclipse.jgit.junit/build.properties
index aa1a0082691202e9c8cc650976d2b2d128cae35b..931e1631afabc65a63bc77af655ab6e8bcf1c697 100644 (file)
--- 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.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties
deleted file mode 100644 (file)
index f40f8e1..0000000
--- a/org.eclipse.jgit.junit/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit JUnit Utility Classes
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index 9f9b237ce07ea4ab0760a26b5c2fb2fd1624bf30..6c3b73ae9b9cf08c6e6b4ab9efd23d98900b83f9 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..4b9ee82
--- /dev/null
+++ b/org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit Large File Storage Server
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.lfs.server/build.properties b/org.eclipse.jgit.lfs.server/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.server/plugin.properties b/org.eclipse.jgit.lfs.server/plugin.properties
deleted file mode 100644 (file)
index 4b9ee82..0000000
--- a/org.eclipse.jgit.lfs.server/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Large File Storage Server
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 2873d7b1e5f564f84f8ab1e7e911bdccf23322d9..f579a6eb8c6f83c3b0b8732d195c0bac66ff9d56 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..76ead9b
--- /dev/null
+++ b/org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit Large File Storage
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.lfs/build.properties b/org.eclipse.jgit.lfs/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.lfs/plugin.properties b/org.eclipse.jgit.lfs/plugin.properties
deleted file mode 100644 (file)
index 76ead9b..0000000
--- a/org.eclipse.jgit.lfs/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Large File Storage
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 3a3e843376ef298bb13613a1779773f26529eef2..7165badefe5ed41db6330678a12abef0e3c62773 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..bfa216c
--- /dev/null
+++ b/org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit Command Line Interface
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties
index 302dded85abc5ccf5de49ea2daffa9900bc932e6..ca8f30b9ed4382c6d1980bac276d61e8897da8ff 100644 (file)
--- 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.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties
deleted file mode 100644 (file)
index bfa216c..0000000
--- a/org.eclipse.jgit.pgm/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Command Line Interface
-Bundle-Vendor=Eclipse JGit

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 44a844f2b7791e37256cdb057cd5fed3d10d1bd4..8af012a87aa150ec410acee0720c759897c206a7 100644 (file)
--- 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/OSGI-INF/l10n/agent.properties b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties
new file mode 100644 (file)
index 0000000..86df8f2
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit Unix SSH agent client for Apache MINA sshd
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ssh.apache.agent/build.properties b/org.eclipse.jgit.ssh.apache.agent/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.agent/plugin.properties b/org.eclipse.jgit.ssh.apache.agent/plugin.properties
deleted file mode 100644 (file)
index 86df8f2..0000000
--- a/org.eclipse.jgit.ssh.apache.agent/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Unix SSH agent client for Apache MINA sshd
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index b12b3da84b0e04b1aa7bdcd6c89780fdb5b244ce..e7f817bf45d38193c96185d25c4109f4923cee18 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..8358cc1
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit SSH support based on Apache MINA sshd
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ssh.apache/build.properties b/org.eclipse.jgit.ssh.apache/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.apache/plugin.properties b/org.eclipse.jgit.ssh.apache/plugin.properties
deleted file mode 100644 (file)
index 8358cc1..0000000
--- a/org.eclipse.jgit.ssh.apache/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit SSH support based on Apache MINA sshd
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index ba6c405ef8d9efddca79d860660eb0d900d72c5e..54830a49849cd2b2e67009c81b25d4bed7b58f9b 100644 (file)
--- 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/OSGI-INF/l10n/jsch.properties b/org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties
new file mode 100644 (file)
index 0000000..126709b
--- /dev/null
+++ b/org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit SSH support based on JSch
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ssh.jsch/build.properties b/org.eclipse.jgit.ssh.jsch/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.ssh.jsch/plugin.properties b/org.eclipse.jgit.ssh.jsch/plugin.properties
deleted file mode 100644 (file)
index 126709b..0000000
--- a/org.eclipse.jgit.ssh.jsch/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit SSH support based on JSch
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 67380ee4d91ff0cacd7584e585be4ed4a05a4819..05179db81e5ba9bfb9453792828e20c163c8eb01 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..ce004ac
--- /dev/null
+++ b/org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit AWT User Interface
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit.ui/build.properties b/org.eclipse.jgit.ui/build.properties
index 8148271ef36aae27cfdb3d9be925fdf00ec92952..b483ecd96bd0858d246fb0a07cf23451a88b2f62 100644 (file)
--- 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.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties
deleted file mode 100644 (file)
index ce004ac..0000000
--- a/org.eclipse.jgit.ui/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit AWT User Interface
-Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 02ef988e3ebbe5129ad3a4518f511b205abaf129..96eb1887055724204ca98edbd3db5db7680f573b 100644 (file)
--- 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit/OSGI-INF/l10n/plugin.properties
new file mode 100644 (file)
index 0000000..3e132b0
--- /dev/null
+++ b/org.eclipse.jgit/OSGI-INF/l10n/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit Core
+Bundle-Vendor=Eclipse JGit

diff --git a/org.eclipse.jgit/build.properties b/org.eclipse.jgit/build.properties
index 0b8f825bf014e1819800906e438f9dce2085aeab..e29b88faa0c8957803861d6c2f2153f089652196 100644 (file)
--- 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/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/plugin.properties
deleted file mode 100644 (file)
index 3e132b0..0000000
--- a/org.eclipse.jgit/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Core
-Bundle-Vendor=Eclipse JGit

diff --git a/pom.xml b/pom.xml
index abade0115d8459993fa20f0f796cf12bc837f489..acd6cf8aca5ff87b2389c83202c51c0822d4ecc8 100644 (file)
--- 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>