From 16d660e4fe6478dc741c9e81bfb82e9e0f90d22f Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Tue, 20 Feb 2024 18:41:33 -0800 Subject: [PATCH] Upgrade the sigtest-maven-plugin and the signature test file. Move the version to 3.2.0 for the signature tests. Signed-off-by: James R. Perkins --- jaxrs-tck/pom.xml | 24 ++++++------ ...s.rs.sig_3.1.0 => jakarta.ws.rs.sig_3.2.0} | 37 ++++++++++++++++++- .../tck/ws/rs/signaturetest/sig-test.map | 2 +- 3 files changed, 49 insertions(+), 14 deletions(-) rename jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/{jakarta.ws.rs.sig_3.1.0 => jakarta.ws.rs.sig_3.2.0} (98%) diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index 1fd7cdde9..1db683e52 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml @@ -38,7 +38,9 @@ jakarta.ws.rs jakarta.ws.rs-api - ${project.version} + + ${project.parent.version} + provided @@ -97,12 +99,6 @@ provided - - org.netbeans.tools - sigtest-maven-plugin - 1.4 - - org.junit.jupiter @@ -147,9 +143,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.4 + 2.1 @@ -158,10 +154,16 @@ - ${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version} - jakarta.ws.rs,jakarta.ws.rs.client,jakarta.ws.rs.core,jakarta.ws.rs.container,jakarta.ws.rs.ext,jakarta.ws.rs.sse + jakarta.ws.rs, + jakarta.ws.rs.client, + jakarta.ws.rs.core, + jakarta.ws.rs.container, + jakarta.ws.rs.ext, + jakarta.ws.rs.sse + false + ${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version} diff --git a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.1.0 b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.2.0 similarity index 98% rename from jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.1.0 rename to jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.2.0 index 9838fc9e4..5dd24c140 100644 --- a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.1.0 +++ b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.2.0 @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 3.1.0 +#Version 3.2.0 CLSS public abstract interface !annotation jakarta.ws.rs.ApplicationPath anno 0 java.lang.annotation.Documented() @@ -507,6 +507,7 @@ supr java.lang.Object hcls CreateErrorMessageAction CLSS public abstract interface jakarta.ws.rs.client.ClientRequestContext +meth public abstract boolean containsHeaderString(java.lang.String,java.lang.String,java.util.function.Predicate) meth public abstract boolean hasEntity() meth public abstract jakarta.ws.rs.client.Client getClient() meth public abstract jakarta.ws.rs.core.Configuration getConfiguration() @@ -536,12 +537,14 @@ meth public abstract void setEntityStream(java.io.OutputStream) meth public abstract void setMethod(java.lang.String) meth public abstract void setProperty(java.lang.String,java.lang.Object) meth public abstract void setUri(java.net.URI) +meth public boolean containsHeaderString(java.lang.String,java.util.function.Predicate) meth public boolean hasProperty(java.lang.String) CLSS public abstract interface jakarta.ws.rs.client.ClientRequestFilter meth public abstract void filter(jakarta.ws.rs.client.ClientRequestContext) throws java.io.IOException CLSS public abstract interface jakarta.ws.rs.client.ClientResponseContext +meth public abstract boolean containsHeaderString(java.lang.String,java.lang.String,java.util.function.Predicate) meth public abstract boolean hasEntity() meth public abstract boolean hasLink(java.lang.String) meth public abstract int getLength() @@ -564,6 +567,7 @@ meth public abstract java.util.Set getAllowedMethods() meth public abstract void setEntityStream(java.io.InputStream) meth public abstract void setStatus(int) meth public abstract void setStatusInfo(jakarta.ws.rs.core.Response$StatusType) +meth public boolean containsHeaderString(java.lang.String,java.util.function.Predicate) CLSS public abstract interface jakarta.ws.rs.client.ClientResponseFilter meth public abstract void filter(jakarta.ws.rs.client.ClientRequestContext,jakarta.ws.rs.client.ClientResponseContext) throws java.io.IOException @@ -743,6 +747,8 @@ meth public abstract jakarta.ws.rs.client.WebTarget resolveTemplatesFromEncoded( meth public abstract jakarta.ws.rs.core.UriBuilder getUriBuilder() meth public abstract java.net.URI getUri() +CLSS abstract interface jakarta.ws.rs.client.package-info + CLSS public abstract interface jakarta.ws.rs.container.AsyncResponse fld public final static long NO_TIMEOUT = 0 meth public abstract !varargs java.util.Map,java.util.Collection>> register(java.lang.Class,java.lang.Class[]) @@ -767,6 +773,7 @@ CLSS public abstract interface jakarta.ws.rs.container.ConnectionCallback meth public abstract void onDisconnect(jakarta.ws.rs.container.AsyncResponse) CLSS public abstract interface jakarta.ws.rs.container.ContainerRequestContext +meth public abstract boolean containsHeaderString(java.lang.String,java.lang.String,java.util.function.Predicate) meth public abstract boolean hasEntity() meth public abstract int getLength() meth public abstract jakarta.ws.rs.core.MediaType getMediaType() @@ -792,12 +799,14 @@ meth public abstract void setProperty(java.lang.String,java.lang.Object) meth public abstract void setRequestUri(java.net.URI) meth public abstract void setRequestUri(java.net.URI,java.net.URI) meth public abstract void setSecurityContext(jakarta.ws.rs.core.SecurityContext) +meth public boolean containsHeaderString(java.lang.String,java.util.function.Predicate) meth public boolean hasProperty(java.lang.String) CLSS public abstract interface jakarta.ws.rs.container.ContainerRequestFilter meth public abstract void filter(jakarta.ws.rs.container.ContainerRequestContext) throws java.io.IOException CLSS public abstract interface jakarta.ws.rs.container.ContainerResponseContext +meth public abstract boolean containsHeaderString(java.lang.String,java.lang.String,java.util.function.Predicate) meth public abstract boolean hasEntity() meth public abstract boolean hasLink(java.lang.String) meth public abstract int getLength() @@ -827,6 +836,7 @@ meth public abstract void setEntity(java.lang.Object,java.lang.annotation.Annota meth public abstract void setEntityStream(java.io.OutputStream) meth public abstract void setStatus(int) meth public abstract void setStatusInfo(jakarta.ws.rs.core.Response$StatusType) +meth public boolean containsHeaderString(java.lang.String,java.util.function.Predicate) CLSS public abstract interface jakarta.ws.rs.container.ContainerResponseFilter meth public abstract void filter(jakarta.ws.rs.container.ContainerRequestContext,jakarta.ws.rs.container.ContainerResponseContext) throws java.io.IOException @@ -849,6 +859,7 @@ meth public abstract java.lang.Class getResourceClass() meth public abstract java.lang.reflect.Method getResourceMethod() CLSS public abstract interface !annotation jakarta.ws.rs.container.Suspended + anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="") 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=[PARAMETER]) @@ -857,6 +868,8 @@ intf java.lang.annotation.Annotation CLSS public abstract interface jakarta.ws.rs.container.TimeoutHandler meth public abstract void handleTimeout(jakarta.ws.rs.container.AsyncResponse) +CLSS abstract interface jakarta.ws.rs.container.package-info + CLSS public abstract jakarta.ws.rs.core.AbstractMultivaluedMap<%0 extends java.lang.Object, %1 extends java.lang.Object> cons public init(java.util.Map<{jakarta.ws.rs.core.AbstractMultivaluedMap%0},java.util.List<{jakarta.ws.rs.core.AbstractMultivaluedMap%1}>>) fld protected final java.util.Map<{jakarta.ws.rs.core.AbstractMultivaluedMap%0},java.util.List<{jakarta.ws.rs.core.AbstractMultivaluedMap%1}>> store @@ -954,6 +967,7 @@ meth public abstract java.util.Set getInstances() meth public boolean hasProperty(java.lang.String) CLSS public abstract interface !annotation jakarta.ws.rs.core.Context + anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="") 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=[PARAMETER, METHOD, FIELD]) @@ -1114,6 +1128,7 @@ fld public final static java.lang.String SET_COOKIE = "Set-Cookie" fld public final static java.lang.String USER_AGENT = "User-Agent" fld public final static java.lang.String VARY = "Vary" fld public final static java.lang.String WWW_AUTHENTICATE = "WWW-Authenticate" +meth public abstract boolean containsHeaderString(java.lang.String,java.lang.String,java.util.function.Predicate) meth public abstract int getLength() meth public abstract jakarta.ws.rs.core.MediaType getMediaType() meth public abstract jakarta.ws.rs.core.MultivaluedMap getRequestHeaders() @@ -1124,6 +1139,7 @@ meth public abstract java.util.List getRequestHeader(java.lang meth public abstract java.util.List getAcceptableLanguages() meth public abstract java.util.Locale getLanguage() meth public abstract java.util.Map getCookies() +meth public boolean containsHeaderString(java.lang.String,java.util.function.Predicate) CLSS public abstract jakarta.ws.rs.core.Link cons public init() @@ -1199,6 +1215,7 @@ fld public final static jakarta.ws.rs.core.MediaType APPLICATION_JSON_PATCH_JSON fld public final static jakarta.ws.rs.core.MediaType APPLICATION_JSON_TYPE fld public final static jakarta.ws.rs.core.MediaType APPLICATION_OCTET_STREAM_TYPE fld public final static jakarta.ws.rs.core.MediaType APPLICATION_SVG_XML_TYPE + anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="") fld public final static jakarta.ws.rs.core.MediaType APPLICATION_XHTML_XML_TYPE fld public final static jakarta.ws.rs.core.MediaType APPLICATION_XML_TYPE fld public final static jakarta.ws.rs.core.MediaType MULTIPART_FORM_DATA_TYPE @@ -1213,6 +1230,7 @@ fld public final static java.lang.String APPLICATION_JSON = "application/json" fld public final static java.lang.String APPLICATION_JSON_PATCH_JSON = "application/json-patch+json" fld public final static java.lang.String APPLICATION_OCTET_STREAM = "application/octet-stream" fld public final static java.lang.String APPLICATION_SVG_XML = "application/svg+xml" + anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="") fld public final static java.lang.String APPLICATION_XHTML_XML = "application/xhtml+xml" fld public final static java.lang.String APPLICATION_XML = "application/xml" fld public final static java.lang.String CHARSET_PARAMETER = "charset" @@ -1636,6 +1654,8 @@ meth public abstract java.util.List build() meth public static jakarta.ws.rs.core.Variant$VariantListBuilder newInstance() supr java.lang.Object +CLSS abstract interface jakarta.ws.rs.core.package-info + CLSS public abstract interface jakarta.ws.rs.ext.ContextResolver<%0 extends java.lang.Object> meth public abstract {jakarta.ws.rs.ext.ContextResolver%0} getContext(java.lang.Class) @@ -1739,6 +1759,10 @@ meth public abstract void proceed() throws java.io.IOException meth public abstract void setEntity(java.lang.Object) meth public abstract void setOutputStream(java.io.OutputStream) +CLSS abstract interface jakarta.ws.rs.ext.package-info + +CLSS abstract interface jakarta.ws.rs.package-info + CLSS public abstract interface jakarta.ws.rs.sse.InboundSseEvent intf jakarta.ws.rs.sse.SseEvent meth public abstract <%0 extends java.lang.Object> {%%0} readData(jakarta.ws.rs.core.GenericType<{%%0}>) @@ -1795,7 +1819,7 @@ CLSS public abstract interface jakarta.ws.rs.sse.SseEventSink intf java.lang.AutoCloseable meth public abstract boolean isClosed() meth public abstract java.util.concurrent.CompletionStage send(jakarta.ws.rs.sse.OutboundSseEvent) -meth public abstract void close() +meth public abstract void close() throws java.io.IOException CLSS public abstract interface jakarta.ws.rs.sse.SseEventSource innr public abstract static Builder @@ -1818,6 +1842,8 @@ meth public abstract jakarta.ws.rs.sse.SseEventSource build() meth public abstract jakarta.ws.rs.sse.SseEventSource$Builder reconnectingEvery(long,java.util.concurrent.TimeUnit) supr java.lang.Object +CLSS abstract interface jakarta.ws.rs.sse.package-info + CLSS public abstract jakarta.xml.bind.annotation.adapters.XmlAdapter<%0 extends java.lang.Object, %1 extends java.lang.Object> cons protected init() meth public abstract {jakarta.xml.bind.annotation.adapters.XmlAdapter%0} marshal({jakarta.xml.bind.annotation.adapters.XmlAdapter%1}) throws java.lang.Exception @@ -1850,8 +1876,10 @@ 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) @@ -1860,6 +1888,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> 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 @@ -1954,6 +1983,9 @@ 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 describeConstable() + CLSS public abstract interface java.util.Map<%0 extends java.lang.Object, %1 extends java.lang.Object> innr public abstract interface static Entry meth public !varargs static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> ofEntries(java.util.Map$Entry[]) @@ -1996,3 +2028,4 @@ meth public {java.util.Map%1} getOrDefault(java.lang.Object,{java.util.Map%1}) meth public {java.util.Map%1} merge({java.util.Map%0},{java.util.Map%1},java.util.function.BiFunction) meth public {java.util.Map%1} putIfAbsent({java.util.Map%0},{java.util.Map%1}) meth public {java.util.Map%1} replace({java.util.Map%0},{java.util.Map%1}) + diff --git a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map index 895b2bed7..04b30da97 100644 --- a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map +++ b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map @@ -17,4 +17,4 @@ ############################################################### # The signature test mapping file for the JAX-RS TCK. ############################################################### -jakarta.ws.rs=3.1.0 +jakarta.ws.rs=3.2.0