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 1beb5f6 Add the Jakarta Annotations TCK 3.0.0
1beb5f6 is described below
commit 1beb5f6e7ef5a11bde636f29b1ad61e1146c69e1
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 22 20:37:36 2024 +0100
Add the Jakarta Annotations TCK 3.0.0
---
README.md | 8 +++-
annotations-tck/pom.xml | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
download/pom.xml | 23 ++++++++++++
pom.xml | 2 +
4 files changed, 131 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6391e0d..95ac6cf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,13 @@
This is a Maven project that can be used to run the refactored TCK (Jakarta 11
onwards) with Tomcat 11.
-At the moment, you will need to manually install the TCKs into your local
Maven repository (see below).
+### Running the Annotations TCK
+
+1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and
edit as required.
+
+1. `cd $TOMCAT_TCK\annotations-tck`
+
+1. `mvn verify`
### Running the EL TCK
diff --git a/annotations-tck/pom.xml b/annotations-tck/pom.xml
new file mode 100644
index 0000000..945cd87
--- /dev/null
+++ b/annotations-tck/pom.xml
@@ -0,0 +1,99 @@
+<?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>annotations-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.annotation</groupId>
+ <artifactId>jakarta-annotations-tck</artifactId>
+ <version>${tck.annotations.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.annotations</groupId>
+ <artifactId>jakarta.annotations-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.tck</groupId>
+ <artifactId>sigtest-maven-plugin</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.netbeans.tools</groupId>
+ <artifactId>ct-sym</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>${tomcat.version}</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.annotation:jakarta-annotations-tck</dependenciesToScan>
+ <systemPropertyVariables>
+ <junit.log.traceflag>true</junit.log.traceflag>
+
<jimage.dir>${project.build.directory}/jimage</jimage.dir>
+
<sigTestClasspath>${settings.localRepository}/org/apache/tomcat/tomcat-annotations-api/${tomcat.version}/tomcat-annotations-api-${tomcat.version}.jar${path.separator}${project.build.directory}/jimage/java.base</sigTestClasspath>
+ <ca.sig.generated>true</ca.sig.generated>
+
<ca.sig.postconstruct>true</ca.sig.postconstruct>
+ <ca.sig.priority>true</ca.sig.priority>
+ <ca.sig.predestroy>true</ca.sig.predestroy>
+ <ca.sig.resource>true</ca.sig.resource>
+ <ca.sig.resources>true</ca.sig.resources>
+
<ca.sig.securitydeclareroles>true</ca.sig.securitydeclareroles>
+
<ca.sig.securitydenyall>true</ca.sig.securitydenyall>
+
<ca.sig.securitypermitall>true</ca.sig.securitypermitall>
+
<ca.sig.securityrolesallowed>true</ca.sig.securityrolesallowed>
+
<ca.sig.securityrunas>true</ca.sig.securityrunas>
+
<ca.sig.sqldatasourcedefinition>true</ca.sig.sqldatasourcedefinition>
+
<ca.sig.sqldatasourcedefinitions>true</ca.sig.sqldatasourcedefinitions>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/download/pom.xml b/download/pom.xml
index 8825802..bedc40b 100644
--- a/download/pom.xml
+++ b/download/pom.xml
@@ -35,6 +35,19 @@
<artifactId>download-maven-plugin</artifactId>
<version>${download.maven.plugin.version}</version>
<executions>
+ <execution>
+ <id>download-annotations-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://download.eclipse.org/jakartaee/annotations/3.0/jakarta-annotations-tck-${tck.annotations.version}.zip</url>
+ <unpack>true</unpack>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+
<sha256>9421c6ca66274d32dfb408848f75a42d57f120599fe0d8403c5c5c1141d5ac4d</sha256>
+ </configuration>
+ </execution>
<execution>
<id>download-el-tck</id>
<phase>pre-integration-test</phase>
@@ -111,6 +124,16 @@
<artifactId>maven-install-plugin</artifactId>
<version>${maven.install.plugin.version}</version>
<executions>
+ <execution>
+ <id>install-annotations-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/annotations-tck/artifacts/jakarta-annotations-tck-${tck.annotations.version}.jar</file>
+ </configuration>
+ </execution>
<execution>
<id>install-el-tck</id>
<phase>pre-integration-test</phase>
diff --git a/pom.xml b/pom.xml
index 1d37105..383d533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
<fork.count>4</fork.count>
<!-- TCK versions to test against -->
+ <tck.annotations.version>3.0.0</tck.annotations.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>
@@ -76,6 +77,7 @@
<modules>
<module>download</module>
+ <module>annotations-tck</module>
<module>el-tck</module>
<module>jsp-tck</module>
<module>servlet-tck</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
