From 555d9180d61119d67431fce4b0538540f4d517ca Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Wed, 2 Oct 2024 13:49:38 -0700
Subject: [PATCH] Rename the signature test file for core-profile/ca-sigtests
 to not have the -jdk11 suffix.

Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 core-profile-tck/ca-sigtest/pom.xml           | 14 +++++++---
 ...i-jdk11.sig => common-annotations-api.sig} | 27 ++++++++-----------
 core-profile-tck/pom.xml                      |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)
 rename core-profile-tck/ca-sigtest/src/main/resources/{common-annotations-api-jdk11.sig => common-annotations-api.sig} (92%)

diff --git a/core-profile-tck/ca-sigtest/pom.xml b/core-profile-tck/ca-sigtest/pom.xml
index 6b4ebd8cf5..7f6b29301e 100644
--- a/core-profile-tck/ca-sigtest/pom.xml
+++ b/core-profile-tck/ca-sigtest/pom.xml
@@ -23,6 +23,11 @@
     <name>Common Annotations Signature Gen for Core Profile TCK</name>
     <description>This module contains is run to generate the signature test file</description>
 
+    <properties>
+        <sigtest.file.name>common-annotations-api.sig</sigtest.file.name>
+        <sigtest.path>${project.basedir}/src/main/resources/${sigtest.file.name}</sigtest.path>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -47,9 +52,9 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>src/main/resources/common-annotations-api-jdk11.sig</file>
+                                    <file>${sigtest.path}</file>
                                     <type>sig</type>
-                                    <classifier>sigtest-jdk11</classifier>
+                                    <classifier>sigtest</classifier>
                                 </artifact>
                             </artifacts>
                         </configuration>
@@ -102,12 +107,13 @@
                         <groupId>jakarta.tck</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
                         <configuration>
-                            <classes>${project.build.directory}/ca-api</classes>
+                            <classes>${project.build.directory}/ca-api/</classes>
                             <packages>jakarta.annotation,
                 jakarta.annotation.security,
                 jakarta.annotation.sql</packages>
                             <attach>false</attach>
-                            <sigfile>${project.build.directory}/common-annotations-api-jdk11.sig</sigfile>
+                            <sigfile>${sigtest.path}</sigfile>
+                            <release>${maven.compiler.release}</release>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/core-profile-tck/ca-sigtest/src/main/resources/common-annotations-api-jdk11.sig b/core-profile-tck/ca-sigtest/src/main/resources/common-annotations-api.sig
similarity index 92%
rename from core-profile-tck/ca-sigtest/src/main/resources/common-annotations-api-jdk11.sig
rename to core-profile-tck/ca-sigtest/src/main/resources/common-annotations-api.sig
index f921fde9ce..1d8ae2d842 100644
--- a/core-profile-tck/ca-sigtest/src/main/resources/common-annotations-api-jdk11.sig
+++ b/core-profile-tck/ca-sigtest/src/main/resources/common-annotations-api.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 10.0.0-SNAPSHOT
+#Version 11.0.0-SNAPSHOT
 
 CLSS public abstract interface !annotation jakarta.annotation.Generated
  anno 0 java.lang.annotation.Documented()
@@ -10,13 +10,6 @@ meth public abstract !hasdefault java.lang.String comments()
 meth public abstract !hasdefault java.lang.String date()
 meth public abstract java.lang.String[] value()
 
-CLSS public abstract interface !annotation jakarta.annotation.ManagedBean
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="")
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String value()
-
 CLSS public abstract interface !annotation jakarta.annotation.Nonnull
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -74,6 +67,8 @@ CLSS public abstract interface !annotation jakarta.annotation.Resources
 intf java.lang.annotation.Annotation
 meth public abstract jakarta.annotation.Resource[] value()
 
+CLSS abstract interface jakarta.annotation.package-info
+
 CLSS public abstract interface !annotation jakarta.annotation.security.DeclareRoles
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -107,6 +102,8 @@ CLSS public abstract interface !annotation jakarta.annotation.security.RunAs
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
+CLSS abstract interface jakarta.annotation.security.package-info
+
 CLSS public abstract interface !annotation jakarta.annotation.sql.DataSourceDefinition
  anno 0 java.lang.annotation.Repeatable(java.lang.Class<? extends java.lang.annotation.Annotation> value=class jakarta.annotation.sql.DataSourceDefinitions)
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -142,18 +139,12 @@ CLSS public abstract interface java.io.Serializable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, MODULE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault boolean forRemoval()
-meth public abstract !hasdefault java.lang.String since()
-
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
+innr public final static EnumDesc
 intf java.io.Serializable
 intf java.lang.Comparable<{java.lang.Enum%0}>
+intf java.lang.constant.Constable
 meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
 meth protected final void finalize()
 meth public final boolean equals(java.lang.Object)
@@ -162,6 +153,7 @@ meth public final int hashCode()
 meth public final int ordinal()
 meth public final java.lang.Class<{java.lang.Enum%0}> getDeclaringClass()
 meth public final java.lang.String name()
+meth public final java.util.Optional<java.lang.Enum$EnumDesc<{java.lang.Enum%0}>> describeConstable()
 meth public java.lang.String toString()
 meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String)
 supr java.lang.Object
@@ -214,3 +206,6 @@ CLSS public abstract interface !annotation java.lang.annotation.Target
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.annotation.ElementType[] value()
 
+CLSS public abstract interface java.lang.constant.Constable
+meth public abstract java.util.Optional<? extends java.lang.constant.ConstantDesc> describeConstable()
+
diff --git a/core-profile-tck/pom.xml b/core-profile-tck/pom.xml
index 402383e73a..c467c7028d 100644
--- a/core-profile-tck/pom.xml
+++ b/core-profile-tck/pom.xml
@@ -91,7 +91,7 @@
         <jsonb.api.version>3.0.0</jsonb.api.version>
         <jsonp.api.version>2.1.0</jsonp.api.version>
         <junit.version>5.8.2</junit.version>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
         <rest.api.version>3.1.0</rest.api.version>
         <rest.tck.version>3.1.1</rest.tck.version>