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 21:17:28 UTC
[sling-org-apache-sling-commons-contentdetection] branch master
updated: SLING-8513 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-commons-contentdetection.git
The following commit(s) were added to refs/heads/master by this push:
new 3739e51 SLING-8513 Make testing compliant with Java 9 and higher
3739e51 is described below
commit 3739e51004a1eaa54f1e3fa7c08a2eaf8950b304
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 22:04:30 2019 +0200
SLING-8513 Make testing compliant with Java 9 and higher
* 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
---
bnd.bnd | 12 ------------
pom.xml | 10 +++++-----
.../internal/it/ContentdetectionTestSupport.java | 3 ++-
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 6f12f39..e36a0d6 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,15 +1,3 @@
-Bundle-Category: sling
-
-Bundle-Description: ${project.description}
-
-Bundle-DocURL: https://sling.apache.org
-
-Bundle-License: Apache License, Version 2.0
-
-Bundle-Vendor: The Apache Software Foundation
-
--exportcontents: ${packages;VERSIONED}
-
-removeheaders:\
Include-Resource,\
Private-Package
diff --git a/pom.xml b/pom.xml
index 85a4b2a..a8fc67b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>33</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
@@ -37,7 +37,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<!-- Apache Tika-->
@@ -111,7 +111,7 @@
<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>
<!-- testing -->
diff --git a/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java b/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
index 22c7551..c5c0a8b 100644
--- a/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/contentdetection/internal/it/ContentdetectionTestSupport.java
@@ -19,6 +19,7 @@ package org.apache.sling.commons.contentdetection.internal.it;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.options.ModifiableCompositeOption;
import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
import static org.ops4j.pax.exam.CoreOptions.composite;
@@ -38,7 +39,7 @@ public abstract class ContentdetectionTestSupport extends TestSupport {
};
}
- protected Option slingQuickstart() {
+ protected ModifiableCompositeOption slingQuickstart() {
final int httpPort = findFreePort();
final String workingDirectory = workingDirectory();
return composite(