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 4b8976523a11e98697b9a99401e4eb39c48904ac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 22 13:44:01 2024 +0100
The signature test requires the modules to be extracted from the image
---
el-tck/pom.xml | 3 ++-
jsp-tck/pom.xml | 3 ++-
servlet-tck/pom.xml | 3 ++-
websocket-tck/pom.xml | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/el-tck/pom.xml b/el-tck/pom.xml
index f57fb63..ba88f1b 100644
--- a/el-tck/pom.xml
+++ b/el-tck/pom.xml
@@ -78,8 +78,9 @@
<systemPropertyVariables>
<variable.mapper>org.apache.el.lang.VariableMapperImpl</variable.mapper>
<junit.log.traceflag>true</junit.log.traceflag>
+
<jimage.dir>${project.build.directory}/jimage</jimage.dir>
<!-- Use this signature test classpath with
the Tomcat provided EL API -->
-
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-el-api/${tomcat.version}/tomcat-el-api-${tomcat.version}.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
+
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-el-api/${tomcat.version}/tomcat-el-api-${tomcat.version}.jar:${project.build.directory}/jimage/java.base</sigTestClasspath>
<!-- Use this signature test classpath with
the Jakarta provided EL API -->
<!--
<sigTestClasspath>${settings.localRepository}/jakarta/el/jakarta.el-api/${api.el.version}/jakarta.el-api-${api.el.version}.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
index fb1a542..bcb5171 100644
--- a/jsp-tck/pom.xml
+++ b/jsp-tck/pom.xml
@@ -119,7 +119,8 @@
<ws_wait>5</ws_wait>
<junit.log.traceflag>true</junit.log.traceflag>
<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>
+
<jimage.dir>${project.build.directory}/jimage</jimage.dir>
+
<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:${project.build.directory}/jimage/java.base</sigTestClasspath>
<user>j2ee</user>
<password>j2ee</password>
<authuser>javajoe</authuser>
diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml
index c49cf20..825ff6e 100644
--- a/servlet-tck/pom.xml
+++ b/servlet-tck/pom.xml
@@ -121,7 +121,8 @@
<junit.log.traceflag>true</junit.log.traceflag>
<servlet.tck.support.http2Push>false</servlet.tck.support.http2Push>
<arquillian.launch>http</arquillian.launch>
-
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/${tomcat.version}/tomcat-servlet-api-${tomcat.version}.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
+
<jimage.dir>${project.build.directory}/jimage</jimage.dir>
+
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/${tomcat.version}/tomcat-servlet-api-${tomcat.version}.jar:${project.build.directory}/jimage/java.base</sigTestClasspath>
</systemPropertyVariables>
<summaryFile>target/failsafe-reports/failsafe-summary-http.xml</summaryFile>
</configuration>
diff --git a/websocket-tck/pom.xml b/websocket-tck/pom.xml
index 29ac13b..e6b2356 100644
--- a/websocket-tck/pom.xml
+++ b/websocket-tck/pom.xml
@@ -137,7 +137,8 @@
<password>j2ee</password>
<porting.ts.url.class.1>com.sun.ts.tests.websocket.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
<org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD>0</org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD>
-
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/embed/tomcat-embed-websocket/${tomcat.version}/tomcat-embed-websocket-${tomcat.version}.jar:${env.JAVA_HOME}/jmods/java.base</sigTestClasspath>
+
<jimage.dir>${project.build.directory}/jimage</jimage.dir>
+
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/embed/tomcat-embed-websocket/${tomcat.version}/tomcat-embed-websocket-${tomcat.version}.jar:${project.build.directory}/jimage/java.base</sigTestClasspath>
</systemPropertyVariables>
<summaryFile>target/failsafe-reports/failsafe-summary-http.xml</summaryFile>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
