This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git
commit 3418a6bbc1733f81f8d56434ebe9510c1fb9f932
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Sat Oct 17 08:43:39 2020 +0200
SLING-9837 Use OSGi R7 HTTP Service
---
.../karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
index 219d89b..23d6007 100644
---
a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
+++
b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
@@ -43,7 +43,7 @@ public class SlingQuickstartOakTarConfiguration extends
KarafTestSupport {
// configurations for tests
editConfigurationFilePut("etc/custom.properties",
"sling.run.modes", "oak_tar"),
editConfigurationFilePut("etc/users.properties", "admin",
"admin,_g_:admingroup"), // Sling’s default admin credentials used in tests
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
"org.osgi.service.http.port", Integer.toString(httpPort)),
+ editConfigurationFilePut("etc/org.apache.felix.http.cfg",
"org.osgi.service.http.port", Integer.toString(httpPort)),
editConfigurationFilePut("etc/integrationTestsConfig.config",
"message", "This test config should be loaded at startup"),
editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.config",
"servletresolver.cacheSize", "0"),
editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.config",
"dav.root", "/dav"),
