[sling-org-apache-sling-karaf-integration-tests] branch master updated: style

[olli]

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


The following commit(s) were added to refs/heads/master by this push:
     new 7f708d0  style
7f708d0 is described below

commit 7f708d065ee643b309bc2348ac0b3d920f50bba8
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Sat Dec 19 21:12:16 2020 +0100

    style
---
 src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java 
b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
index 1f8d71f..adeb1a0 100644
--- a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
+++ b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
@@ -26,7 +26,6 @@ import javax.inject.Inject;
 
 import org.apache.karaf.features.BootFinished;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
 import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
 import org.ops4j.pax.exam.util.Filter;
 import org.ops4j.pax.exam.util.PathUtils;
@@ -41,6 +40,7 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.streamBundle;
 import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.OptionUtils.combine;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
@@ -151,7 +151,7 @@ public abstract class KarafTestSupport {
             karafTestSupportBundle()
         );
         if (JavaVersionUtil.getMajorVersion() >= 9) {
-            return OptionUtils.combine(options, java9plus());
+            return combine(options, java9plus());
         } else {
             return options;
         }