fixing reverse command package, adding some java 9 options to java test command
diff --git a/pom.xml b/pom.xml
index 9158110..be81e13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,10 +546,10 @@
<build>
<plugins>
- <plugin>
+ <plugin> <!-- not used by tomee yet -->
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<executions>
<execution>
<id>generate-reverse-tests</id>
@@ -559,7 +559,7 @@
</goals>
<configuration>
<source>
- new commands.ReverseSetupCommand(this).execute()
+ new openejb.tck.commands.ReverseSetupCommand(this).execute()
</source>
</configuration>
</execution>
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 28cd85b..60c27c6 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -214,7 +214,11 @@
def opts = get('tck.java.opts')
if (tckJavaVersion != null && (tckJavaVersion.startsWith("9") || tckJavaVersion.startsWith("1.9"))) {
- jvmarg(value: "-Dtck.java.opts=-Dopenejb.deployer.jndiname=openejb/WebappDeployerRemote --add-opens java.base/java.net=ALL-UNNAMED --add-modules java.xml.bind,java.corba")
+ jvmarg(value: "-Dtck.java.opts=" +
+ "-Dopenejb.deployer.jndiname=openejb/WebappDeployerRemote " +
+ "--add-opens java.base/java.net=ALL-UNNAMED " +
+ "--add-opens java.base/java.lang=ALL-UNNAMED " +
+ "--add-modules java.xml.bind,java.corba")
}
sysproperty(key: "user.language", value: 'en')
@@ -323,9 +327,8 @@
// HACK: Some pre-running feedback (have to include this in the java closure)
//
log.info("Running tests...")
- log.info("> Container Java Home: ${tckJavaHome}")
log.info("> Container Java Version: ${tckJavaVersion}")
- log.info("> Container Java Opts: ${opts}")
+ log.info("> Container Java Home: ${tckJavaHome}")
line()
}
