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/03/14 10:24:00 UTC

[sling-org-apache-sling-jcr-contentloader] 03/03: style

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-jcr-contentloader.git

commit 5a702b2bed2d7140db9ce9656814ad4c5c80bfb7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 14 11:23:47 2020 +0100

    style
---
 .../apache/sling/jcr/contentloader/it/ContentloaderTestSupport.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/apache/sling/jcr/contentloader/it/ContentloaderTestSupport.java b/src/test/java/org/apache/sling/jcr/contentloader/it/ContentloaderTestSupport.java
index f8e8196..97d3e53 100644
--- a/src/test/java/org/apache/sling/jcr/contentloader/it/ContentloaderTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/contentloader/it/ContentloaderTestSupport.java
@@ -86,10 +86,9 @@ public abstract class ContentloaderTestSupport extends TestSupport {
 
     public ModifiableCompositeOption baseConfiguration() {
         final Option contentloader = mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.contentloader").version(SlingOptions.versionResolver.getVersion("org.apache.sling", "org.apache.sling.jcr.contentloader"));
-        final ModifiableCompositeOption quickstart = quickstart().remove(contentloader);
         return composite(
             super.baseConfiguration(),
-            quickstart,
+            quickstart(),
             // Sling JCR ContentLoader
             testBundle("bundle.filename"),
             factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
@@ -101,6 +100,8 @@ public abstract class ContentloaderTestSupport extends TestSupport {
                 .asOption(),
             slingResourcePresence(),
             junitBundles()
+        ).remove(
+            contentloader
         );
     }