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 ca80e510e3096d563736b106fbaf960bd84ea5be Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Feb 29 15:29:06 2024 +0000 First pass at adding JSP TCK --- README.md | 22 ++++++++++ jsp-tck/pom.xml | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+) diff --git a/README.md b/README.md index f687d65..e24ac46 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,22 @@ At the moment, you will need to build the TCK locally (see below). 1. `mvn verify` +### Running the Servlet TCK + +1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and edit as required. + +1. `cd $TOMCAT_TCK\servlet-tck` + +1. `mvn verify` + +### Running the JSP TCK + +1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and edit as required. + +1. `cd $TOMCAT_TCK\jsp-tck` + +1. `mvn verify` + ### Running against a local build of the TCK 1. Checkout the tckrefactor branch of the jakarta-tck repository to `$TCK` @@ -63,6 +79,12 @@ At the moment, you will need to build the TCK locally (see below). cd $TCK/el mvn install + cd $TCK/servlet + mvn install + + cd $TCK/jsp + mvn install + cd $TCK/websocket mvn install ``` diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml new file mode 100644 index 0000000..ed5df5a --- /dev/null +++ b/jsp-tck/pom.xml @@ -0,0 +1,124 @@ +<?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>jsp-tck</artifactId> + <packaging>jar</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> + + <dependencies> + <dependency> + <groupId>jakarta.tck</groupId> + <artifactId>jakarta-pages-tck</artifactId> + <version>${tck.jsp.version}</version> + <!-- Use the JSP API provided by Tomcat --> + <exclusions> + <exclusion> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.jsp-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper-el</artifactId> + <version>${tomcat.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-jasper</artifactId> + <version>${tomcat.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jakarta.tck</groupId> + <artifactId>common</artifactId> + <version>${tck.common.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-tomcat-embedded-10</artifactId> + <version>${arquillian.tomcat.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-container-spi</artifactId> + <version>${arquillian.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.test</groupId> + <artifactId>arquillian-test-api</artifactId> + <version>${arquillian.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-container</artifactId> + <version>${arquillian.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-core</artifactId> + <version>${arquillian.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.13.2</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${failsafe.plugin.version}</version> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <dependenciesToScan>jakarta.tck:jakarta-pages-tck</dependenciesToScan> + <reuseForks>false</reuseForks> + <systemPropertyVariables> + <webServerHost>localhost</webServerHost> + <webServerPort>8080</webServerPort> + <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> + </systemPropertyVariables> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org