From 20d658996fc6bb2484af41bbb5d3f5b42b23d8bd Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Thu, 29 Feb 2024 22:49:54 +0100 Subject: [PATCH] update tck, fix sig tests Signed-off-by: Lukas Jungmann --- tck/docs/tck-runner/pom.xml | 87 ++-- tck/docs/userguide/pom.xml | 477 +++++++++--------- .../src/main/jbake/assets/_config.yml | 4 +- .../src/main/jbake/content/config.inc | 10 +- tck/pom.xml | 56 +- .../signaturetest/CAJSigTestIT.java | 6 +- 6 files changed, 332 insertions(+), 308 deletions(-) diff --git a/tck/docs/tck-runner/pom.xml b/tck/docs/tck-runner/pom.xml index 855f44c..968b9d4 100644 --- a/tck/docs/tck-runner/pom.xml +++ b/tck/docs/tck-runner/pom.xml @@ -5,29 +5,30 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at http://www.eclipse.org/legal/epl-2.0. - + This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception, which is available at https://www.gnu.org/software/classpath/license.html. - + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> 4.0.0 - - jakarta - glassfish.annotations-tck - 11.0.0 + + jakarta.annotation + jakarta.annotation-tck-impl + 3.0.0 jar 8.0.0-M1 glassfish7 - 5.9.1 + 5.10.2 jakarta-annotations-tck 3.0.0 + ${project.build.directory}/jdk-bundle @@ -39,6 +40,16 @@ pom import + + jakarta.tck + sigtest-maven-plugin + 2.2 + + + jakarta.annotation + ${tck.artifactId} + ${tck.version} + @@ -46,26 +57,37 @@ org.junit.jupiter junit-jupiter - ${junit.jupiter.version} - jakarta.tck + jakarta.annotation ${tck.artifactId} - ${tck.version} jakarta.tck sigtest-maven-plugin - 2.1 + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.2.5 + + + + org.apache.maven.plugins maven-dependency-plugin - 3.2.0 unpack @@ -76,7 +98,7 @@ - jakartatck + jakarta.annotation ${tck.artifactId} ${tck.version} zip @@ -86,16 +108,8 @@ - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - unpack + unpack-server unpack @@ -116,30 +130,9 @@ - - + org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M5 sig-test @@ -148,10 +141,10 @@ verify - jakarta.tck:${tck.artifactId} + jakarta.annotation:${tck.artifactId} - ${project.build.directory}/jdk11-bundle - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming + ${jimage.dir} + ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming true true true diff --git a/tck/docs/userguide/pom.xml b/tck/docs/userguide/pom.xml index 8186506..b777181 100644 --- a/tck/docs/userguide/pom.xml +++ b/tck/docs/userguide/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 - - org.eclipse.ee4j - project - 1.0.5 - - org.glassfish - tck_caj - pom - 3.0.0 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Annotations Release 3.0 + 4.0.0 + + org.eclipse.ee4j + project + 1.0.9 + + jakarta.annotations + jakarta.annotations-tck-ug + pom + 3.0.0 + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Annotations Release 3.0 - - UTF-8 - ${project.build.directory}/staging - true - 2.5.6 - 2.2.1 - 2.2.4 - 1.6.2 - 2.7.0-rc.7 - 2.3.30 - - - Common-Annotations-TCK-Users-Guide.pdf - true - + + UTF-8 + ${project.build.directory}/staging + true + 2.5.11 + 2.3.0 + 3.0.0 + 2.3.13 + 2.7.0-rc.7 + 2.3.32 + + + Jakarta-Annotations-TCK-Users-Guide.pdf + true + - - - scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git - - + + + scm:git:git@github.com:jakartaee/common-annotations-api.git + + - - package - - - org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [17,) - You need JDK17 or newer - - - - - - - - org.glassfish.doc - glassfish-doc-maven-plugin - - - generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - - - - generate-book - generate-resources - - book - - - - - - org.jbake - jbake-maven-plugin - - ${site.output.dir} - - ${status} - - - - - build-site - generate-resources - - generate - - - - - - org.asciidoctor - asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - - - - generate-pdf-doc - generate-resources - - process-asciidoc - - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - + + scm:git:https://github.com/jakartaee/common-annotations-api.git + scm:git:git@github.com:jakartaee/common-annotations-api.git + https://github.com/jakartaee/common-annotations-api + HEAD + - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - - + + package + + + org.apache.maven.plugins + maven-clean-plugin + + + + src/main/jbake/content + + toc.adoc + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + [17,) + You need JDK17 or newer + + + + + + + + org.glassfish.doc + glassfish-doc-maven-plugin + + + generate-toc + generate-resources + + toc + + + + [A-C0-9]+\s.*,Preface.*,Part\s.* + + + + + generate-book + generate-resources + + book + + + + + + org.jbake + jbake-maven-plugin + + ${site.output.dir} + + ${status} + + + + + build-site + generate-resources + + generate + + + + + + org.asciidoctor + asciidoctor-maven-plugin + + ${project.build.directory}/book + book.adoc + + ${project.build.directory}/staging/ + pdf + ${doc.pdf} + + ${project.basedir}/src/theme + jakartaee + book + ${status} + + + font + + + font + true + + - + true + true + + + + + generate-pdf-doc + generate-resources + + process-asciidoc + + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + + + deploy-site + deploy + + publish-scm + + + gh-pages + false + Update site + + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.3.2 + + + org.glassfish.doc + glassfish-doc-maven-plugin + 1.3 + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + org.apache.maven.plugins + maven-assembly-plugin + 3.6.0 + + + org.apache.maven.plugins + maven-scm-publish-plugin + 3.2.1 + + + org.jbake + jbake-maven-plugin + ${jbake.maven.plugin.version} + + + org.asciidoctor + asciidoctorj + ${asciidoctorj.version} + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj.diagram.version} + + + org.freemarker + freemarker + ${freemarker.version} + + + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctorj.maven.plugin.version} + + + org.asciidoctor + asciidoctorj-pdf + ${asciidoctorj.pdf.version} + + + + + + diff --git a/tck/docs/userguide/src/main/jbake/assets/_config.yml b/tck/docs/userguide/src/main/jbake/assets/_config.yml index 606e072..9eebe62 100644 --- a/tck/docs/userguide/src/main/jbake/assets/_config.yml +++ b/tck/docs/userguide/src/main/jbake/assets/_config.yml @@ -5,8 +5,8 @@ description: [Jakarta EE Technology Compatibility Kit User's Guide for Jakarta A # sidebar links url links: - source: https://github.com/eclipse-ee4j/common-annotations-api - download: https://github.com/eclipse-ee4j/common-annotations-api/releases + source: https://github.com/jakartaee/common-annotations-api + download: https://github.com/jakartaee/common-annotations-api/releases #mailinglist: https://javaee.groups.io/g/tck_coa_v1_3 #javadocs: docs: https://jakarta.ee/specifications/annotations/3.0 diff --git a/tck/docs/userguide/src/main/jbake/content/config.inc b/tck/docs/userguide/src/main/jbake/content/config.inc index 3d9b3ba..d5e39b2 100644 --- a/tck/docs/userguide/src/main/jbake/content/config.inc +++ b/tck/docs/userguide/src/main/jbake/content/config.inc @@ -91,10 +91,10 @@ ca.sig.sqldatasourcedefinition=true #jakarta.annotation.sql.DataSourceDefinitions ca.sig.sqldatasourcedefinitions=true ---- -3. Set the below jars to the classpath +3. Set the below jars to the classpath a. JAR file for the {TechnologyShortName} {TechnologyVersion} API. + eg. `${web.home}/modules/jakarta.annotations-api.jar`. - b. JUnit 5 jars (5.9.1+) + b. JUnit 5 jars (5.10.2+) Maven cordinates : + [source,oac_no_warn] @@ -102,13 +102,13 @@ ca.sig.sqldatasourcedefinitions=true org.junit junit-bom - 5.9.1 + 5.10.2 pom import ---- + - c. sigtest-maven-plugin (2.1) to run the signature tests. + c. sigtest-maven-plugin (2.2) to run the signature tests. Maven cordinates : + [source,oac_no_warn] @@ -116,7 +116,7 @@ ca.sig.sqldatasourcedefinitions=true jakarta.tck sigtest-maven-plugin - 2.1 + 2.2 ---- diff --git a/tck/pom.xml b/tck/pom.xml index ce90fcb..fd57063 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -1,7 +1,7 @@