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:23:57 UTC
[sling-org-apache-sling-jcr-contentloader] branch master updated
(4ef20ca -> 5a702b2)
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-jcr-contentloader.git.
from 4ef20ca Merge pull request #1 from apache/SLING-8243
new 00a5953 style
new 12cc729 SLING-9107 Update Pax Exam to 4.13.2
new 5a702b2 style
The 3 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 | 2 +-
.../org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java | 5 +++--
.../apache/sling/jcr/contentloader/it/ContentloaderTestSupport.java | 5 +++--
.../org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java | 5 +++--
4 files changed, 10 insertions(+), 7 deletions(-)
[sling-org-apache-sling-jcr-contentloader] 02/03: SLING-9107 Update
Pax Exam to 4.13.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-jcr-contentloader.git
commit 12cc7298b429ae2d9fbecc78e76540a93bc4aba8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 14 11:19:27 2020 +0100
SLING-9107 Update Pax Exam to 4.13.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b5172c7..24557a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<properties>
<sling.java.version>8</sling.java.version>
- <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
</properties>
<scm>
[sling-org-apache-sling-jcr-contentloader] 03/03: style
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-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
);
}
[sling-org-apache-sling-jcr-contentloader] 01/03: style
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-jcr-contentloader.git
commit 00a5953f5249e600f7eb31faf262a323d2bdd5c4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 14 11:14:47 2020 +0100
style
---
.../org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java | 5 +++--
.../org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java b/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java
index 8e3c281..7389224 100644
--- a/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java
+++ b/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java
@@ -36,6 +36,7 @@ import org.osgi.framework.Bundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.options;
/**
* Basic test of a bundle that provides initial content
@@ -54,10 +55,10 @@ public class BasicInitialContentIT extends ContentloaderTestSupport {
DEFAULT_PATH_IN_BUNDLE, "folder-with-descriptor/test2.txt"
);
final Option bundle = buildInitialContentBundle(header, content);
- return new Option[]{
+ return options(
baseConfiguration(),
bundle
- };
+ );
}
@Test
diff --git a/src/test/java/org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java b/src/test/java/org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java
index 72a62d2..64daeee 100644
--- a/src/test/java/org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java
+++ b/src/test/java/org/apache/sling/jcr/contentloader/it/I18nInitialContentIT.java
@@ -39,6 +39,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.options;
/**
* Basic test of a bundle that provides I18N initial content
@@ -55,10 +56,10 @@ public class I18nInitialContentIT extends ContentloaderTestSupport {
DEFAULT_PATH_IN_BUNDLE, "i18n/en.json.xml"
);
final Option bundle = buildInitialContentBundle(header, content);
- return new Option[]{
+ return options(
baseConfiguration(),
bundle
- };
+ );
}
@Test