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 2017/03/28 12:53:23 UTC

svn commit: r1789111 - /sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java

Author: olli
Date: Tue Mar 28 12:53:22 2017
New Revision: 1789111

URL: http://svn.apache.org/viewvc?rev=1789111&view=rev
Log:
support build with Java 7

Modified:
    sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java

Modified: sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java?rev=1789111&r1=1789110&r2=1789111&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java (original)
+++ sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/it/ScriptingCoreTestSupport.java Tue Mar 28 12:53:22 2017
@@ -55,6 +55,8 @@ public class ScriptingCoreTestSupport ex
     }
 
     protected Option launchpad() {
+        versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.jetty", "3.1.6"); // Java 7
+        versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.whiteboard", "2.3.2"); // Java 7
         final int httpPort = findFreePort();
         System.out.println("http port " + httpPort);
         return composite(