Modifications for the TCK run

Signed-off-by: jansupol <jan.supol@oracle.com>
eclipse-ee4j · Apr 10, 2024 · a4756fd · a4756fd
1 parent ff37183
commit a4756fd
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/tests/tck-test/pom.xml b/tests/tck-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.2.99-SNAPSHOT</version>
+        <version>2.2.0-M1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -40,11 +40,14 @@
         <tyrus.version>2.2.0-M1</tyrus.version> <!-- the public version that pass the tck -->
         <glassfish.container.version>8.0.0-M3</glassfish.container.version>
         <glassfish.home>${project.build.directory}/glassfish8</glassfish.home>
+        <modules.dir>${glassfish.home}/glassfish/modules</modules.dir>
         <jakarta.platform.version>10.0.0</jakarta.platform.version>
         <junit.jupiter.version>5.7.2</junit.jupiter.version>
         <jakarta.websocket.version>2.2.0</jakarta.websocket.version>
         <tck.artifactId>websocket-tck-spec-tests</tck.artifactId>
         <tck.version>2.2.0</tck.version>
+        <websocket-api.version>2.2.0</websocket-api.version>
+        <checkstyle.skip>true</checkstyle.skip>
     </properties>
 
     <dependencyManagement>
@@ -118,12 +121,6 @@
             <version>${tck.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>websocket-tck-spec-tests</artifactId>
-            <version>${tck.version}</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>jakarta.websocket</groupId>
@@ -161,21 +158,25 @@
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-container-servlet</artifactId>
+            <version>${tyrus.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-core</artifactId>
+            <version>${tyrus.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-container-grizzly-client</artifactId>
+            <version>${tyrus.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-container-jdk-client</artifactId>
+            <version>${tyrus.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -185,6 +186,12 @@
             <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.netbeans.tools</groupId>
+            <artifactId>sigtest-maven-plugin</artifactId>
+            <version>1.7</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -340,7 +347,7 @@
                                 <junit.log.traceflag>true</junit.log.traceflag>
                                 <porting.ts.url.class.1>com.sun.ts.tests.websocket.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
                                 <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
-                                <signature.sigTestClasspath>${glassfish.home}/glassfish/modules/jakarta.websocket-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
+                                <sigTestClasspath>${modules.dir}/jakarta.websocket-api.jar${path.separator}${modules.dir}/jakarta.websocket-client-api.jar${path.separator}${project.build.directory}/jdk11-bundle/java.base${path.separator}${project.build.directory}/jdk11-bundle/java.rmi${path.separator}${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
                             </systemPropertyVariables>
                             <environmentVariables>
                                 <GLASSFISH_HOME>${glassfish.home}</GLASSFISH_HOME>