sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject [sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests] branch master updated: SLING-3821 Run launchpad integration tests against Sling on Karaf
Date Sun, 09 Dec 2018 18:47:22 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new e3b45f0  SLING-3821 Run launchpad integration tests against Sling on Karaf
e3b45f0 is described below

commit e3b45f0e4a18559c8735e5bed5b06b8c7224952f
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Sat Dec 8 22:10:33 2018 +0100

    SLING-3821 Run launchpad integration tests against Sling on Karaf
    
    fix WebDAV ITs by adjusting dependencies
---
 pom.xml                                                       | 11 +++++++++--
 .../configuration/SlingQuickstartOakTarConfiguration.java     |  2 --
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cf33c43..84a13d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,13 @@
       <artifactId>osgi.cmpn</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Apache Jackrabbit -->
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-webdav</artifactId>
+      <version>2.16.3</version>
+      <scope>test</scope>
+    </dependency>
     <!-- Apache Karaf -->
     <dependency>
       <groupId>org.apache.karaf</groupId>
@@ -163,13 +170,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-osgi</artifactId>
+      <artifactId>httpcore</artifactId>
       <version>4.4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient-osgi</artifactId>
+      <artifactId>httpclient</artifactId>
       <version>4.5.6</version>
       <scope>test</scope>
     </dependency>
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 f946df6..759a991 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
@@ -70,8 +70,6 @@ public class SlingQuickstartOakTarConfiguration extends KarafTestSupport
{
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-services").versionAsInProject(),
             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(),
             overrideJUnitBundles()
         );
     }


Mime
View raw message