unify bundle name placeholders

To simplify validation in our workspace, use the same placeholders everywhere. Change-Id: I0d5294c947b9dffb6901caadc93ee929579e386a Signed-off-by: Michael Keppler <[email protected]>
eclipse-egit · Jun 30, 2019 · 19726c3 · 19726c3
1 parent 7228f00
commit 19726c3
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/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.egit.core
 Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true
 Bundle-Version: 5.5.0.qualifier
 Bundle-Activator: org.eclipse.egit.core.Activator
-Bundle-Vendor: %provider_name
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)",

diff --git a/org.eclipse.egit.core/plugin.properties b/org.eclipse.egit.core/plugin.properties
@@ -8,8 +8,8 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 ###############################################################################
-plugin_name=Git integration for Eclipse - Core
-provider_name=Eclipse EGit
+Bundle-Name=Git integration for Eclipse - Core
+Bundle-Vendor=Eclipse EGit
 patch_ContentTypeName=Patch File
 
 MergeStrategy-extension-point.name = Merge Strategy
diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin_name
+Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.egit.gitflow.ui
 Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true
 Bundle-Version: 5.5.0.qualifier
 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %provider_name
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Import-Package: org.eclipse.egit.core;version="[5.5.0,5.6.0)",
  org.eclipse.egit.core.internal;version="[5.5.0,5.6.0)",

diff --git a/org.eclipse.egit.gitflow.ui/plugin.properties b/org.eclipse.egit.gitflow.ui/plugin.properties
@@ -8,8 +8,8 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 ###############################################################################
-plugin_name=Git integration for Eclipse - UI for Gitflow support
-provider_name=Eclipse EGit
+Bundle-Name=Git integration for Eclipse - UI for Gitflow support
+Bundle-Vendor=Eclipse EGit
 TeamGitFlowInit.name = Init Gitflow...
 TeamGitFlowMenu.name = Gitflow
 TeamGitFlowFeatureStart.name = Start Feature

diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/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.egit.gitflow
 Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true
 Bundle-Version: 5.5.0.qualifier
-Bundle-Vendor: %provider_name
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.egit.gitflow.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.egit.gitflow/plugin.properties b/org.eclipse.egit.gitflow/plugin.properties
@@ -8,5 +8,5 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 ###############################################################################
-plugin_name=Git integration for Eclipse - Gitflow support
-provider_name=Eclipse EGit
+Bundle-Name=Git integration for Eclipse - Gitflow support
+Bundle-Vendor=Eclipse EGit
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/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.egit.ui
 Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true
 Bundle-Version: 5.5.0.qualifier
 Bundle-Activator: org.eclipse.egit.ui.Activator
-Bundle-Vendor: %provider_name
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",

diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
@@ -12,8 +12,8 @@
 #    Daniel Megert <[email protected]> - Removed two duplicate keys - http://bugs.eclipse.org/364013
 ###############################################################################
 
-plugin_name=Git integration for Eclipse - UI
-provider_name=Eclipse EGit
+Bundle-Name=Git integration for Eclipse - UI
+Bundle-Vendor=Eclipse EGit
 
 support.egit.name=Git integration for Eclipse
 support.egit.description=Versioning with Git, integration with Gerrit, GitHub, Gitflow, and Task repositories

diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin_name
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.egit;singleton:=true
 Bundle-Version: 5.5.0.qualifier
-Bundle-Vendor: %provider_name
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.egit/plugin.properties b/org.eclipse.egit/plugin.properties
@@ -8,5 +8,5 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 ###############################################################################
-plugin_name=Git integration for Eclipse
-provider_name=Eclipse EGit
+Bundle-Name=Git integration for Eclipse
+Bundle-Vendor=Eclipse EGit