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
The following commit(s) were added to refs/heads/main by this push: new d315c80 Get the EL signature tests passing d315c80 is described below commit d315c803ba197e356179351cd2d35182ac86d67e Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Feb 21 13:07:42 2024 +0000 Get the EL signature tests passing --- el-tck/pom.xml | 12 +++++++++--- pom.xml | 16 +++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/el-tck/pom.xml b/el-tck/pom.xml index d6e5fc0..a644a3b 100644 --- a/el-tck/pom.xml +++ b/el-tck/pom.xml @@ -34,7 +34,7 @@ <artifactId>jakarta-expression-language-tck</artifactId> <version>${tck.el.version}</version> <!-- - Exclude this API package if you want to run the TCK with the EL API provided by Tomcat. + Exclude this API package if you want to run the TCK with the Tomcat provided EL API. --> <exclusions> <exclusion> @@ -48,7 +48,7 @@ <artifactId>tomcat-jasper-el</artifactId> <version>${tomcat.version}</version> <!-- - Exclude this API package if you want to run the TCK with the EL API provided by Jakarta. + Exclude this API package if you want to run the TCK with the Jakarta provided EL API. --> <!-- <exclusions> @@ -72,10 +72,16 @@ <goal>verify</goal> </goals> <configuration> - <dependenciesToScan>jakartatck:jakarta-expression-language-tck</dependenciesToScan> + <dependenciesToScan>jakartatck:jakarta-expression-language-tck</dependenciesToScan> <systemPropertyVariables> <variable.mapper>org.apache.el.lang.VariableMapperImpl</variable.mapper> <junit.log.traceflag>true</junit.log.traceflag> + <!-- 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> + <!-- Use this signature test classpath with the Tomcat 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> + --> </systemPropertyVariables> </configuration> </execution> diff --git a/pom.xml b/pom.xml index 6336c6c..d80181a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,21 @@ <packaging>pom</packaging> <properties> - <maven.compiler.source>21</maven.compiler.source> - <maven.compiler.target>21</maven.compiler.target> - + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> + + <!-- Tomcat version to test --> <tomcat.version>11.0.0-M18-SNAPSHOT</tomcat.version> - + + <!-- TCK versions to test against --> <tck.el.version>6.0.0-SNAPSHOT</tck.el.version> + <api.el.version>6.0.0-SNAPSHOT</api.el.version> <tck.websocket.version>10.0.0-SNAPSHOT</tck.websocket.version> - + + <!-- TCK dependency versions --> <tck.common.version>10.0.0-SNAPSHOT</tck.common.version> - <arquillian.version>1.8.0.Final</arquillian.version> <arquillian.tomcat.version>1.2.0.Final</arquillian.tomcat.version> - <junit.jupiter.version>5.7.2</junit.jupiter.version> </properties> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org