You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/04/07 20:04:57 UTC

[sling-org-apache-sling-karaf-integration-tests] branch master updated (60972b3 -> b5847fa)

This is an automated email from the ASF dual-hosted git repository.

olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.


    from 60972b3  SLING-9317 Provide HttpComponents Client feature
     new 90b47b7  SLING-3027 Improve Launchpad Karaf Features
     new b5847fa  remove unused dependencies

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            | 51 +---------------------
 .../sling/karaf/tests/bootstrap/JackrabbitIT.java  |  4 +-
 2 files changed, 3 insertions(+), 52 deletions(-)


[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-3027 Improve Launchpad Karaf Features

Posted by ol...@apache.org.
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-integration-tests.git

commit 90b47b7b3f108553735cf3549ca20fc8e8828b09
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 3 09:40:20 2020 +0200

    SLING-3027 Improve Launchpad Karaf Features
    
    * Update Jackrabbit
    * Switch from jackrabbit-api to oak-jackrabbit-api
---
 pom.xml                                                               | 2 +-
 .../java/org/apache/sling/karaf/tests/bootstrap/JackrabbitIT.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 31e07c5..1f40932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>2.18.0</version>
+      <version>2.20.0</version>
       <scope>test</scope>
     </dependency>
     <!-- bnd -->
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitIT.java
index 235e001..c0431a6 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/JackrabbitIT.java
@@ -44,8 +44,8 @@ public class JackrabbitIT extends KarafTestSupport {
     }
 
     @Test
-    public void testOrgApacheJackrabbitJackrabbitApi() {
-        final Bundle bundle = findBundle("org.apache.jackrabbit.jackrabbit-api");
+    public void testOrgApacheJackrabbitOakJackrabbitApi() {
+        final Bundle bundle = findBundle("org.apache.jackrabbit.oak-jackrabbit-api");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }


[sling-org-apache-sling-karaf-integration-tests] 02/02: remove unused dependencies

Posted by ol...@apache.org.
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-integration-tests.git

commit b5847fa5e9775db5684574a81e93f865c88d9411
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 3 09:41:28 2020 +0200

    remove unused dependencies
---
 pom.xml | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f40932..01dc88b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,12 +94,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.messaging</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.karaf-features</artifactId>
       <version>0.1.1-SNAPSHOT</version>
       <type>xml</type>
@@ -193,49 +187,6 @@
       <version>1.18</version>
       <scope>test</scope>
     </dependency>
-    <!-- Couchbase -->
-    <dependency>
-      <groupId>com.couchbase.mock</groupId>
-      <artifactId>CouchbaseMock</artifactId>
-      <version>1.5.22</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.couchbase.client</groupId>
-      <artifactId>couchbase-client</artifactId>
-      <version>1.4.13</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.intellij</groupId>
-      <artifactId>annotations</artifactId>
-      <version>12.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.8.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-      <version>1.7.10_1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.tukaani</groupId>
-      <artifactId>xz</artifactId>
-      <version>1.8</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>