svn commit: r1763025 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[olli]

Author: olli
Date: Sat Oct  1 17:56:16 2016
New Revision: 1763025

URL: http://svn.apache.org/viewvc?rev=1763025&view=rev
Log:
SLING-6080 oak-server ITs fail under Java 7

* use latest Felix HTTP bundles for Java 7
* remove java8 profile

Modified:
    sling/trunk/bundles/jcr/oak-server/pom.xml
    
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1763025&r1=1763024&r2=1763025&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Sat Oct  1 17:56:16 2016
@@ -72,6 +72,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <version>2.18.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
         <configuration>
           <systemProperties>
             <property>
@@ -260,30 +268,4 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <!-- Test currently fail with Java 7, see  -->
-    <profile>
-        <id>java8</id>
-        <activation>
-            <jdk>1.8</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <executions>
-                      <execution>
-                        <goals>
-                          <goal>integration-test</goal>
-                          <goal>verify</goal>
-                        </goals>
-                      </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-  </profiles>
-
 </project>

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1763025&r1=1763024&r2=1763025&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Sat Oct  1 17:56:16 2016
@@ -155,6 +155,8 @@ public abstract class OakServerTestSuppo
 
     protected Option launchpad() {
         SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, 
"org.apache.sling.jcr.base");
+        SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
+        SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
         final String slingHome = String.format("%s/sling", workingDirectory());
         final String repositoryHome = String.format("%s/repository", 
slingHome);
         final String localIndexDir = String.format("%s/index", repositoryHome);