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/05/15 08:13:20 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated (91cc26d -> dfd15df)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.
from 91cc26d SLING-10292 Update Karaf to 4.3.2
new 28b8f7e SLING-10292 Update Karaf to 4.3.2
new dfd15df SLING-10042 Remove read permission on /content for everyone
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 ++--
.../tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java | 10 ++++++++++
.../sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 1 +
.../sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java | 1 +
4 files changed, 14 insertions(+), 2 deletions(-)
[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-10292
Update Karaf to 4.3.2
Posted by ol...@apache.org.
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
commit 28b8f7ec7e2c8e2f4bb3e1cd7c1b8e0bb5c73583
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 11 19:45:42 2021 +0200
SLING-10292 Update Karaf to 4.3.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7b1118e..6b37760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.3.2</version>
<scope>provided</scope>
</dependency>
<!-- Apache Sling -->
@@ -184,7 +184,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.3.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-10042
Remove read permission on /content for everyone
Posted by ol...@apache.org.
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
commit dfd15df5debe7256c73a86531c84a4aabc56e7ce
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed May 12 13:07:57 2021 +0200
SLING-10042 Remove read permission on /content for everyone
allow everyone read on /content (until tests are adjusted)
---
.../tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java | 10 ++++++++++
.../sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 1 +
.../sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java | 1 +
3 files changed, 12 insertions(+)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java
index 34e3590..899b4b6 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java
@@ -51,6 +51,7 @@ import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.karaf.testing.KarafTestSupport;
import org.junit.Ignore;
import org.junit.Test;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.util.Filter;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
@@ -60,6 +61,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
public abstract class AbstractSlingQuickstartOakTestSupport extends KarafTestSupport {
@@ -76,6 +78,14 @@ public abstract class AbstractSlingQuickstartOakTestSupport extends KarafTestSup
public AbstractSlingQuickstartOakTestSupport() {
}
+ protected Option allowEveryoneReadContent() {
+ final String[] scripts = new String[]{
+ "create path (sling:OrderedFolder) /content",
+ "set ACL for everyone\nallow jcr:read on /content\nend"
+ };
+ return editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.RepositoryInitializer-everyone_read_content.config", "scripts", scripts);
+ }
+
@Test
public void testSlingRepository() throws Exception {
assertNotNull(slingRepository);
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
index df5213b..63e9e17 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
@@ -66,6 +66,7 @@ public class SlingQuickstartOakMongoIT extends AbstractSlingQuickstartOakTestSup
final String mongoUri = String.format("mongodb://%s:%s", host, port);
return combine(
baseConfiguration(),
+ allowEveryoneReadContent(),
editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config", "mongouri", mongoUri),
addSlingFeatures("sling-quickstart-oak-mongo"),
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
index 2e5ebc0..4be998e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
@@ -38,6 +38,7 @@ public class SlingQuickstartOakTarIT extends AbstractSlingQuickstartOakTestSuppo
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
+ allowEveryoneReadContent(),
addSlingFeatures("sling-quickstart-oak-tar"),
addFelixHttpFeature()
);