From 4b0c192f2de569cc7039ca4b03fe9eb0e714599c Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Fri, 21 Jun 2019 17:39:20 +0200 Subject: [PATCH] Fix bundle localization of Apache SSH bundle The placeholders in manifest and plugin.properties did not match. To avoid similar issues, all placeholders have been changed to Bundle-Vendor and Bundle-Name now. Bug:548503 Change-Id: Ibd4b9bc237b323e614506b97e5fbc99416365040 Signed-off-by: Michael Keppler --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 3 ++- org.eclipse.jgit.ant.test/plugin.properties | 4 ++-- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/plugin.properties | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/plugin.properties | 4 ++-- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/plugin.properties | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.http.server/plugin.properties | 4 ++-- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.http.test/plugin.properties | 4 ++-- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.junit.http/plugin.properties | 4 ++-- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.junit.ssh/plugin.properties | 4 ++-- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.junit/plugin.properties | 4 ++-- org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.lfs.server.test/plugin.properties | 4 ++-- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.lfs.server/plugin.properties | 4 ++-- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.lfs.test/plugin.properties | 4 ++-- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.lfs/plugin.properties | 4 ++-- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm.test/plugin.properties | 4 ++-- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/plugin.properties | 4 ++-- org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF | 3 ++- org.eclipse.jgit.ssh.apache.test/plugin.properties | 4 ++-- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 3 ++- org.eclipse.jgit.ssh.apache/plugin.properties | 4 ++-- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.test/plugin.properties | 4 ++-- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.ui/plugin.properties | 4 ++-- org.eclipse.jgit/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit/plugin.properties | 4 ++-- 40 files changed, 76 insertions(+), 73 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index f333c681d..6603455c5 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -1,9 +1,10 @@ Bundle-Localization: plugin Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test +Bundle-Vendor: %Bundle-Vendor Bundle-Version: 5.5.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.ant.test/plugin.properties b/org.eclipse.jgit.ant.test/plugin.properties index 4f849eb17..412f39238 100644 --- a/org.eclipse.jgit.ant.test/plugin.properties +++ b/org.eclipse.jgit.ant.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Ant Tasks Tests -provider_name=Eclipse JGit +Bundle-Name=JGit Ant Tasks Tests +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index e2f8a836e..8dd0daa14 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)" Bundle-Localization: plugin -Bundle-Vendor: %Provider-Name +Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.ant, org.eclipse.jgit.ant.tasks;version="5.5.0";uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/plugin.properties b/org.eclipse.jgit.ant/plugin.properties index 47725bce8..7c9e5f04a 100644 --- a/org.eclipse.jgit.ant/plugin.properties +++ b/org.eclipse.jgit.ant/plugin.properties @@ -1,3 +1,3 @@ #Properties file for org.eclipse.jgit.ant Bundle-Name = JGit Ant Tasks -Provider-Name = Eclipse JGit \ No newline at end of file +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 101c03430..23e32fcce 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", diff --git a/org.eclipse.jgit.archive/plugin.properties b/org.eclipse.jgit.archive/plugin.properties index f4269b7c5..fe22ce863 100644 --- a/org.eclipse.jgit.archive/plugin.properties +++ b/org.eclipse.jgit.archive/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Archive Formats -provider_name=Eclipse JGit +Bundle-Name=JGit Archive Formats +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 45d6d6457..5c956363a 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.http.apache Bundle-Version: 5.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin -Bundle-Vendor: %Provider-Name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", diff --git a/org.eclipse.jgit.http.apache/plugin.properties b/org.eclipse.jgit.http.apache/plugin.properties index f87497acc..e24282916 100644 --- a/org.eclipse.jgit.http.apache/plugin.properties +++ b/org.eclipse.jgit.http.apache/plugin.properties @@ -1,3 +1,3 @@ #Properties file for org.eclipse.jgit.http.apache Bundle-Name = JGit Apache httpclient based HTTP support -Provider-Name = Eclipse JGit \ No newline at end of file +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 ca6b681e9..0a7fa845e 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="5.5.0", org.eclipse.jgit.http.server.glue;version="5.5.0"; uses:="javax.servlet,javax.servlet.http", diff --git a/org.eclipse.jgit.http.server/plugin.properties b/org.eclipse.jgit.http.server/plugin.properties index d891b508f..bcec31039 100644 --- a/org.eclipse.jgit.http.server/plugin.properties +++ b/org.eclipse.jgit.http.server/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit HTTP Server -provider_name=Eclipse JGit +Bundle-Name=JGit HTTP Server +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index bf6ab1870..a3afc0d48 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", diff --git a/org.eclipse.jgit.http.test/plugin.properties b/org.eclipse.jgit.http.test/plugin.properties index 0a620aa30..d574f0d79 100644 --- a/org.eclipse.jgit.http.test/plugin.properties +++ b/org.eclipse.jgit.http.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit HTTP Tests -provider_name=Eclipse JGit +Bundle-Name=JGit HTTP Tests +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 65e58d28f..2d97d26a2 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", diff --git a/org.eclipse.jgit.junit.http/plugin.properties b/org.eclipse.jgit.junit.http/plugin.properties index 7a96b0905..2ec05e1a5 100644 --- a/org.eclipse.jgit.junit.http/plugin.properties +++ b/org.eclipse.jgit.junit.http/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit JUnit Http Utility Classes -provider_name=Eclipse JGit +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 07ac1d596..67e8c636a 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.sshd.common;version="[2.2.0,2.3.0)", diff --git a/org.eclipse.jgit.junit.ssh/plugin.properties b/org.eclipse.jgit.junit.ssh/plugin.properties index 5689b9472..3af91ed4e 100644 --- a/org.eclipse.jgit.junit.ssh/plugin.properties +++ b/org.eclipse.jgit.junit.ssh/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit JUnit Ssh Utility Classes -provider_name=Eclipse JGit +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 e025e4287..e63a8c406 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jgit.annotations;version="[5.5.0,5.6.0)", diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties index 9842967f5..f40f8e1d9 100644 --- a/org.eclipse.jgit.junit/plugin.properties +++ b/org.eclipse.jgit.junit/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit JUnit Utility Classes -provider_name=Eclipse JGit +Bundle-Name=JGit JUnit Utility Classes +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 6db20c073..237b732fe 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[3.1.0,4.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/plugin.properties b/org.eclipse.jgit.lfs.server.test/plugin.properties index 4a8e6425f..b6dd7c01c 100644 --- a/org.eclipse.jgit.lfs.server.test/plugin.properties +++ b/org.eclipse.jgit.lfs.server.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit LFS Server Tests -provider_name=Eclipse JGit +Bundle-Name=JGit LFS Server Tests +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 1fa89e15b..e130a8d74 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="5.5.0"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", diff --git a/org.eclipse.jgit.lfs.server/plugin.properties b/org.eclipse.jgit.lfs.server/plugin.properties index 59f0139b8..4b9ee82fd 100644 --- a/org.eclipse.jgit.lfs.server/plugin.properties +++ b/org.eclipse.jgit.lfs.server/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Large File Storage Server -provider_name=Eclipse JGit +Bundle-Name=JGit Large File Storage Server +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 356b608c9..c8b48d613 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.5.0,5.6.0)", diff --git a/org.eclipse.jgit.lfs.test/plugin.properties b/org.eclipse.jgit.lfs.test/plugin.properties index f9007802f..ab78575d6 100644 --- a/org.eclipse.jgit.lfs.test/plugin.properties +++ b/org.eclipse.jgit.lfs.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit LFS Tests -provider_name=Eclipse JGit +Bundle-Name=JGit LFS Tests +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 88d7958c0..ce2cc58ea 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="5.5.0", org.eclipse.jgit.lfs.errors;version="5.5.0", org.eclipse.jgit.lfs.internal;version="5.5.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", diff --git a/org.eclipse.jgit.lfs/plugin.properties b/org.eclipse.jgit.lfs/plugin.properties index 7c22ddb57..76ead9b94 100644 --- a/org.eclipse.jgit.lfs/plugin.properties +++ b/org.eclipse.jgit.lfs/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Large File Storage -provider_name=Eclipse JGit +Bundle-Name=JGit Large File Storage +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index d0e8745b7..4f747529f 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.pgm.test/plugin.properties b/org.eclipse.jgit.pgm.test/plugin.properties index e131c6970..61cae8e35 100644 --- a/org.eclipse.jgit.pgm.test/plugin.properties +++ b/org.eclipse.jgit.pgm.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Command Line Interface Tests -provider_name=Eclipse JGit +Bundle-Name=JGit Command Line Interface Tests +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 ed7453440..14a14b250 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties index 118fe47b1..bfa216c8a 100644 --- a/org.eclipse.jgit.pgm/plugin.properties +++ b/org.eclipse.jgit.pgm/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Command Line Interface -provider_name=Eclipse JGit +Bundle-Name=JGit Command Line Interface +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index df1831818..e8164a9de 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %Provider-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.5.0,5.6.0)", org.eclipse.jgit.junit;version="[5.5.0,5.6.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/plugin.properties b/org.eclipse.jgit.ssh.apache.test/plugin.properties index 67c296d9e..b279c8fdd 100644 --- a/org.eclipse.jgit.ssh.apache.test/plugin.properties +++ b/org.eclipse.jgit.ssh.apache.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Tests for SSH with Apache MINA sshd -provider_name=Eclipse JGit +Bundle-Name=JGit Tests for SSH with 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 7d63a4b01..e9f53023b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache Bundle-SymbolicName: org.eclipse.jgit.ssh.apache -Bundle-Vendor: %Provider-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-Version: 5.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.ssh.apache/plugin.properties b/org.eclipse.jgit.ssh.apache/plugin.properties index 8f3540c0f..8358cc1a7 100644 --- a/org.eclipse.jgit.ssh.apache/plugin.properties +++ b/org.eclipse.jgit.ssh.apache/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit SSH support based on Apache MINA sshd -provider_name=Eclipse JGit +Bundle-Name=JGit SSH support based on Apache MINA sshd +Bundle-Vendor=Eclipse JGit diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 5557b1151..0f65c8815 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", diff --git a/org.eclipse.jgit.test/plugin.properties b/org.eclipse.jgit.test/plugin.properties index 1d32644d3..4e353cd0a 100644 --- a/org.eclipse.jgit.test/plugin.properties +++ b/org.eclipse.jgit.test/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Core Tests -provider_name=Eclipse JGit +Bundle-Name=JGit Core Tests +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 e7aa9f52f..1e0d052b0 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Bundle-Localization: plugin Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui Bundle-Version: 5.5.0.qualifier -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="5.5.0" Import-Package: org.eclipse.jgit.errors;version="[5.5.0,5.6.0)", diff --git a/org.eclipse.jgit.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties index 006c8c2f2..ce004ac00 100644 --- a/org.eclipse.jgit.ui/plugin.properties +++ b/org.eclipse.jgit.ui/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit AWT User Interface -provider_name=Eclipse JGit +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 18fa4ab14..4184a54b5 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name +Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit Bundle-Version: 5.5.0.qualifier Bundle-Localization: plugin -Bundle-Vendor: %provider_name +Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.jgit.annotations;version="5.5.0", org.eclipse.jgit.api;version="5.5.0"; diff --git a/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/plugin.properties index 3ce670969..3e132b01c 100644 --- a/org.eclipse.jgit/plugin.properties +++ b/org.eclipse.jgit/plugin.properties @@ -1,2 +1,2 @@ -plugin_name=JGit Core -provider_name=Eclipse JGit +Bundle-Name=JGit Core +Bundle-Vendor=Eclipse JGit