Fix mistaken dir property in dist.exec

Signed-off-by: Scott Kurz <[email protected]>
jakartaee · Jul 25, 2020 · 1caa1e1 · 1caa1e1
1 parent db4362d
commit 1caa1e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/com.ibm.jbatch.tck.dist.exec/pom.xml b/com.ibm.jbatch.tck.dist.exec/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
         <dist.exec.antdir>${project.build.directory}/executeTCK/${batch.tck.archive.root}</dist.exec.antdir>
-        <jbatch.runtime.dir>${project.build.directory}/executeTCK/${batch.tck.archive.root}</jbatch.runtime.dir>
+        <jbatch.runtime.dir>${project.build.directory}/executeTCK/jbatch-runtime-dir</jbatch.runtime.dir>
     </properties>
 
 
@@ -144,7 +144,7 @@
                             <rules>
                                 <requireJavaVersion>
                                     <version>[1.8,1.9)</version>
-                                    <message>${nl}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${nl}! This execution must be run with Java 8 (since signature test ${nl}config out of the box only works with Java 8).${nl}If you add '-DskipSigTests=true' you can run the TestNG runtime${nl}  tests with Java 11.  Or set up -Djava.base.sigtest.path to run with Java 11, and remove this enforcer check. ${nl} It's just to give a more obvious failure and keep people thinking they did something wrong.${nl}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${nl}</message>
+                                    <message>${nl}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${nl}! This execution must be run with Java 8 (since signature test ${nl}config out of the box only works with Java 8).${nl}If you add '-DskipSigTests=true' you can run the TestNG runtime${nl}  tests with Java 11.  Or set up -Djava.base.sigtest.path to run with Java 11, and run with -Denforcer.skip or remove this enforcer check. ${nl} It's just to give a more obvious failure and keep people thinking they did something wrong.${nl}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${nl}</message>
                                 </requireJavaVersion>
                                 <requireProperty>
                                     <property>java.vendor</property>

diff --git a/com.ibm.jbatch.tck/testng/build.xml b/com.ibm.jbatch.tck/testng/build.xml
@@ -62,6 +62,7 @@
         <loadproperties srcFile="batch-tck-testng.properties"/>
         <echo message="ant.java.version=${ant.java.version}"/>
         <echo message="java.version=${java.version}"/>
+        <echo message="batch.impl.testng.path=${batch.impl.testng.path}"/>
     </target>
 
     <target name="clean">