Update the signature test generation plugin and the signature test file to match the current signatures. Signed-off-by: James R. Perkins <jperkins@redhat.com>
diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index 425c134..1d7f2ed 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml
@@ -97,12 +97,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.netbeans.tools</groupId> - <artifactId>sigtest-maven-plugin</artifactId> - <version>1.4</version> - </dependency> - <!-- Test Dependencies --> <dependency> <groupId>org.junit.jupiter</groupId> @@ -147,9 +141,9 @@ <build> <plugins> <plugin> - <groupId>org.netbeans.tools</groupId> + <groupId>jakarta.tck</groupId> <artifactId>sigtest-maven-plugin</artifactId> - <version>1.4</version> + <version>2.2</version> <executions> <execution> <goals> @@ -158,10 +152,16 @@ </execution> </executions> <configuration> - <FileName>${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version}</FileName> + <sigfile>${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version}</sigfile> <packages> - 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 </packages> + <attach>false</attach> </configuration> </plugin> </plugins>
diff --git a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_4.0.0 b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_4.0.0 index 6995893..db05c75 100644 --- a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_4.0.0 +++ b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_4.0.0
@@ -507,6 +507,7 @@ 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<java.lang.String>) 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 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<java.lang.String>) 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<java.lang.String>) 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 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<java.lang.String>) 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.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.lang.Class<?>,java.util.Collection<java.lang.Class<?>>> register(java.lang.Class<?>,java.lang.Class<?>[]) @@ -767,6 +773,7 @@ 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<java.lang.String>) 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 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<java.lang.String>) 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<java.lang.String>) 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 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<java.lang.String>) 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 @@ -857,6 +867,8 @@ 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 @@ -1114,6 +1126,7 @@ 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<java.lang.String>) meth public abstract int getLength() meth public abstract jakarta.ws.rs.core.MediaType getMediaType() meth public abstract jakarta.ws.rs.core.MultivaluedMap<java.lang.String,java.lang.String> getRequestHeaders() @@ -1124,6 +1137,7 @@ meth public abstract java.util.List<java.util.Locale> getAcceptableLanguages() meth public abstract java.util.Locale getLanguage() meth public abstract java.util.Map<java.lang.String,jakarta.ws.rs.core.Cookie> getCookies() +meth public boolean containsHeaderString(java.lang.String,java.util.function.Predicate<java.lang.String>) CLSS public abstract jakarta.ws.rs.core.Link cons public init() @@ -1199,6 +1213,7 @@ 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 +1228,7 @@ 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 +1652,8 @@ 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 +1757,10 @@ 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 +1817,7 @@ 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 +1840,8 @@ 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 +1874,10 @@ 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 +1886,7 @@ 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 @@ -1954,6 +1981,9 @@ 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() + 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<? extends {%%0},? extends {%%1}>[]) @@ -1996,3 +2026,4 @@ meth public {java.util.Map%1} merge({java.util.Map%0},{java.util.Map%1},java.util.function.BiFunction<? super {java.util.Map%1},? super {java.util.Map%1},? extends {java.util.Map%1}>) 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}) +