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 2021/01/08 14:28:04 UTC
[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests]
branch master updated: 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-karaf-launchpad-oak-tar-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new 93ff19a style
93ff19a is described below
commit 93ff19a2088942dffb1b724b5811aacb6b126b9e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jan 8 15:17:38 2021 +0100
style
---
.../tests/configuration/SlingQuickstartOakTarConfiguration.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
index 63440d1..cdce716 100644
--- a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
+++ b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
@@ -21,10 +21,10 @@ package org.apache.sling.karaf.tests.configuration;
import org.apache.sling.karaf.testing.KarafTestSupport;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+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.overrideJUnitBundles;
@@ -39,7 +39,8 @@ public class SlingQuickstartOakTarConfiguration extends KarafTestSupport {
"create path /repoinit/provisioningModelTest",
"set ACL for everyone\nallow jcr:read on /content\nallow jcr:read on /ANON_CAN_READ\nend"
};
- return OptionUtils.combine(baseConfiguration(),
+ return combine(
+ baseConfiguration(),
cleanCaches(true),
// configurations for tests
editConfigurationFilePut("etc/custom.properties", "sling.run.modes", "oak_tar"),