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/02/22 21:56:42 UTC
[sling-org-apache-sling-commons-jcr-file] branch master updated
(b072849 -> 66a687d)
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-commons-jcr-file.git.
from b072849 SLING-8516 Make testing compliant with Java 9 and higher
new ef47c0c do not fail on missing baseline
new 36a21d3 SLING-9103 Update Pax Exam to 4.13.2
new 66a687d 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 | 5 ++++-
.../org/apache/sling/commons/jcr/file/it/JcrFileTestSupport.java | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
[sling-org-apache-sling-commons-jcr-file] 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-commons-jcr-file.git
commit 66a687d905e0c90d096c5707db9a5ad7adc02a7e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 22 22:56:05 2020 +0100
style
---
.../org/apache/sling/commons/jcr/file/it/JcrFileTestSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/commons/jcr/file/it/JcrFileTestSupport.java b/src/test/java/org/apache/sling/commons/jcr/file/it/JcrFileTestSupport.java
index e38c648..4a0f18c 100644
--- a/src/test/java/org/apache/sling/commons/jcr/file/it/JcrFileTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/jcr/file/it/JcrFileTestSupport.java
@@ -43,6 +43,7 @@ import static org.apache.sling.testing.paxexam.SlingVersionResolver.SLING_GROUP_
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
public abstract class JcrFileTestSupport extends TestSupport {
@@ -62,7 +63,7 @@ public abstract class JcrFileTestSupport extends TestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
quickstart(),
// Sling Commons JCR File
@@ -75,7 +76,7 @@ public abstract class JcrFileTestSupport extends TestSupport {
mavenBundle().groupId(SLING_GROUP_ID).artifactId("org.apache.sling.starter.content").version("1.0.0"),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
junitBundles()
- };
+ );
}
protected Option quickstart() {
[sling-org-apache-sling-commons-jcr-file] 02/03: SLING-9103 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-commons-jcr-file.git
commit 36a21d37c08a8f9b19e6f972a0be43da2f39420f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 22 10:22:57 2020 +0100
SLING-9103 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 5287f3c..f9e584a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<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-commons-jcr-file] 01/03: do not fail on
missing baseline
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-commons-jcr-file.git
commit ef47c0cc10dd5f508baa356c8d867c05b47d717d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 22 10:22:16 2020 +0100
do not fail on missing baseline
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index 1f33e2d..5287f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,9 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>