From 3e5ab7b0ac8e5dcbf002975ad7a4fc9dab5d41c6 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 9 May 2020 14:27:27 +0200
Subject: [PATCH] cleanup use of org.equinox.ds

---
 .../META-INF/MANIFEST.MF                                 | 1 -
 .../DatabaseServicesTest.launch                          | 1 -
 com.minres.scviewer.database.test/pom.xml                | 9 ---------
 com.minres.scviewer.feature/feature.xml                  | 1 -
 4 files changed, 12 deletions(-)

diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
index ff10c05..e073c5b 100644
--- a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Import-Package: org.osgi.framework;version="1.3.0"
 Automatic-Module-Name: com.minres.scviewer.database.leveldb
 Service-Component: OSGI-INF/*.xml
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: leveldb-0.11-SNAPSHOT-uber.jar,
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index f8e3594..4937b10 100644
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -72,7 +72,6 @@
         <setEntry value="org.eclipse.equinox.app@default:default"/>
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
-        <setEntry value="org.eclipse.equinox.ds@1:true"/>
         <setEntry value="org.eclipse.equinox.preferences@default:default"/>
         <setEntry value="org.eclipse.equinox.registry@default:default"/>
         <setEntry value="org.eclipse.equinox.util@default:default"/>
diff --git a/com.minres.scviewer.database.test/pom.xml b/com.minres.scviewer.database.test/pom.xml
index 37e3094..98726df 100644
--- a/com.minres.scviewer.database.test/pom.xml
+++ b/com.minres.scviewer.database.test/pom.xml
@@ -16,15 +16,6 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-<!-- 					<bundleStartLevel /> -->
-					<dependencies>
-						<dependency>
-							<type>p2-installable-unit</type>
-							<artifactId>org.eclipse.equinox.ds</artifactId>
-						</dependency>
-					</dependencies>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/com.minres.scviewer.feature/feature.xml b/com.minres.scviewer.feature/feature.xml
index f32b411..bebca53 100644
--- a/com.minres.scviewer.feature/feature.xml
+++ b/com.minres.scviewer.feature/feature.xml
@@ -29,7 +29,6 @@ http://www.eclipse.org/legal/epl-v10.html
    </url>
 
    <requires>
-      <import plugin="org.eclipse.equinox.ds" version="1.4.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>