backport jdk10 RenderingEngine (DMarlinRenderingEngine is default) + …

…fixed integration tests
bourgesl · Dec 12, 2017 · e1a805c · e1a805c
1 parent 3b16c4c
commit e1a805c
Show file tree

Hide file tree

Showing 2 changed files with 494 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -123,25 +123,25 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.20.1</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.20.1</version>
+                <!-- Run tests when the integration-test phase is invoked (after the marlin jar is built) -->
                 <!--
-                CrashTest may need large heap: -Xms4g -Xmx4g
+                    CrashTest may need large heap: -Xms4g -Xmx4g
                 -->
                 <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>integration-test-float</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
-                            <goal>test</goal>
+                            <goal>integration-test</goal>
                         </goals>
                         <configuration>
                             <skip>${integration.skip}</skip>
@@ -158,9 +158,9 @@
                     </execution>
                     <execution>
                         <id>integration-test-double</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
-                            <goal>test</goal>
+                            <goal>integration-test</goal>
                         </goals>
                         <configuration>
                             <skip>${integration.skip}</skip>
@@ -177,9 +177,9 @@
                     </execution>
                     <execution>
                         <id>integration-long-test-float</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
-                            <goal>test</goal>
+                            <goal>integration-test</goal>
                         </goals>
                         <configuration>
                             <skip>${integration.skip.long}</skip>
@@ -196,9 +196,9 @@
                     </execution>
                     <execution>
                         <id>integration-long-test-double</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
-                            <goal>test</goal>
+                            <goal>integration-test</goal>
                         </goals>
                         <configuration>
                             <skip>${integration.skip.long}</skip>