Bug 538737 - Remove org.eclipse.equinox.ds
Adjust http.servlet.tests to depend on felix.scr.
Change-Id: Icac0d746b169669457292ab94f3da94168e7af98
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml b/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
index 1ed46a4..c333f22 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2015, 2016 Raymond Augé and others.
+ Copyright (c) 2015, 2018 Raymond Augé and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -40,8 +40,8 @@
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>1.4.0</versionRange>
+ <id>org.apache.felix.scr</id>
+ <versionRange>2.0.14</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java
index ab47c8a..2bb9155 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java
@@ -238,7 +238,7 @@
protected static final String TEST_PATH_CUSTOMIZER_NAME = "test.path.customizer.name";
protected static final String TEST_ERROR_CODE = "test.error.code";
- protected static final String EQUINOX_DS_BUNDLE = "org.eclipse.equinox.ds";
+ protected static final String EQUINOX_DS_BUNDLE = "org.apache.felix.scr";
protected static final String EQUINOX_JETTY_BUNDLE = "org.eclipse.equinox.http.jetty";
protected static final String JETTY_PROPERTY_PREFIX = "org.eclipse.equinox.http.jetty.";
protected static final String OSGI_HTTP_PORT_PROPERTY = "org.osgi.service.http.port";
