Merge pull request jakartaee#695 from KyleAure/690-update-sig-test-pl…

…ugin Upgrade to 2.3 signature test plugin
KyleAure · Apr 12, 2024 · 2a03371 · 2a03371
2 parents 5c29667 + 8825f3b
commit 2a03371
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+  ~ Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@
         <checkstyle.version>10.15.0</checkstyle.version>
         <checkstyle.excludes></checkstyle.excludes>
         <jacoco.maven.version>0.8.12</jacoco.maven.version>
-        <sigtest.version>2.2</sigtest.version> <!-- TODO update to 1.8 once this fix is added https://github.com/jtulach/netbeans-apitest/commit/72a3d3507202357589d77b293cb1e29349a0096e -->
+        <sigtest.version>2.3</sigtest.version>
         <sonar.jacoco.reportPath>../target/jacoco.exec</sonar.jacoco.reportPath>
         <sonar.maven.version>3.11.0.3922</sonar.maven.version>
     </properties>

diff --git a/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc b/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc
@@ -14,7 +14,9 @@
 :APIGitSite: https://github.com/jakartaee/data
 
 :TCKTestPlatform: JUnit5
-:SigPluginGAV: jakarta.tck:sigtest-maven-plugin:2.2
+:SigPluginVersion: 2.3
+:SigPluginGAV: jakarta.tck:sigtest-maven-plugin:{SigPluginVersion}
+
 
 :JavaVersion1: 17
 :JavaVersion2: 21

diff --git a/tck-dist/src/main/asciidoc/sections/04prereq.adoc b/tck-dist/src/main/asciidoc/sections/04prereq.adoc
@@ -13,7 +13,7 @@ Knowledge of how these frameworks operate and interact will help during the proj
 
 1. **Arquillian** - Version 1.7.0.Alpha13 or later - The {APILongName} TCK can run in EE Mode and it uses Arquillian to execute tests within an Arquillian "container" for certifying against an EE Platform. You must configure an https://arquillian.org/guides/developing_a_container_adapter/[Arquillian adapter] for your target runtime.
 2. **JUnit5** - Version 5.9.0 or later - The {APILongName} TCK uses JUnit5 as the entry-point for tests and deployments using Arquillian.
-3. **Signature Test Plugin** - Version 2.2 exactly -  The {APILongName} TCK uses the Signature Test Plugin to verify API signatures used by an implementation and those release by the specification match.
+3. **Signature Test Plugin** - Version {SigPluginVersion} exactly -  The {APILongName} TCK uses the Signature Test Plugin to verify API signatures used by an implementation and those release by the specification match.
 +
 No action is needed here, but we note that the signature files were built and should be validated with the plugin with group:artifact:version coordinates: **{SigPluginGAV}**, as used by the sample runner included in the TCK zip. 
 This is a more specific direction than in earlier releases of the platform TCK, in which it was left more open for the user to use a compatible tool.

diff --git a/tck-dist/src/main/starter/ee-pom.xml b/tck-dist/src/main/starter/ee-pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- ~ Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ ~ Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
  ~
  ~ This program and the accompanying materials are made available under the
  ~ terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,7 +37,7 @@
 
   <arquillian.version>1.7.0.Alpha13</arquillian.version>
   <junit.version>5.9.0</junit.version>
-  <sigtest.version>2.2</sigtest.version>
+  <sigtest.version>2.3</sigtest.version>
 
   <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
   <maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>

diff --git a/tck-dist/src/main/starter/se-pom.xml b/tck-dist/src/main/starter/se-pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- ~ Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ ~ Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
  ~
  ~ This program and the accompanying materials are made available under the
  ~ terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,7 +37,7 @@
 
   <arquillian.version>1.7.0.Alpha13</arquillian.version>
   <junit.version>5.9.0</junit.version>
-  <sigtest.version>2.2</sigtest.version>
+  <sigtest.version>2.3</sigtest.version>
 
   <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
   <maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>

diff --git a/...rc/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java b/...rc/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java
@@ -92,7 +92,7 @@ private static void appendSignaturePackages(final Archive<?> applicationArchive,
             ((ClassContainer<?>) applicationArchive).addPackage(signaturePackage);
 
             // Add the sigtest plugin library
-            File sigTestDep = Maven.resolver().resolve("jakarta.tck:sigtest-maven-plugin:2.2").withoutTransitivity().asSingleFile();
+            File sigTestDep = Maven.resolver().resolve("jakarta.tck:sigtest-maven-plugin:2.3").withoutTransitivity().asSingleFile();
             log.info("Application Archive [" + applicationName + "] is being appended with library " + sigTestDep.getName());
             ((LibraryContainer<?>) applicationArchive).addAsLibrary(sigTestDep);
 

diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/README.md b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/README.md
@@ -4,7 +4,7 @@ This package is inherited from the Platform-TCK (https://github.com/eclipse-ee4j
 
 The latest signature files are updated in the Jakarta Data TCK Repository 
 (data/tck/src/main/resources/ee/jakarta/tck/data/framework/signature) 
-generated using sigtest-maven-plugin.jar (version 2.2).
+generated using sigtest-maven-plugin.jar (version 2.3).
 
 The signature tests are run using the sigtest-maven-plugin.jar and the framework available in this folder.
 

diff --git a/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_17 b/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_17
@@ -186,23 +186,21 @@ meth public java.util.stream.Stream<{jakarta.data.page.Page%0}> stream()
 CLSS public abstract interface jakarta.data.page.PageRequest
 innr public abstract interface static Cursor
 innr public final static !enum Mode
-meth public abstract !varargs jakarta.data.page.PageRequest afterKey(java.lang.Object[])
-meth public abstract !varargs jakarta.data.page.PageRequest beforeKey(java.lang.Object[])
 meth public abstract boolean equals(java.lang.Object)
 meth public abstract boolean requestTotal()
 meth public abstract int size()
 meth public abstract jakarta.data.page.PageRequest afterCursor(jakarta.data.page.PageRequest$Cursor)
 meth public abstract jakarta.data.page.PageRequest beforeCursor(jakarta.data.page.PageRequest$Cursor)
-meth public abstract jakarta.data.page.PageRequest next()
-meth public abstract jakarta.data.page.PageRequest page(long)
-meth public abstract jakarta.data.page.PageRequest previous()
 meth public abstract jakarta.data.page.PageRequest size(int)
 meth public abstract jakarta.data.page.PageRequest withTotal()
 meth public abstract jakarta.data.page.PageRequest withoutTotal()
 meth public abstract jakarta.data.page.PageRequest$Mode mode()
 meth public abstract java.util.Optional<jakarta.data.page.PageRequest$Cursor> cursor()
 meth public abstract long page()
+meth public static jakarta.data.page.PageRequest afterCursor(jakarta.data.page.PageRequest$Cursor,long,int,boolean)
+meth public static jakarta.data.page.PageRequest beforeCursor(jakarta.data.page.PageRequest$Cursor,long,int,boolean)
 meth public static jakarta.data.page.PageRequest ofPage(long)
+meth public static jakarta.data.page.PageRequest ofPage(long,int,boolean)
 meth public static jakarta.data.page.PageRequest ofSize(int)
 
 CLSS public abstract interface static jakarta.data.page.PageRequest$Cursor

diff --git a/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_21 b/tck/src/main/resources/ee/jakarta/tck/data/framework/signature/jakarta.data.sig_21
@@ -186,23 +186,21 @@ meth public java.util.stream.Stream<{jakarta.data.page.Page%0}> stream()
 CLSS public abstract interface jakarta.data.page.PageRequest
 innr public abstract interface static Cursor
 innr public final static !enum Mode
-meth public abstract !varargs jakarta.data.page.PageRequest afterKey(java.lang.Object[])
-meth public abstract !varargs jakarta.data.page.PageRequest beforeKey(java.lang.Object[])
 meth public abstract boolean equals(java.lang.Object)
 meth public abstract boolean requestTotal()
 meth public abstract int size()
 meth public abstract jakarta.data.page.PageRequest afterCursor(jakarta.data.page.PageRequest$Cursor)
 meth public abstract jakarta.data.page.PageRequest beforeCursor(jakarta.data.page.PageRequest$Cursor)
-meth public abstract jakarta.data.page.PageRequest next()
-meth public abstract jakarta.data.page.PageRequest page(long)
-meth public abstract jakarta.data.page.PageRequest previous()
 meth public abstract jakarta.data.page.PageRequest size(int)
 meth public abstract jakarta.data.page.PageRequest withTotal()
 meth public abstract jakarta.data.page.PageRequest withoutTotal()
 meth public abstract jakarta.data.page.PageRequest$Mode mode()
 meth public abstract java.util.Optional<jakarta.data.page.PageRequest$Cursor> cursor()
 meth public abstract long page()
+meth public static jakarta.data.page.PageRequest afterCursor(jakarta.data.page.PageRequest$Cursor,long,int,boolean)
+meth public static jakarta.data.page.PageRequest beforeCursor(jakarta.data.page.PageRequest$Cursor,long,int,boolean)
 meth public static jakarta.data.page.PageRequest ofPage(long)
+meth public static jakarta.data.page.PageRequest ofPage(long,int,boolean)
 meth public static jakarta.data.page.PageRequest ofSize(int)
 
 CLSS public abstract interface static jakarta.data.page.PageRequest$Cursor