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 14:16:08 UTC
[sling-org-apache-sling-capabilities-jcr] branch master updated
(efc7fcb -> fc7c32a)
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-capabilities-jcr.git.
from efc7fcb SLING-8511 Make testing compliant with Java 9 and higher
new b3bfd9a style
new fc7c32a SLING-9122 Update Pax Exam to 4.13.2
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 | 2 +-
.../apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
[sling-org-apache-sling-capabilities-jcr] 01/02: 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-capabilities-jcr.git
commit b3bfd9a41a26612538e6fa8bf0afa5e8372cb76e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Feb 23 00:40:14 2020 +0100
style
---
.../apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java b/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
index c6d4e43..54d8277 100644
--- a/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
+++ b/src/test/java/org/apache/sling/capabilities/it/JcrCapabilitiesTestSupport.java
@@ -27,6 +27,7 @@ import static org.apache.sling.testing.paxexam.SlingOptions.logback;
import static org.apache.sling.testing.paxexam.SlingOptions.scr;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
public abstract class JcrCapabilitiesTestSupport extends TestSupport {
@@ -35,8 +36,8 @@ public abstract class JcrCapabilitiesTestSupport extends TestSupport {
// Keep versions low for our dependencies, to make sure this bundle stays
// compatible with older Sling versions.
SlingOptions.versionResolver.setVersion("slf4j", "slf4j-api", "1.7.6");
-
- return new Option[]{
+
+ return options(
baseConfiguration(),
// Use older versions to stay compatible with older versions of Sling - no need for bleeding edge stuff
@@ -59,6 +60,6 @@ public abstract class JcrCapabilitiesTestSupport extends TestSupport {
// Test stuff
junitBundles(),
logback()
- };
+ );
}
}
[sling-org-apache-sling-capabilities-jcr] 02/02: SLING-9122 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-capabilities-jcr.git
commit fc7c32abd78023d3e9b7b5dc93641cf8624809dd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Feb 23 00:44:47 2020 +0100
SLING-9122 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 627887d..a4cd75a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<!-- This module can work with older versions of Sling
as well, so be conservative here -->
<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>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-capabilities-jcr.git</connection>