HV-1187 Fix incontainer build which was broken by latest changes

hibernate · Dec 19, 2016 · 243d71f · 243d71f
1 parent 2679011
commit 243d71f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -502,7 +502,7 @@
                         <includes>
                             <include>**/*Test.java</include>
                         </includes>
-                        <argLine>${maven-surefire-plugin.argLine} ${maven-surefire-plugin.argLine.add-modules} ${maven-surefire-plugin.argLine.add-opens}</argLine>
+                        <argLine>${maven-surefire-plugin.argLine}</argLine>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -924,6 +924,19 @@
                 <!-- Use Groovy 2.4.8-SNAPSHOT for JDK 9. To be removed once 2.4.8 is officially released. -->
                 <groovy.version>2.4.8-SNAPSHOT</groovy.version>
             </properties>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <version>${maven-surefire-plugin.version}</version>
+                            <configuration>
+                                <argLine>${maven-surefire-plugin.argLine} ${maven-surefire-plugin.argLine.add-modules} ${maven-surefire-plugin.argLine.add-opens}</argLine>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
             <!--
             Add JFrog snapshots repository for Groovy 2.4.8-SNAPSHOT.
             To be removed once 2.4.8 is officially released.

diff --git a/tck-runner/pom.xml b/tck-runner/pom.xml
@@ -243,7 +243,7 @@
                 </property>
             </activation>
             <properties>
-                <maven-surefire-plugin.argLine.add-opens>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</maven-surefire-plugin.argLine.add-opens>
+                <maven-surefire-plugin.argLine>-Xmx1024m -Djava.util.logging.manager=org.jboss.logmanager.LogManager</maven-surefire-plugin.argLine>
                 <arquillian.protocol>Servlet 3.0</arquillian.protocol>
             </properties>
             <dependencies>
@@ -339,7 +339,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <argLine>-Xmx1024m -Djava.util.logging.manager=org.jboss.logmanager.LogManager ${maven-surefire-plugin.argLine.add-modules} ${maven-surefire-plugin.argLine.add-opens}</argLine>
                             <forkMode>once</forkMode>
                             <systemPropertyVariables>
                                 <arquillian.launch>incontainer</arquillian.launch>
@@ -355,6 +354,7 @@
                 <jdk>9</jdk>
             </activation>
             <properties>
+                <maven-surefire-plugin.argLine.add-opens>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</maven-surefire-plugin.argLine.add-opens>
                 <tck.suite.file>${project.build.directory}/test-classes/tck-tests-jdk9.xml</tck.suite.file>
             </properties>
         </profile>