Bug 510641 - Remove old Headers implementation.

Change-Id: Ibc09bc478f68516c692c95181081a08781024ed5
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

3 files changed, 9 insertions, 7 deletions

diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF
index ef73881b1..5c15dfc42 100644
--- a/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.compatibility.plugins/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.osgi.compatibility.plugins
-Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.eclipse.osgi;bundle-version="3.10.0"
+Bundle-Version: 1.0.100.qualifier
+Fragment-Host: org.eclipse.osgi;bundle-version="3.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml b/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml
index 936871998..be886cbe4 100644
--- a/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml
+++ b/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.compatibility.plugins</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java
index 88dca675d..3ff76b4b8 100644
--- a/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java
+++ b/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterHook.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 IBM Corporation and others.
+ * Copyright (c) 2013, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,8 +12,9 @@ package org.eclipse.osgi.compatibility.plugins;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Map;
 
-import org.eclipse.osgi.framework.util.Headers;
+import org.eclipse.osgi.framework.util.CaseInsensitiveDictionaryMap;
 import org.eclipse.osgi.internal.hookregistry.ActivatorHookFactory;
 import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook;
 import org.eclipse.osgi.internal.hookregistry.HookConfigurator;
@@ -25,6 +26,7 @@ import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 import org.eclipse.osgi.storage.bundlefile.BundleFile;
 import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper;
 import org.eclipse.osgi.storage.bundlefile.FileBundleEntry;
+import org.eclipse.osgi.util.ManifestElement;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -55,10 +57,10 @@ public class PluginConverterHook implements HookConfigurator {
 						if (!PluginConverterImpl.OSGI_BUNDLE_MANIFEST.equals(path)) {
 							return entry;
 						}
-						Headers<String, String> headers = null;
+						Map<String, String> headers = null;
 						if (entry != null) {
 							try {
-								headers = Headers.parseManifest(entry.getInputStream());
+								headers = ManifestElement.parseBundleManifest(entry.getInputStream(), new CaseInsensitiveDictionaryMap<String, String>());
 							} catch (Exception e) {
 								throw new RuntimeException(e);
 							}