Author: olli
Date: Tue Dec 29 20:30:24 2015
New Revision: 1722234
URL: http://svn.apache.org/viewvc?rev=1722234&view=rev
Log:
SLING-3017 Improve Karaf integration tests
* use Pax Exam 4.8.0
* use latest releases
* remove boot features configuration
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1722234&r1=1722233&r2=1722234&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Tue Dec 29 20:30:24 2015
@@ -36,7 +36,7 @@
<description>Integration Tests for Apache Sling Launchpad Karaf</description>
<properties>
- <org.ops4j.pax.exam.version>4.7.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.8.0</org.ops4j.pax.exam.version>
</properties>
<dependencies>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
+ <version>1.7.13</version>
<scope>test</scope>
</dependency>
<!-- testing -->
@@ -143,13 +143,13 @@
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
- <version>1.50.0</version>
+ <version>1.50.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.process</artifactId>
- <version>1.50.0</version>
+ <version>1.50.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1722234&r1=1722233&r2=1722234&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
Tue Dec 29 20:30:24 2015
@@ -136,7 +136,6 @@ public abstract class KarafTestSupport {
.unpackDirectory(new File("target/paxexam/" +
getClass().getSimpleName())),
keepRuntimeFolder(),
logLevel(LogLevelOption.LogLevel.INFO),
- editConfigurationFilePut("etc/org.apache.karaf.features.cfg",
"featuresBoot", "(aries-blueprint, bundle, config, deployer, diagnostic,
feature, instance, jaas, kar, log, management, package, service, shell,
shell-compat, ssh, system, wrap, eventadmin, webconsole, http,
http-whiteboard)"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg",
"rmiRegistryPort", Integer.toString(rmiRegistryPort)),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg",
"rmiServerPort", Integer.toString(rmiServerPort)),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg",
"sshPort", Integer.toString(sshPort)),
