[sling-org-apache-sling-distribution-core] branch master updated: SLING-4075 - Improve test coverage of SCD

[tmaret]

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

tmaret pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
     new c122d2b  SLING-4075 - Improve test coverage of SCD
c122d2b is described below

commit c122d2b901d78d532f5628cd29a7f8cf48e0ddcc
Author: tmaret <tma...@adobe.com>
AuthorDate: Thu Feb 28 15:41:26 2019 +0100

    SLING-4075 - Improve test coverage of SCD
    
    * Allow to run DistributionBaseIT tests without specifying system properties
---
 pom.xml                                                             | 6 ------
 src/test/java/org/apache/sling/distribution/DistributionBaseIT.java | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index b623077..32f1b64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,12 +137,6 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemProperties>
-                        <property>
-                            <name>bundle.filename</name>
-                            
<value>${basedir}/target/${project.build.finalName}.jar</value>
-                        </property>
-                    </systemProperties>
                     <includes>
                         <include>**/*IT.java</include>
                     </includes>
diff --git 
a/src/test/java/org/apache/sling/distribution/DistributionBaseIT.java 
b/src/test/java/org/apache/sling/distribution/DistributionBaseIT.java
index 707d3f8..98ba6c6 100644
--- a/src/test/java/org/apache/sling/distribution/DistributionBaseIT.java
+++ b/src/test/java/org/apache/sling/distribution/DistributionBaseIT.java
@@ -61,6 +61,8 @@ public class DistributionBaseIT extends TestSupport {
 
     @Configuration
     public Option[] configuration() {
+        // Patch versions of features provided by SlingOptions
+        SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", 
"org.apache.sling.distribution.core");
         return new Option[]{
                 baseConfiguration(),
                 slingQuickstart(),
@@ -68,7 +70,6 @@ public class DistributionBaseIT extends TestSupport {
                 // build artifact
                 slingDistribution(),
                 // testing
-                testBundle(    "bundle.filename"),
                 defaultOsgiConfigs(),
                 junitBundles()
         };