This is an automated email from the ASF dual-hosted git repository. rombert 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 448f2b99f935e3a8422a66b13622e04ce3c699d9 Author: Oliver Lietz <[email protected]> AuthorDate: Fri Jan 13 08:04:56 2017 +0000 SLING-3821 Run launchpad integration tests against Sling on Karaf remove workaround for PAXWEB-935 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1778505 13f79535-47bb-0310-9956-ffa450edef68 --- .../tests/configuration/SlingLaunchpadOakTarConfiguration.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java index d0ff2a7..0e36834 100644 --- a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java +++ b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java @@ -58,7 +58,7 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { editConfigurationFilePut("etc/org.ops4j.pax.web.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"), - // TODO PAXWEB-935 editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.config", "dav.root", "/dav"), + editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.config", "dav.root", "/dav"), editConfigurationFilePut("etc/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet.config", "alias", "/server"), editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.config", "enabled", "true"), editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config", "references", "[\"raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt\", \"raw:classpath://repoinit/repoinit.txt\"]"), @@ -87,9 +87,7 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(), mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(), - mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(), - // TODO PAXWEB-935 - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webdav").version("2.2.2") + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject() ); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
