Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-10-01 06:16:37 -0400
committerAlexander Kurtakov2018-10-01 06:16:37 -0400
commit13571d09f8a1213ae309fc5ac328eaecab7c70c3 (patch)
treee046f78bfdf6d257ac62430874964bad04a67c36
parente3aa57fd2faa12af75a91e43f77d305613953139 (diff)
downloadrt.equinox.bundles-13571d09f8a1213ae309fc5ac328eaecab7c70c3.tar.gz
rt.equinox.bundles-13571d09f8a1213ae309fc5ac328eaecab7c70c3.tar.xz
rt.equinox.bundles-13571d09f8a1213ae309fc5ac328eaecab7c70c3.zip
Adjust http.servlet.tests to depend on felix.scr. Change-Id: Icac0d746b169669457292ab94f3da94168e7af98 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml b/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
index 1ed46a42..c333f221 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 ab47c8ac..2bb9155b 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 @@ public class BaseTest {
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";

Back to the top