(tomcat-tck) 03/03: Updates after TCK was moved to JSP project

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-tck.git

commit 9834238785170fba5dbe0ba53471c2b42b13fd1a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 29 16:50:21 2024 +0000

    Updates after TCK was moved to JSP project
---
 jsp-tck/pom.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
index ed5df5a..79ae323 100644
--- a/jsp-tck/pom.xml
+++ b/jsp-tck/pom.xml
@@ -54,9 +54,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>common</artifactId>
-            <version>${tck.common.version}</version>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jsp-api</artifactId>
+            <version>${tomcat.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.container</groupId>
@@ -89,6 +90,10 @@
             <artifactId>junit</artifactId>
             <version>4.13.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -105,6 +110,7 @@
                         </goals>
                         <configuration>
                             
<dependenciesToScan>jakarta.tck:jakarta-pages-tck</dependenciesToScan>
+                            <forkCount>5</forkCount>
                             <reuseForks>false</reuseForks>
                             <systemPropertyVariables>
                                 <webServerHost>localhost</webServerHost>
@@ -112,8 +118,8 @@
                                 
<securedWebServicePort>8443</securedWebServicePort>
                                 <ws_wait>5</ws_wait>
                                 <junit.log.traceflag>true</junit.log.traceflag>
-                                
<porting.ts.url.class.1>com.sun.ts.tests.jsp.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
-                                
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-jsp-api/${tomcat.version}/tomcat-jsp-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-el-api/11.0.0-M18-SNAPSHOT/tomcat-el-api-11.0.0-M18-SNAPSHOT.jar:${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/11.0.0-M18-SNAPSHOT/tomcat-servlet-api-11.0.0-M18-SNAPSHOT.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
+                                
<porting.ts.url.class.1>ee.jakarta.tck.pages.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
+                                
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-jsp-api/${tomcat.version}/tomcat-jsp-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-el-api/${tomcat.version}/tomcat-el-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/${tomcat.version}/tomcat-servlet-api-${tomcat.version}.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
                             </systemPropertyVariables>
                         </configuration>
                     </execution>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org