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 2018/12/27 13:50:08 UTC
[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-3017
Improve Karaf integration tests
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 236c9a98b6a9d816f59355bc4fa02eb792f4a959
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 27 14:45:55 2018 +0100
SLING-3017 Improve Karaf integration tests
use latest releases
---
pom.xml | 12 ++++++------
.../karaf/tests/bootstrap/SlingQuickstartNosqlMongoIT.java | 9 ++++-----
.../karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 9 ++++-----
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd5cfcd..c04c4d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.18.4</version>
+ <version>2.20.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>2.16.3</version>
+ <version>2.18.0</version>
<scope>test</scope>
</dependency>
<!-- bnd -->
@@ -179,26 +179,26 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>4.5.1</version>
+ <version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
- <version>4.5.1</version>
+ <version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.16.1</version>
+ <version>1.18</version>
<scope>test</scope>
</dependency>
<!-- Couchbase -->
<dependency>
<groupId>com.couchbase.mock</groupId>
<artifactId>CouchbaseMock</artifactId>
- <version>1.5.19</version>
+ <version>1.5.22</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartNosqlMongoIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartNosqlMongoIT.java
index 4e65857..fc0d879 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartNosqlMongoIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartNosqlMongoIT.java
@@ -46,7 +46,6 @@ import org.ops4j.pax.exam.util.Filter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
@RunWith(PaxExam.class)
@@ -84,10 +83,10 @@ public class SlingQuickstartNosqlMongoIT extends KarafTestSupport {
return OptionUtils.combine(baseConfiguration(),
editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
editConfigurationFilePut("etc/org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config.config", "connectionString", connectionString),
- wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.mongo").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.process").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").versionAsInProject()),
+ mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.mongo").versionAsInProject(),
+ mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.process").versionAsInProject(),
+ mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject(),
+ mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").versionAsInProject(),
mavenBundle().groupId("org.apache.commons").artifactId("commons-compress").versionAsInProject(),
addSlingFeatures("sling-quickstart-nosql-mongodb")
);
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
index 75dac9c..8c0d688 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
@@ -42,7 +42,6 @@ import org.osgi.framework.Bundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
@RunWith(PaxExam.class)
@@ -76,10 +75,10 @@ public class SlingQuickstartOakMongoIT extends AbstractSlingQuickstartOakTestSup
return OptionUtils.combine(baseConfiguration(),
editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config", "mongouri", mongoUri),
- wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.mongo").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.process").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject()),
- wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").versionAsInProject()),
+ mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.mongo").versionAsInProject(),
+ mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.process").versionAsInProject(),
+ mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject(),
+ mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").versionAsInProject(),
mavenBundle().groupId("org.apache.commons").artifactId("commons-compress").versionAsInProject(),
addSlingFeatures("sling-quickstart-oak-mongo")
);