diff --git a/arquillian/appclient/pom.xml b/arquillian/appclient/pom.xml index 06427983a..e2af0d534 100644 --- a/arquillian/appclient/pom.xml +++ b/arquillian/appclient/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M12 ../pom.xml diff --git a/arquillian/common/pom.xml b/arquillian/common/pom.xml index 15bcd2146..d08cc1997 100644 --- a/arquillian/common/pom.xml +++ b/arquillian/common/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M12 ../pom.xml diff --git a/arquillian/common/src/main/java/tck/arquillian/protocol/common/TsTestPropsBuilder.java b/arquillian/common/src/main/java/tck/arquillian/protocol/common/TsTestPropsBuilder.java index be7fbebe6..aa94a6039 100644 --- a/arquillian/common/src/main/java/tck/arquillian/protocol/common/TsTestPropsBuilder.java +++ b/arquillian/common/src/main/java/tck/arquillian/protocol/common/TsTestPropsBuilder.java @@ -118,12 +118,12 @@ public static String[] runArgs(ProtocolCommonConfig config, Deployment deploymen String testMethodName = testMethodExecutor.getMethod().getName(); int index = testMethodName.lastIndexOf('_'); String tsTestMethodName = testMethodName; - if(index != -1) { + if (index != -1) { tsTestMethodName = testMethodName.substring(0, index); } // The none vehicle is a basic appclient test, not a vehicle based test String vehicle = "none"; - if(testVehicle != null) { + if (testVehicle != null) { vehicle = testVehicle.value(); } @@ -133,7 +133,10 @@ public static String[] runArgs(ProtocolCommonConfig config, Deployment deploymen // We need the JavaTest ts.jte file for now Path tsJte = Paths.get(config.getTsJteFile()); - Path tssqlStmt = Paths.get(config.getTsSqlStmtFile()); + Path tssqlStmt = null; + if (config.getTsSqlStmtFile() != null) { + tssqlStmt = Paths.get(config.getTsSqlStmtFile()); + } // Create a test properties file Path testProps = Paths.get(config.getWorkDir(), "tstest.jte"); @@ -188,7 +191,7 @@ public static String[] runArgs(ProtocolCommonConfig config, Deployment deploymen String[] args = { // test props are needed by EETest.run "-p", testProps.toFile().getAbsolutePath(), - "-ap", tssqlStmt.toFile().getAbsolutePath(), + "-ap", tssqlStmt != null ? tssqlStmt.toFile().getAbsolutePath() : "/dev/null", "classname", testMethodExecutor.getMethod().getDeclaringClass().getName(), "-t", tsTestMethodName, "-vehicle", vehicle, diff --git a/arquillian/javatest/pom.xml b/arquillian/javatest/pom.xml index 06c7426c9..3f83cb621 100644 --- a/arquillian/javatest/pom.xml +++ b/arquillian/javatest/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M12 ../pom.xml diff --git a/arquillian/pom.xml b/arquillian/pom.xml index fb194e113..95ce01c55 100644 --- a/arquillian/pom.xml +++ b/arquillian/pom.xml @@ -14,7 +14,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M12 pom Arquillian Jakarta TCK Parent Protocols and testenrichers for Jakarta TCKs diff --git a/arquillian/porting-lib/pom.xml b/arquillian/porting-lib/pom.xml index e646909b8..a7bca16d4 100644 --- a/arquillian/porting-lib/pom.xml +++ b/arquillian/porting-lib/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M12 ../pom.xml diff --git a/arquillian/protocol-lib/pom.xml b/arquillian/protocol-lib/pom.xml index 98fd94676..0f29f25af 100644 --- a/arquillian/protocol-lib/pom.xml +++ b/arquillian/protocol-lib/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M12 ../pom.xml @@ -74,6 +74,7 @@ false ${project.build.directory}/classes **/*.class + **/connector/**,**/jms/**,**/vehicle/**,**/whitebox/** diff --git a/tools/jar2shrinkwrap/pom.xml b/tools/jar2shrinkwrap/pom.xml index a4f565ed2..1a2d2f980 100644 --- a/tools/jar2shrinkwrap/pom.xml +++ b/tools/jar2shrinkwrap/pom.xml @@ -10,7 +10,7 @@ 1.0.9 - 1.0.0-SNAPSHOT + 1.0.0-M12 jakarta.tck jar2shrinkwrap diff --git a/tools/tck-rewrite-ant/pom.xml b/tools/tck-rewrite-ant/pom.xml index cc7ffa34a..00274182c 100644 --- a/tools/tck-rewrite-ant/pom.xml +++ b/tools/tck-rewrite-ant/pom.xml @@ -12,7 +12,7 @@ jakarta.tck tck-rewrite-ant - 1.0.0-SNAPSHOT + 1.0.0-M12 17 diff --git a/tools/tck-rewrite/pom.xml b/tools/tck-rewrite/pom.xml index 3d208e347..a29a7806f 100644 --- a/tools/tck-rewrite/pom.xml +++ b/tools/tck-rewrite/pom.xml @@ -13,7 +13,7 @@ jakarta.tck tck-rewrite-tools - 1.0.0-SNAPSHOT + 1.0.0-M12 17