[sling-org-apache-sling-jcr-oak-server] 01/02: remove workaround for Java 7 (SLING-6080)

2018-02-12 Thread olli 
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch feature/oak-1.8
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git

commit e831d04e4f3b1ff13de9bbb44c357d54fff61201
Author: Oliver Lietz 
AuthorDate: Fri Feb 2 17:26:11 2018 +0100

remove workaround for Java 7 (SLING-6080)
---
 .../java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java 
b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
index 3fe0a4b..a8b0d76 100644
--- a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
@@ -161,8 +161,6 @@ public abstract class OakServerTestSupport extends 
TestSupport {
 }
 
 protected Option launchpad() {
-versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
-versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
 final String repoinit = 
String.format("raw:file:%s/src/test/resources/repoinit.txt", 
PathUtils.getBaseDir());
 final String slingHome = String.format("%s/sling", workingDirectory());
 final String repositoryHome = String.format("%s/repository", 
slingHome);

-- 
To stop receiving notification emails like this one, please contact
o...@apache.org.

[sling-org-apache-sling-jcr-oak-server] 01/02: remove workaround for Java 7 (SLING-6080)

2018-02-02 Thread olli 
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-oak-server.git

commit 0b231ed9f4c73ffe2848542197580cb39a2a924d
Author: Oliver Lietz 
AuthorDate: Fri Feb 2 17:26:11 2018 +0100

remove workaround for Java 7 (SLING-6080)
---
 .../java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java 
b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
index 3fe0a4b..a8b0d76 100644
--- a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
@@ -161,8 +161,6 @@ public abstract class OakServerTestSupport extends 
TestSupport {
 }
 
 protected Option launchpad() {
-versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
-versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
 final String repoinit = 
String.format("raw:file:%s/src/test/resources/repoinit.txt", 
PathUtils.getBaseDir());
 final String slingHome = String.format("%s/sling", workingDirectory());
 final String repositoryHome = String.format("%s/repository", 
slingHome);

-- 
To stop receiving notification emails like this one, please contact
o...@apache.org.