More glassfish changes

Prepare for a 1.0.0-M12 release Signed-off-by: Scott M Stark <starksm64@gmail.com>
eclipse-ee4j · Aug 29, 2024 · 62eef78 · 62eef78
1 parent 16b9c32
commit 62eef78
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/arquillian/appclient/pom.xml b/arquillian/appclient/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>jakarta.tck</groupId>
     <artifactId>tck.arquillian.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/arquillian/common/pom.xml b/arquillian/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>jakarta.tck</groupId>
     <artifactId>tck.arquillian.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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
@@ -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
@@ -5,7 +5,7 @@
   <parent>
     <groupId>jakarta.tck</groupId>
     <artifactId>tck.arquillian.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/arquillian/pom.xml b/arquillian/pom.xml
@@ -14,7 +14,7 @@
     <!-- Artifact Configuration -->
     <groupId>jakarta.tck</groupId>
     <artifactId>tck.arquillian.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <packaging>pom</packaging>
     <name>Arquillian Jakarta TCK Parent</name>
     <description>Protocols and testenrichers for Jakarta TCKs</description>

diff --git a/arquillian/porting-lib/pom.xml b/arquillian/porting-lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>jakarta.tck</groupId>
     <artifactId>tck.arquillian.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/arquillian/protocol-lib/pom.xml b/arquillian/protocol-lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>jakarta.tck</groupId>
     <artifactId>tck.arquillian.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -74,6 +74,7 @@
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <includes>**/*.class</includes>
+                  <excludes>**/connector/**,**/jms/**,**/vehicle/**,**/whitebox/**</excludes>
                 </artifactItem>
               </artifactItems>
             </configuration>

diff --git a/tools/jar2shrinkwrap/pom.xml b/tools/jar2shrinkwrap/pom.xml
@@ -10,7 +10,7 @@
         <version>1.0.9</version>
     </parent>
 
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
     <groupId>jakarta.tck</groupId>
     <artifactId>jar2shrinkwrap</artifactId>
 

diff --git a/tools/tck-rewrite-ant/pom.xml b/tools/tck-rewrite-ant/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>jakarta.tck</groupId>
     <artifactId>tck-rewrite-ant</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/tools/tck-rewrite/pom.xml b/tools/tck-rewrite/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>jakarta.tck</groupId>
     <artifactId>tck-rewrite-tools</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0-M12</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>