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 5d9fac152c928971ec36c31465ac1834e5b0b756
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jul 19 20:59:33 2024 +0100
Add new module to download TCKs plus a few version updates
---
README.md | 55 --------------
download/pom.xml | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++
jsp-tck/pom.xml | 4 +-
pom.xml | 14 +++-
servlet-tck/pom.xml | 6 +-
websocket-tck/pom.xml | 2 +-
6 files changed, 210 insertions(+), 64 deletions(-)
diff --git a/README.md b/README.md
index 9d1c979..6391e0d 100644
--- a/README.md
+++ b/README.md
@@ -37,58 +37,3 @@ At the moment, you will need to manually install the TCKs
into your local Maven
1. `cd $TOMCAT_TCK\jsp-tck`
1. `mvn verify`
-
-### Installing the TCKs
-
-#### Expression Language TCK
-
-1. Download the EL TCK from
https://download.eclipse.org/jakartaee/expression-language/6.0/jakarta-expression-language-tck-6.0.0.zip
-
-1. Extract the contents
-
-1. `cd el-tck/artifacts`
-
-1. Install the TCK JAR into the local Maven repository
- `mvn org.apache.Maven.plugins:Maven-install-plugin:3.1.1:install-file
-Dfile=jakarta-expression-language-tck-6.0.0.jar`
-
-1. Edit the POM created in your local Maven repository to update the version
for the parent (jakarta.tck:project) from 10.0.0-SNAPSHOT to 11.0.0-M1
-
-#### WebSocket TCK
-
-1. Download the WebSocket TCK from
https://download.eclipse.org/jakartaee/websocket/2.2/jakarta-websocket-tck-2.2.0.zip
-
-1. Extract the contents
-
-1. `cd websocket-tck/artifacts`
-
-1. Install the TCK JARs into the local Maven repository
- `artifact-install.sh`
-
-#### Pages TCK
-
-1. Download the Pages TCK from
https://download.eclipse.org/jakartaee/pages/4.0/jakarta-pages-tck-4.0.0.zip
-
-1. Extract the contents
-
-1. `cd pages-tck/artifacts`
-
-1. Install the TCK JARs into the local Maven repository
- `mvn org.apache.Maven.plugins:Maven-install-plugin:3.1.1:install-file
-Dfile=jakarta-pages-tck-4.0.0.jar`
-
-1. Check out the https://github.com/jakartaee/platform-tck repository
-
-1. `cd platform-tck\lib`
-
-1. Install the javatest JAR into the local Maven repository
- `mvn install:install-file -Dfile=javatest.jar -DgroupId=javatest
-DartifactId=javatest -Dversion=5.0 -Dpackaging=jar`
-
-#### Servlet TCK
-
-1. Download the Pages TCK from
https://download.eclipse.org/jakartaee/servlet/6.1/jakarta-servlet-tck-6.1.0.zip
-
-1. Extract the contents
-
-1. `cd servlet-tck/artifacts`
-
-1. Install the TCK JARs into the local Maven repository
- `artifact-install.sh`
diff --git a/download/pom.xml b/download/pom.xml
new file mode 100644
index 0000000..8862fed
--- /dev/null
+++ b/download/pom.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <artifactId>download</artifactId>
+ <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tck</artifactId>
+ <version>11.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>${download.maven.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>download-el-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <!-- Final location -->
+ <!--
+
<url>https://download.eclipse.org/jakartaee/expression-language/6.0/jakarta-expression-language-tck-${tck.el.version}.zip</url>
+ -->
+ <!-- Staging - remove this once the update is
published -->
+
<url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-expression-language-tck-6.0.1.zip</url>
+ <unpack>true</unpack>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+
<sha256>bd16049bb853e7e71b75feca9b37f0931f5619694551afc87389267a23ca324f</sha256>
+ </configuration>
+ </execution>
+ <execution>
+ <id>download-websocket-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://download.eclipse.org/jakartaee/websocket/2.2/jakarta-websocket-tck-${tck.websocket.version}.zip</url>
+ <unpack>true</unpack>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+
<sha256>ff50825305bd1318a4e6bdfab21b829cfd8cf89fab8a970f007b52636d3f2629</sha256>
+ </configuration>
+ </execution>
+ <execution>
+ <id>download-servlet-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://download.eclipse.org/jakartaee/servlet/6.1/jakarta-servlet-tck-${tck.servlet.version}.zip</url>
+ <unpack>true</unpack>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+
<sha256>1170697a87622a920bd50f0a68ed594c6efc5e17dd370566312194c4e12bec29</sha256>
+ </configuration>
+ </execution>
+ <execution>
+ <id>download-pages-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://download.eclipse.org/jakartaee/pages/4.0/jakarta-pages-tck-4.0.0.zip</url>
+ <unpack>true</unpack>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+
<sha256>5446aa866601a7c4c425f74054590cfc7f4fc05592a572d399ecc8694e265489</sha256>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>${maven.install.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install-el-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/el-tck/artifacts/jakarta-expression-language-tck-${tck.el.version}.jar</file>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-websocket-tck-pom</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-${tck.websocket.version}.pom</file>
+ <groupId>jakarta.tck</groupId>
+ <artifactId>websocket-tck</artifactId>
+ <version>${tck.websocket.version}</version>
+ <packaging>pom</packaging>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-websocket-tck-common</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-common-${tck.websocket.version}.jar</file>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-websocket-tck-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-spec-tests-${tck.websocket.version}.jar</file>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-servlet-tck-pom</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/servlet-tck/artifacts/servlet-tck-${tck.servlet.version}.pom</file>
+ <groupId>jakarta.tck</groupId>
+ <artifactId>servlet-tck</artifactId>
+ <version>${tck.servlet.version}</version>
+ <packaging>pom</packaging>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-servlet-tck-util</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/servlet-tck/artifacts/servlet-tck-util-${tck.servlet.version}.jar</file>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-servlet-tck-runtime</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/servlet-tck/artifacts/servlet-tck-runtime-${tck.servlet.version}.jar</file>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-pages-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/pages-tck/artifacts/jakarta-pages-tck-${tck.pages.version}.jar</file>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
index 91ba6e3..fb1a542 100644
--- a/jsp-tck/pom.xml
+++ b/jsp-tck/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>jakarta-pages-tck</artifactId>
- <version>${tck.jsp.version}</version>
+ <version>${tck.pages.version}</version>
<!-- Use the JSP API provided by Tomcat -->
<exclusions>
<exclusion>
@@ -110,7 +110,7 @@
</goals>
<configuration>
<dependenciesToScan>jakarta.tck:jakarta-pages-tck</dependenciesToScan>
- <forkCount>5</forkCount>
+ <forkCount>${fork.count}</forkCount>
<reuseForks>false</reuseForks>
<systemPropertyVariables>
<webServerHost>localhost</webServerHost>
diff --git a/pom.xml b/pom.xml
index 731bb54..ef282f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,16 @@
<maven.compiler.target>17</maven.compiler.target>
<!-- Tomcat version to test -->
- <tomcat.version>11.0.0-M21</tomcat.version>
+ <tomcat.version>11.0.0-M23-SNAPSHOT</tomcat.version>
+
+ <!-- Test run configuration -->
+ <fork.count>5</fork.count>
<!-- TCK versions to test against -->
- <tck.el.version>6.0.0</tck.el.version>
+ <tck.el.version>6.0.1</tck.el.version>
<api.el.version>6.0.0</api.el.version>
<tck.servlet.version>6.1.0</tck.servlet.version>
- <tck.jsp.version>4.0.0</tck.jsp.version>
+ <tck.pages.version>4.0.0</tck.pages.version>
<tck.websocket.version>2.2.0</tck.websocket.version>
<!-- TCK dependency versions -->
@@ -46,6 +49,10 @@
<arquillian.tomcat.version>1.2.0.Final</arquillian.tomcat.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<failsafe.plugin.version>3.2.5</failsafe.plugin.version>
+
+ <!-- Tomcat TCK project dependencies-->
+ <download.maven.plugin.version>1.9.0</download.maven.plugin.version>
+ <maven.install.plugin.version>3.1.2</maven.install.plugin.version>
</properties>
<repositories>
@@ -64,6 +71,7 @@
</repositories>
<modules>
+ <module>download</module>
<module>el-tck</module>
<module>jsp-tck</module>
<module>servlet-tck</module>
diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml
index 674ac2a..c49cf20 100644
--- a/servlet-tck/pom.xml
+++ b/servlet-tck/pom.xml
@@ -107,14 +107,14 @@
<configuration>
<dependenciesToScan>jakarta.tck:servlet-tck-runtime</dependenciesToScan>
<includes>
- <include>**/*Test.java</include>
- <include>**/*Tests.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
</includes>
<excludes>
<exclude>**/ClientCertTests.java</exclude>
<exclude>**/ClientCertAnnoTests.java</exclude>
</excludes>
- <forkCount>5</forkCount>
+ <forkCount>${fork.count}</forkCount>
<reuseForks>false</reuseForks>
<systemPropertyVariables>
<ws_wait>5</ws_wait>
diff --git a/websocket-tck/pom.xml b/websocket-tck/pom.xml
index b52459f..095a7c8 100644
--- a/websocket-tck/pom.xml
+++ b/websocket-tck/pom.xml
@@ -126,7 +126,7 @@
<dependency>jakarta.tck:websocket-tck-spec-tests</dependency>
<dependency>jakarta.tck:websocket-tck-platform-tests</dependency>
</dependenciesToScan>
- <forkCount>5</forkCount>
+ <forkCount>${fork.count}</forkCount>
<reuseForks>false</reuseForks>
<systemPropertyVariables>
<arquillian.launch>http</arquillian.launch>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
