From e3798df6e810ab08d821f158e83fe0fd3fd0eb18 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 11 Sep 2023 20:58:15 +0200 Subject: [PATCH] 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 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.ant/build.properties | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.archive/build.properties | 4 ++-- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../l10n/gpg_bc.properties} | 0 org.eclipse.jgit.gpg.bc/build.properties | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.http.apache/build.properties | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.http.server/build.properties | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.junit.http/build.properties | 4 ++-- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.junit.ssh/build.properties | 4 ++-- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.junit/build.properties | 4 ++-- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.lfs.server/build.properties | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.lfs/build.properties | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.pgm/build.properties | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../l10n/agent.properties} | 0 org.eclipse.jgit.ssh.apache.agent/build.properties | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.ssh.apache/build.properties | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../l10n/jsch.properties} | 0 org.eclipse.jgit.ssh.jsch/build.properties | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit.ui/build.properties | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- .../{ => OSGI-INF/l10n}/plugin.properties | 0 org.eclipse.jgit/build.properties | 4 ++-- pom.xml | 14 ++++++++++++++ 49 files changed, 51 insertions(+), 37 deletions(-) rename org.eclipse.jgit.ant/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.archive/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.gpg.bc/{plugin.properties => OSGI-INF/l10n/gpg_bc.properties} (100%) rename org.eclipse.jgit.http.apache/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.http.server/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.junit.http/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.junit.ssh/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.junit/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.lfs.server/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.lfs/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.pgm/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.ssh.apache.agent/{plugin.properties => OSGI-INF/l10n/agent.properties} (100%) rename org.eclipse.jgit.ssh.apache/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit.ssh.jsch/{plugin.properties => OSGI-INF/l10n/jsch.properties} (100%) rename org.eclipse.jgit.ui/{ => OSGI-INF/l10n}/plugin.properties (100%) rename org.eclipse.jgit/{ => OSGI-INF/l10n}/plugin.properties (100%) diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 87a510c33..5a4e31c95 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 similarity index 100% rename from org.eclipse.jgit.ant/plugin.properties rename to 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 43a5be6a5..17f6d12a9 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 456496337..486acd989 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 similarity index 100% rename from org.eclipse.jgit.archive/plugin.properties rename to 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 d944674ba..4482a1263 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 8ca30bf77..0ae8c3060 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 similarity index 100% rename from org.eclipse.jgit.gpg.bc/plugin.properties rename to 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 8148271ef..b483ecd96 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 4d8c3aebb..14a5d37a1 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 similarity index 100% rename from org.eclipse.jgit.http.apache/plugin.properties rename to 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 8148271ef..b483ecd96 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 e6f551a07..7e84c635a 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 similarity index 100% rename from org.eclipse.jgit.http.server/plugin.properties rename to 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 8148271ef..b483ecd96 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 6a2e4f52a..c83301946 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 similarity index 100% rename from org.eclipse.jgit.junit.http/plugin.properties rename to 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 aa1a00826..931e1631a 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 7001ad313..e89faf919 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 similarity index 100% rename from org.eclipse.jgit.junit.ssh/plugin.properties rename to 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 84f1c95cf..408f54edf 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 492f28e42..7f85f0c06 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 similarity index 100% rename from org.eclipse.jgit.junit/plugin.properties rename to 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 aa1a00826..931e1631a 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 9f9b237ce..6c3b73ae9 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 similarity index 100% rename from org.eclipse.jgit.lfs.server/plugin.properties rename to 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 8148271ef..b483ecd96 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 2873d7b1e..f579a6eb8 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 similarity index 100% rename from org.eclipse.jgit.lfs/plugin.properties rename to 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 8148271ef..b483ecd96 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 3a3e84337..7165badef 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 similarity index 100% rename from org.eclipse.jgit.pgm/plugin.properties rename to 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 302dded85..ca8f30b9e 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 44a844f2b..8af012a87 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 similarity index 100% rename from org.eclipse.jgit.ssh.apache.agent/plugin.properties rename to 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 8148271ef..b483ecd96 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 b12b3da84..e7f817bf4 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 similarity index 100% rename from org.eclipse.jgit.ssh.apache/plugin.properties rename to 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 8148271ef..b483ecd96 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 ba6c405ef..54830a498 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 similarity index 100% rename from org.eclipse.jgit.ssh.jsch/plugin.properties rename to 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 8148271ef..b483ecd96 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 67380ee4d..05179db81 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 similarity index 100% rename from org.eclipse.jgit.ui/plugin.properties rename to 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 8148271ef..b483ecd96 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 02ef988e3..96eb18870 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 similarity index 100% rename from org.eclipse.jgit/plugin.properties rename to org.eclipse.jgit/OSGI-INF/l10n/plugin.properties diff --git a/org.eclipse.jgit/build.properties b/org.eclipse.jgit/build.properties index 0b8f825bf..e29b88faa 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 abade0115..acd6cf8ac 100644 --- a/pom.xml +++ b/pom.xml @@ -439,6 +439,20 @@ run + + copy-osgi + generate-resources + + + + + + + + + run + +