Merge branch 'master' into java9

Merge pull request #637 from danielsiwiec/java9-running-tests
Configuration changes needed to run tests on Java 9
2018-03-24 17:19:59 +02:00 · 2017-09-24 18:56:47 +03:00 · 2017-09-12 23:30:43 -07:00 · 2017-09-12 22:12:05 -07:00 · 2017-09-12 18:09:29 -07:00 · 2017-09-12 18:08:56 -07:00
2 changed files with 3 additions and 3 deletions
--- a/naked-objects/dom/pom.xml
+++ b/naked-objects/dom/pom.xml
@ -117,7 +117,7 @@
 						<artifactId>datanucleus-maven-plugin</artifactId>
 						<version>${datanucleus-maven-plugin.version}</version>
 						<configuration>
-							<fork>false</fork>
+							<fork>true</fork>
 							<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
 							<verbose>true</verbose>
 							<props>${basedir}/datanucleus.properties</props>
--- a/pom.xml
+++ b/pom.xml
@ -37,7 +37,7 @@
        <junit-platform.version>1.0.2</junit-platform.version>
        <sping-test-junit5.version>1.0.2</sping-test-junit5.version>
        <compiler.version>3.0</compiler.version>
-        <jacoco.version>0.7.2.201409121644</jacoco.version>
+        <jacoco.version>0.7.9</jacoco.version>
        <commons-dbcp.version>1.4</commons-dbcp.version>
        <camel.version>2.16.1</camel.version>
        <guava.version>19.0</guava.version>
@ -411,7 +411,7 @@
                    </dependency>
                </dependencies>
                <configuration>
-                    <argLine>-Xmx1024M ${argLine}</argLine>
+                    <argLine>-Xmx1024M --add-modules java.xml.bind,java.xml.ws.annotation ${argLine}</argLine>
                </configuration>
            </plugin>
            <plugin>
Author	SHA1	Message	Date
Ilkka Seppälä	5a9f1b017e	Merge branch 'master' into java9	2018-03-24 17:19:59 +02:00
Ilkka Seppälä	1f067b845e	Merge pull request #637 from danielsiwiec/java9-running-tests Configuration changes needed to run tests on Java 9	2017-09-24 18:56:47 +03:00
Dan Siwiec	00bdfd6bd8	add another jdk 9 module to prevent class not found errors #591	2017-09-12 23:30:43 -07:00
Dan Siwiec	f07d3bd4d5	Turn forking on to prevent datanucleus from missing a jdk 9 module #591	2017-09-12 22:12:05 -07:00
Dan Siwiec	546f3560d8	Load ee module to make EE classes available on classpath #591	2017-09-12 18:09:29 -07:00
Dan Siwiec	0ac1f43f8a	Upgrade jacoco version to fix the UUID initialization problem #591	2017-09-12 18:08:56 -07:00
Ilkka Seppälä	e1d8266c95	Merge branch 'master' into java9	2017-09-03 12:26:27 +03:00