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 +- org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties | 3 +++ org.eclipse.jgit.ant/build.properties | 2 +- org.eclipse.jgit.ant/plugin.properties | 3 --- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.archive/build.properties | 4 ++-- org.eclipse.jgit.archive/plugin.properties | 2 -- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties | 2 ++ org.eclipse.jgit.gpg.bc/build.properties | 2 +- org.eclipse.jgit.gpg.bc/plugin.properties | 2 -- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/plugin.properties | 3 +++ org.eclipse.jgit.http.apache/build.properties | 2 +- org.eclipse.jgit.http.apache/plugin.properties | 3 --- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.http.server/build.properties | 2 +- org.eclipse.jgit.http.server/plugin.properties | 2 -- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.junit.http/build.properties | 4 ++-- org.eclipse.jgit.junit.http/plugin.properties | 2 -- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.junit.ssh/build.properties | 4 ++-- org.eclipse.jgit.junit.ssh/plugin.properties | 2 -- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.junit/build.properties | 4 ++-- org.eclipse.jgit.junit/plugin.properties | 2 -- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.lfs.server/build.properties | 2 +- org.eclipse.jgit.lfs.server/plugin.properties | 2 -- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.lfs/build.properties | 2 +- org.eclipse.jgit.lfs/plugin.properties | 2 -- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.pgm/build.properties | 2 +- org.eclipse.jgit.pgm/plugin.properties | 2 -- org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/agent.properties | 2 ++ org.eclipse.jgit.ssh.apache.agent/build.properties | 2 +- org.eclipse.jgit.ssh.apache.agent/plugin.properties | 2 -- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.ssh.apache/build.properties | 2 +- org.eclipse.jgit.ssh.apache/plugin.properties | 2 -- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties | 2 ++ org.eclipse.jgit.ssh.jsch/build.properties | 2 +- org.eclipse.jgit.ssh.jsch/plugin.properties | 2 -- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit.ui/build.properties | 2 +- org.eclipse.jgit.ui/plugin.properties | 2 -- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/OSGI-INF/l10n/plugin.properties | 2 ++ org.eclipse.jgit/build.properties | 4 ++-- org.eclipse.jgit/plugin.properties | 2 -- pom.xml | 14 ++++++++++++++ 65 files changed, 85 insertions(+), 71 deletions(-) create mode 100644 org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.ant/plugin.properties create mode 100644 org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.archive/plugin.properties create mode 100644 org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties delete mode 100644 org.eclipse.jgit.gpg.bc/plugin.properties create mode 100644 org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.http.apache/plugin.properties create mode 100644 org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.http.server/plugin.properties create mode 100644 org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.junit.http/plugin.properties create mode 100644 org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.junit.ssh/plugin.properties create mode 100644 org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.junit/plugin.properties create mode 100644 org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.lfs.server/plugin.properties create mode 100644 org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.lfs/plugin.properties create mode 100644 org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.pgm/plugin.properties create mode 100644 org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties delete mode 100644 org.eclipse.jgit.ssh.apache.agent/plugin.properties create mode 100644 org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.ssh.apache/plugin.properties create mode 100644 org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties delete mode 100644 org.eclipse.jgit.ssh.jsch/plugin.properties create mode 100644 org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit.ui/plugin.properties create mode 100644 org.eclipse.jgit/OSGI-INF/l10n/plugin.properties delete mode 100644 org.eclipse.jgit/plugin.properties 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..7c9e5f04a4 --- /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 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.ant/plugin.properties b/org.eclipse.jgit.ant/plugin.properties deleted file mode 100644 index 7c9e5f04a4..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..fe22ce863c --- /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 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.archive/plugin.properties b/org.eclipse.jgit.archive/plugin.properties deleted file mode 100644 index fe22ce863c..0000000000 --- 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 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/OSGI-INF/l10n/gpg_bc.properties b/org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties new file mode 100644 index 0000000000..b0914927bf --- /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 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.gpg.bc/plugin.properties b/org.eclipse.jgit.gpg.bc/plugin.properties deleted file mode 100644 index b0914927bf..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..e242829161 --- /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 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.apache/plugin.properties b/org.eclipse.jgit.http.apache/plugin.properties deleted file mode 100644 index e242829161..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..bcec310397 --- /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 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.http.server/plugin.properties b/org.eclipse.jgit.http.server/plugin.properties deleted file mode 100644 index bcec310397..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..2ec05e1a5b --- /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 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.http/plugin.properties b/org.eclipse.jgit.junit.http/plugin.properties deleted file mode 100644 index 2ec05e1a5b..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..3af91ed4e7 --- /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 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.ssh/plugin.properties b/org.eclipse.jgit.junit.ssh/plugin.properties deleted file mode 100644 index 3af91ed4e7..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..f40f8e1d9f --- /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 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.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties deleted file mode 100644 index f40f8e1d9f..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..4b9ee82fdb --- /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 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.server/plugin.properties b/org.eclipse.jgit.lfs.server/plugin.properties deleted file mode 100644 index 4b9ee82fdb..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..76ead9b94f --- /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 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.lfs/plugin.properties b/org.eclipse.jgit.lfs/plugin.properties deleted file mode 100644 index 76ead9b94f..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..bfa216c8a1 --- /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 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.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties deleted file mode 100644 index bfa216c8a1..0000000000 --- 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 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/OSGI-INF/l10n/agent.properties b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties new file mode 100644 index 0000000000..86df8f2e72 --- /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 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.agent/plugin.properties b/org.eclipse.jgit.ssh.apache.agent/plugin.properties deleted file mode 100644 index 86df8f2e72..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..8358cc1a78 --- /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 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.apache/plugin.properties b/org.eclipse.jgit.ssh.apache/plugin.properties deleted file mode 100644 index 8358cc1a78..0000000000 --- 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 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/OSGI-INF/l10n/jsch.properties b/org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties new file mode 100644 index 0000000000..126709b961 --- /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 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.ssh.jsch/plugin.properties b/org.eclipse.jgit.ssh.jsch/plugin.properties deleted file mode 100644 index 126709b961..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit.ui/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..ce004ac00c --- /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 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.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties deleted file mode 100644 index ce004ac00c..0000000000 --- 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 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/OSGI-INF/l10n/plugin.properties b/org.eclipse.jgit/OSGI-INF/l10n/plugin.properties new file mode 100644 index 0000000000..3e132b01ca --- /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 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/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/plugin.properties deleted file mode 100644 index 3e132b01ca..0000000000 --- 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 abade0115d..acd6cf8aca 100644 --- a/pom.xml +++ b/pom.xml @@ -439,6 +439,20 @@ run + + copy-osgi + generate-resources + + + + + + + + + run + + -- cgit v1.2.3