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 2019/06/15 14:34:08 UTC
[sling-org-apache-sling-capabilities] branch master updated:
SLING-8507 Make testing compliant with Java 9 and higher
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.git
The following commit(s) were added to refs/heads/master by this push:
new fee4525 SLING-8507 Make testing compliant with Java 9 and higher
fee4525 is described below
commit fee45259cb50c6941e23d1e61a9529f145ff8912
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 16:33:45 2019 +0200
SLING-8507 Make testing compliant with Java 9 and higher
* Set sling.java.version to 8
* Use Sling Bundle Parent 35
* Update Pax Exam to 4.13.1
* Update Testing PaxExam to 3.0.0
* Update Felix Framework to 6.0.3
* Use scr Option
---
pom.xml | 15 +++++++++------
.../sling/capabilities/it/CapabilitiesTestSupport.java | 3 ++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca4a091..c7a13ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,21 +18,24 @@
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<parent>
- <artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
+
<modelVersion>4.0.0</modelVersion>
<name>Apache Sling Capabilities</name>
<artifactId>org.apache.sling.capabilities</artifactId>
<version>0.1.3-SNAPSHOT</version>
+
<properties>
<!-- This module can work with older versions of Sling
as well, so be conservative here -->
- <sling.java.version>7</sling.java.version>
- <org.ops4j.pax.exam.version>4.12.0</org.ops4j.pax.exam.version>
+ <sling.java.version>8</sling.java.version>
+ <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -165,13 +168,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
+ <version>6.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>2.0.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java b/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
index ad97852..6d68e89 100644
--- a/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
+++ b/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
@@ -24,6 +24,7 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
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;
@@ -39,7 +40,7 @@ public abstract class CapabilitiesTestSupport extends TestSupport {
baseConfiguration(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version("1.1.2"),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version("2.0.2"),
+ scr(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.api").version("2.11.0"),
// This bundle