From 4cf558b384525451d2d307545da337a0d197b57b Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Tue, 23 Jan 2024 12:38:54 -0800 Subject: [PATCH 01/13] Bump version to 4.0.0-SNAPSHOT Signed-off-by: James R. Perkins --- examples/pom.xml | 2 +- jaxrs-api/pom.xml | 4 ++-- jaxrs-spec/pom.xml | 2 +- .../src/main/asciidoc/chapters/introduction/_status.adoc | 4 ++-- jaxrs-tck-docs/tckbundle.sh | 2 +- jaxrs-tck-docs/userguide/pom.xml | 4 ++-- jaxrs-tck/pom.xml | 4 ++-- .../{jakarta.ws.rs.sig_3.1.0 => jakarta.ws.rs.sig_4.0.0} | 2 +- .../ee/jakarta/tck/ws/rs/signaturetest/sig-test.map | 2 +- jersey-tck/pom.xml | 6 +++--- pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) rename jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/{jakarta.ws.rs.sig_3.1.0 => jakarta.ws.rs.sig_4.0.0} (99%) diff --git a/examples/pom.xml b/examples/pom.xml index 62d5e2693..c8f2dfcc3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ jakarta.ws.rs all - 3.1.0 + 4.0.0-SNAPSHOT https://github.com/jax-rs/api diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml index af83d8591..7ba8ef49e 100644 --- a/jaxrs-api/pom.xml +++ b/jaxrs-api/pom.xml @@ -28,7 +28,7 @@ jakarta.ws.rs all - 3.1.0 + 4.0.0-SNAPSHOT https://github.com/jakartaee/rest @@ -395,7 +395,7 @@ jakarta.ws.rs UTF-8 false - 3.1 + 4.0 4.0.0 diff --git a/jaxrs-spec/pom.xml b/jaxrs-spec/pom.xml index 7395c62cb..712581543 100644 --- a/jaxrs-spec/pom.xml +++ b/jaxrs-spec/pom.xml @@ -27,7 +27,7 @@ jakarta.ws.rs all - 3.1.0 + 4.0.0-SNAPSHOT diff --git a/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc b/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc index f5eb9be8d..57139dcf2 100644 --- a/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc +++ b/jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc @@ -11,14 +11,14 @@ [[status]] === Status -This is the final release of version 3.1. The issue tracking system for +This is the final release of version 3.2. The issue tracking system for this release can be found at: https://github.com/jakartaee/rest/issues The corresponding Javadocs can be found online at: -https://jakarta.ee/specifications/restful-ws/3.1/apidocs/ +https://jakarta.ee/specifications/restful-ws/4.0/apidocs/ A compatible implementation can be obtained from: diff --git a/jaxrs-tck-docs/tckbundle.sh b/jaxrs-tck-docs/tckbundle.sh index b05559bf2..150dd6bc8 100644 --- a/jaxrs-tck-docs/tckbundle.sh +++ b/jaxrs-tck-docs/tckbundle.sh @@ -23,7 +23,7 @@ cd $WORKSPACE export VERSION="$2" if [ -z "$VERSION" ]; then - export VERSION="3.1.2" + export VERSION="4.0.0-SNAPSHOT" fi if [[ "$1" == "epl" || "$1" == "EPL" ]]; then diff --git a/jaxrs-tck-docs/userguide/pom.xml b/jaxrs-tck-docs/userguide/pom.xml index 7f7c9a9a9..7bad43231 100644 --- a/jaxrs-tck-docs/userguide/pom.xml +++ b/jaxrs-tck-docs/userguide/pom.xml @@ -27,8 +27,8 @@ org.glassfish tck_jaxrs pom - 3.1.2 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta RESTful Web Services for Jakarta EE, Release 3.1 + 4.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta RESTful Web Services for Jakarta EE, Release 4.0 UTF-8 diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index dc28fcc1b..92c048b19 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml @@ -26,12 +26,12 @@ Jakarta RESTful WS TCK Technology Compatibility Kit for Jakarta RESTful Web Services https://github.com/jakartaee/rest - 3.1.2 + 4.0.0-SNAPSHOT jakarta.ws.rs all - 3.1.0 + 4.0.0-SNAPSHOT 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_4.0.0 similarity index 99% 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_4.0.0 index 9838fc9e4..699589332 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_4.0.0 @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 3.1.0 +#Version 4.0.0 CLSS public abstract interface !annotation jakarta.ws.rs.ApplicationPath anno 0 java.lang.annotation.Documented() 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..2d862844d 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=4.0.0 diff --git a/jersey-tck/pom.xml b/jersey-tck/pom.xml index 5ab7e8b9b..3a1575437 100644 --- a/jersey-tck/pom.xml +++ b/jersey-tck/pom.xml @@ -22,13 +22,13 @@ org.glassfish.jersey.core jersey-tck - 3.1.2 + 4.0.0-SNAPSHOT jar jakarta.ws.rs all - 3.1.0 + 4.0.0-SNAPSHOT Jakarta RESTful WS Compliance @@ -42,7 +42,7 @@ ${project.build.directory}/glassfish6 10.0.0-RC1 5.7.2 - 3.1.0 + 4.0.0-SNAPSHOT jakarta-restful-ws-tck diff --git a/pom.xml b/pom.xml index e8bf7661f..440d3c8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ jakarta.ws.rs all - 3.1.0 + 4.0.0-SNAPSHOT pom Jakarta RESTful WS Project From 2f837b7a1b0082ef23193a5ce6662d4fd7088a8b Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Wed, 24 Jan 2024 17:56:53 -0800 Subject: [PATCH 02/13] Cleanup of pom files to use dependency management and dependency plugins to avoid repetition. Signed-off-by: James R. Perkins --- .github/workflows/maven-package.yml | 2 +- etc/config/checkstyle.xml | 1 - examples/pom.xml | 201 +------- .../async/LongRunningEjbResource.java | 43 -- .../jaxrs/examples/client/BasicExamples.java | 2 - .../examples/client/spec/SpecExamples.java | 2 - .../examples/link/clusterservice/Cluster.java | 3 - .../examples/link/clusterservice/Machine.java | 3 - jaxrs-api/pom.xml | 383 +++----------- jaxrs-spec/README.md | 2 +- jaxrs-spec/pom.xml | 14 - jaxrs-tck-docs/userguide/pom.xml | 11 +- jaxrs-tck/pom.xml | 207 +++----- jersey-tck/pom.xml | 1 - pom.xml | 483 +++++++++++++++++- 15 files changed, 617 insertions(+), 741 deletions(-) delete mode 100644 examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java diff --git a/.github/workflows/maven-package.yml b/.github/workflows/maven-package.yml index 280c93a2c..5fc3ceec4 100644 --- a/.github/workflows/maven-package.yml +++ b/.github/workflows/maven-package.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '11', '17' ] + java: ['17', '21' ] steps: - uses: actions/checkout@v2 diff --git a/etc/config/checkstyle.xml b/etc/config/checkstyle.xml index 254bc1b48..0eb5f57f8 100644 --- a/etc/config/checkstyle.xml +++ b/etc/config/checkstyle.xml @@ -92,7 +92,6 @@ - diff --git a/examples/pom.xml b/examples/pom.xml index c8f2dfcc3..ab4303e57 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,195 +25,11 @@ 4.0.0-SNAPSHOT - https://github.com/jax-rs/api - - UTF-8 - 11 - 3.0-RC1 + 3.0.3 - - Eclipse Foundation - https://www.eclipse.org/org/foundation/ - - - - Github - https://github.com/jax-rs/api/issues - - - - - JAX-RS Discussion Group - jaxrs-spec@javaee.groups.io - - - - - - EDL 1.0 - http://www.eclipse.org/org/documents/edl-v10.php - repo - - - - - scm:git:https://github.com/jax-rs/api.git - scm:git:ssh://git@github.com:jax-rs/api.git - https://github.com/jax-rs/api - - - - - developers - JAX-RS API Developers - jaxrs-dev@eclipse.org - https://github.com/jakartaee/rest/graphs/contributors - - - - - - - maven-compiler-plugin - 3.8.1 - - - maven-jar-plugin - 3.2.0 - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.4 - - {0,date,MM/dd/yyyy hh:mm aa} - - timestamp - - - - - validate - - create - - - - - - maven-javadoc-plugin - 3.3.0 - - JAX-RS ${project.version} API Specification - - Oracle - and/or its affiliates. All Rights Reserved. - ]]> - - - - - - attach-javadocs - - jar - - - - - - maven-source-plugin - 3.2.1 - - - attach-sources - - jar-no-fork - - - - - - maven-jxr-plugin - 3.1.1 - - - - jxr - - validate - - - - - maven-checkstyle-plugin - 3.1.2 - - ${project.build.directory}/checkstyle - ${project.build.directory}/checkstyle/checkstyle-result.xml - ${basedir}/../etc/config/checkstyle.xml - true - - - - com.puppycrawl.tools - checkstyle - 8.44 - - - - - - checkstyle - - validate - - - - - org.glassfish.copyright - glassfish-copyright-maven-plugin - 1.39 - - ${basedir}/../etc/config/copyright-exclude - - git - - false - - true - - true - - false - - false - - - - maven-compiler-plugin @@ -248,34 +64,19 @@ ${project.version} - - jakarta.xml.bind - jakarta.xml.bind-api - 3.0.1 - - jakarta.enterprise jakarta.enterprise.cdi-api - 3.0.0 jakarta.enterprise.concurrent jakarta.enterprise.concurrent-api - 2.0.0 - - - - jakarta.ejb - jakarta.ejb-api - 4.0.0 jakarta.validation jakarta.validation-api - 3.0.0 diff --git a/examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java b/examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java deleted file mode 100644 index 02a9f356a..000000000 --- a/examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0, which is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package jaxrs.examples.async; - -import jakarta.ejb.Asynchronous; -import jakarta.ejb.Stateless; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.container.AsyncResponse; -import jakarta.ws.rs.container.Suspended; - -/** - * Example of a long running EJB resource. - * - * @author Marek Potociar - */ -@Stateless -@Path("/") -public class LongRunningEjbResource { - @GET - @Asynchronous - public void longRunningOperation(@Suspended AsyncResponse ar) { - final String result = executeLongRunningOperation(); - ar.resume(result); - } - - private String executeLongRunningOperation() { - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - return "done"; - } -} diff --git a/examples/src/main/java/jaxrs/examples/client/BasicExamples.java b/examples/src/main/java/jaxrs/examples/client/BasicExamples.java index 2ee485e9f..88364e31e 100644 --- a/examples/src/main/java/jaxrs/examples/client/BasicExamples.java +++ b/examples/src/main/java/jaxrs/examples/client/BasicExamples.java @@ -41,7 +41,6 @@ import jakarta.ws.rs.ext.ReaderInterceptorContext; import jakarta.ws.rs.ext.WriterInterceptor; import jakarta.ws.rs.ext.WriterInterceptorContext; -import jakarta.xml.bind.annotation.XmlRootElement; import jaxrs.examples.client.custom.ThrottledClient; import static jakarta.ws.rs.client.Entity.form; @@ -59,7 +58,6 @@ public class BasicExamples { /** * Customer bean. */ - @XmlRootElement public static class Customer { private final String name; diff --git a/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java b/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java index bf79a3740..2b04e377f 100644 --- a/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java +++ b/examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java @@ -21,7 +21,6 @@ import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.client.Entity.entity; -import jakarta.xml.bind.annotation.XmlRootElement; import jaxrs.examples.client.custom.ThrottledClient; /** @@ -33,7 +32,6 @@ public class SpecExamples { /** * Customer bean. */ - @XmlRootElement public static class Customer { private final String name; diff --git a/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java b/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java index cba119685..1c067d030 100644 --- a/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java +++ b/examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java @@ -13,14 +13,11 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlRootElement; - /** * Cluster class. * * @author Santiago.Pericas-Geertsen@oracle.com */ -@XmlRootElement public class Cluster { enum Status { diff --git a/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java b/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java index 12b5a571b..ee5f9a6cd 100644 --- a/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java +++ b/examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java @@ -10,14 +10,11 @@ package jaxrs.examples.link.clusterservice; -import jakarta.xml.bind.annotation.XmlRootElement; - /** * Machine class. * * @author Santiago.Pericas-Geertsen@oracle.com */ -@XmlRootElement public class Machine { enum Status { diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml index 7ba8ef49e..ac9d90c06 100644 --- a/jaxrs-api/pom.xml +++ b/jaxrs-api/pom.xml @@ -1,7 +1,7 @@ - skip-tests - - false - - - true - - - - ${project.artifactId} - - - - maven-jar-plugin - 3.2.0 - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.4 - - {0,date,MM/dd/yyyy hh:mm aa} - - timestamp - - - - - validate - - create - - - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - true - - - <_failok>true - ${buildNumber} - Jakarta RESTful Web Services API (JAX-RS) - ${project.version} - jakarta.ws.rs-api - * - ${api.package} - ${project.version} - ${spec.version} - Eclipse Foundation - ${spec.version} - <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) - <_nodefaultversion>false - osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" - - - - - osgi-bundle - package - - bundle - - - - - - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - 8 - ${apidocs.title} - true - - Copyright © 2018, 2020 Eclipse Foundation.
Use is subject to license terms.]]> - - true - - - module-info.java - - - - - attach-javadocs - - jar - - - - - - maven-source-plugin - 3.2.1 - - - attach-sources - - jar-no-fork - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - add-legal-resource - generate-resources - - add-resource - - - - - ${legal.doc.folder} - - NOTICE.md - LICENSE.md - - META-INF - - - - - - - - maven-jxr-plugin - 3.1.1 - - - - jxr - - validate - - - - - maven-checkstyle-plugin - 3.1.2 - - ${project.build.directory}/checkstyle - ${project.build.directory}/checkstyle/checkstyle-result.xml - ${basedir}/../etc/config/checkstyle.xml - **/module-info.java - true - - - - com.puppycrawl.tools - checkstyle - 8.44 - - - - - - checkstyle - - validate - - - - - org.glassfish.copyright - glassfish-copyright-maven-plugin - 1.39 - - ${basedir}/../etc/config/copyright-exclude - - git - - false - - true - - true - - false - - false - - - - maven-surefire-plugin - ${maven.surefire.plugin.version} - - --add-modules jakarta.xml.bind - - - - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - org.apache.felix @@ -331,6 +60,15 @@ maven-checkstyle-plugin + + maven-surefire-plugin + + + + true + + + org.glassfish.copyright glassfish-copyright-maven-plugin @@ -343,65 +81,96 @@ + + jakarta.activation + jakarta.activation-api + provided + + + jakarta.inject + jakarta.inject-api + + + jakarta.enterprise + jakarta.enterprise.cdi-api + jakarta.xml.bind jakarta.xml.bind-api - ${jaxb.api.version} - provided - true - jakarta.activation - jakarta.activation-api - ${activation.api.version} - provided + org.junit.jupiter + junit-jupiter-api + test + + + + org.glassfish.jaxb + codemodel + test + + + org.glassfish.jaxb + jaxb-core + test + + + org.glassfish.jaxb + jaxb-jxc + test org.glassfish.jaxb jaxb-runtime - ${jaxb.impl.version} test - org.junit.jupiter - junit-jupiter-api - 5.8.0-M1 + org.glassfish.jaxb + txw2 test + + org.glassfish.jaxb + jaxb-xjc + test + + + org.glassfish.jaxb + xsom + test + + + + com.sun.istack + istack-commons-runtime + test + + + com.sun.istack + istack-commons-tools + test + + + com.sun.xml.bind.external + relaxng-datatype + test + + + com.sun.xml.bind.external + rngom + test + + org.hamcrest hamcrest - 2.2 test org.mockito mockito-core - 3.11.1 test - - Jakarta RESTful Web Services ${spec.version} API Specification ${spec.version.revision} - 11 - - 5.1.2 - 3.10.1 - ${java.version} - 3.3.0 - 3.0.0-M7 - - jakarta.ws.rs - UTF-8 - false - 4.0 - - - 4.0.0 - 4.0.0 - 2.1.0 - ${project.basedir}/.. - - diff --git a/jaxrs-spec/README.md b/jaxrs-spec/README.md index 6dcceccc0..6699c1ef0 100644 --- a/jaxrs-spec/README.md +++ b/jaxrs-spec/README.md @@ -8,7 +8,7 @@ Building Prerequisites: -* JDK 11+ +* JDK 17+ * Maven 3.6.3+ Run the full build: diff --git a/jaxrs-spec/pom.xml b/jaxrs-spec/pom.xml index 712581543..236689792 100644 --- a/jaxrs-spec/pom.xml +++ b/jaxrs-spec/pom.xml @@ -33,7 +33,6 @@ ${project.build.directory}/staging true - 2.1.0 2.5.1 1.6.0 9.2.19.0 @@ -44,25 +43,12 @@ UTF-8 - - scm:git:https://github.com/jakartaee/rest - https://github.com/jakartaee/rest - HEAD - - - - - scm:git:https://github.com/jakartaee/rest - - - package org.asciidoctor asciidoctor-maven-plugin - ${asciidoctor.maven.plugin.version} org.jruby diff --git a/jaxrs-tck-docs/userguide/pom.xml b/jaxrs-tck-docs/userguide/pom.xml index 7bad43231..a8911a438 100644 --- a/jaxrs-tck-docs/userguide/pom.xml +++ b/jaxrs-tck-docs/userguide/pom.xml @@ -56,7 +56,6 @@ package - org.apache.maven.plugins maven-clean-plugin @@ -70,7 +69,6 @@ - org.apache.maven.plugins maven-enforcer-plugin @@ -81,8 +79,8 @@ - [11.0,) - You need JDK11 or newer + [17.0,) + You need JDK17 or newer @@ -172,7 +170,6 @@ - org.apache.maven.plugins maven-scm-publish-plugin @@ -194,7 +191,6 @@ - org.apache.maven.plugins maven-clean-plugin 3.1.0 @@ -204,17 +200,14 @@ 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 diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index 92c048b19..425c13453 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml @@ -34,132 +34,11 @@ 4.0.0-SNAPSHOT - - 11 - 11 - [5.7.2, 5.8-A00) - jakarta-restful-ws-tck - - - - Eclipse Foundation - https://www.eclipse.org/org/foundation/ - - - - - developers - JAX-RS API Developers - jaxrs-dev@eclipse.org - https://github.com/jakartaee/rest/graphs/contributors - - - - - Github - https://github.com/jakartaee/rest/issues - - - - - JAX-RS Developer Discussions - jaxrs-dev@eclipse.org - - - - - - EPL-2.0 - http://www.eclipse.org/legal/epl-2.0 - repo - - - GPL-2.0-with-classpath-exception - https://www.gnu.org/software/classpath/license.html - repo - - - - - scm:git:https://github.com/jakartaee/rest - https://github.com/jakartaee/rest - HEAD - - - - - record-signature - - false - - - - - org.netbeans.tools - sigtest-maven-plugin - 1.4 - - - - generate - - - - - ${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 - - - - - - - - - tck-build - - true - - - - - maven-compiler-plugin - 2.3.2 - - - maven-surefire-plugin - 3.0.0-M5 - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - - - - jakarta.ws.rs jakarta.ws.rs-api - ${project.parent.version} + ${project.version} @@ -176,15 +55,7 @@ org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - - - - org.junit.platform - junit-platform-launcher - 1.7.2 - test + junit-jupiter-api @@ -195,38 +66,34 @@ org.hamcrest - hamcrest-library - [2.2, 2.3-A00) + hamcrest org.jboss.arquillian.junit5 arquillian-junit5-container - 1.7.0.Alpha10 + 1.8.0.Final jakarta.annotation jakarta.annotation-api - 2.1.0-B1 jakarta.xml.bind jakarta.xml.bind-api - 4.0.0-RC2 jakarta.activation jakarta.activation-api - 2.1.0-RC1 jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided @@ -236,5 +103,69 @@ 1.4 + + + org.junit.jupiter + junit-jupiter + test + + + + + + + maven-compiler-plugin + + + maven-surefire-plugin + + + maven-jar-plugin + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + + + record-signature + + false + + + + + org.netbeans.tools + sigtest-maven-plugin + 1.4 + + + + generate + + + + + ${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 + + + + + + + \ No newline at end of file diff --git a/jersey-tck/pom.xml b/jersey-tck/pom.xml index 3a1575437..ef76456cb 100644 --- a/jersey-tck/pom.xml +++ b/jersey-tck/pom.xml @@ -179,7 +179,6 @@ - org.apache.maven.plugins maven-dependency-plugin 3.2.0 diff --git a/pom.xml b/pom.xml index 440d3c8b3..e37e2dd32 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.eclipse.ee4j project - 1.0.7 + 1.0.9 @@ -34,7 +34,472 @@ JAX-RS API Repository - Snapshots https://repo.eclipse.org/content/repositories/jax-rs-api-snapshots/ - + https://github.com/eclipse-ee4j/jaxrs-api + + + Eclipse Foundation + https://www.eclipse.org/org/foundation/ + + + + + developers + JAX-RS API Developers + jaxrs-dev@eclipse.org + https://github.com/eclipse-ee4j/jaxrs-api/graphs/contributors + + + + + Github + https://github.com/eclipse-ee4j/jaxrs-api/issues + + + + + JAX-RS Developer Discussions + jaxrs-dev@eclipse.org + + + + + + EPL-2.0 + https://www.eclipse.org/legal/epl-2.0 + repo + + + GPL-2.0-with-classpath-exception + https://www.gnu.org/software/classpath/license.html + repo + + + + + scm:git:https://github.com/eclipse-ee4j/jaxrs-api + https://github.com/eclipse-ee4j/jaxrs-api + HEAD + + + 17 + 17 + + Jakarta RESTful Web Services ${spec.version} API Specification ${spec.version.revision} + ${project.basedir} + + 3.5.0 + 3.8.1 + 3.1.0 + + jakarta.ws.rs + UTF-8 + false + 3.2 + + + 2.1.1 + 2.0.0 + 2.0.0 + 3.0.0 + 2.0.0 + 4.0.0 + 3.0.0 + 5.8.2 + 4.0.3 + 4.1.2 + 2.2 + 3.6.0 + + + + jaxrs-api + examples + jaxrs-spec + jaxrs-tck + + + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + jakarta.annotation + jakarta.annotation-api + ${annotation.api.version} + + + jakarta.activation + jakarta.activation-api + ${activation.api.version} + + + jakarta.inject + jakarta.inject-api + ${inject.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${cdi.api.version} + + + jakarta.validation + jakarta.validation-api + ${validation.api.version} + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + ${concurrent.api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${xml.binding.api.version} + + + + org.glassfish.jaxb + codemodel + ${org.glassfish.jaxb.version} + + + * + * + + + + + org.glassfish.jaxb + jaxb-core + ${org.glassfish.jaxb.version} + + + * + * + + + + + org.glassfish.jaxb + jaxb-jxc + ${org.glassfish.jaxb.version} + + + * + * + + + + + org.glassfish.jaxb + jaxb-runtime + ${org.glassfish.jaxb.version} + + + * + * + + + + + org.glassfish.jaxb + txw2 + ${org.glassfish.jaxb.version} + + + * + * + + + + + org.glassfish.jaxb + jaxb-xjc + ${org.glassfish.jaxb.version} + + + * + * + + + + + org.glassfish.jaxb + xsom + ${org.glassfish.jaxb.version} + + + * + * + + + + + + com.sun.istack + istack-commons-runtime + ${com.sun.istack.version} + + + * + * + + + + + com.sun.istack + istack-commons-tools + ${com.sun.istack.version} + + + * + * + + + + + com.sun.xml.bind.external + relaxng-datatype + ${org.glassfish.jaxb.version} + + + com.sun.xml.bind.external + rngom + ${org.glassfish.jaxb.version} + + + relaxngDatatype + relaxngDatatype + + + com.sun.xml.bind.external + relaxng-datatype + + + + + + org.hamcrest + hamcrest + ${hamcrest.version} + + + org.mockito + mockito-core + ${mockito.version} + + + + + + ${project.artifactId} + + + + maven-compiler-plugin + 3.11.0 + + + maven-jar-plugin + 3.3.0 + + + maven-surefire-plugin + 3.2.5 + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + {0,date,MM/dd/yyyy hh:mm aa} + + timestamp + + + + + validate + + create + + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + true + + + <_failok>true + ${buildNumber} + Jakarta RESTful Web Services API (JAX-RS) + ${project.version} + jakarta.ws.rs-api + * + ${api.package} + ${project.version} + ${spec.version} + Eclipse Foundation + ${spec.version} + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + <_nodefaultversion>false + osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" + + + + + osgi-bundle + package + + bundle + + + + + + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + ${apidocs.title} + true + + Copyright © 2018, 2024 Eclipse Foundation.
Use is subject to license terms.]]> + + true + + module-info.java + + + + + attach-javadocs + + jar + + + + + + maven-source-plugin + 3.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + add-legal-resource + generate-resources + + add-resource + + + + + ${legal.doc.folder} + + NOTICE.md + LICENSE.md + + META-INF + + + + + + + + maven-jxr-plugin + 2.5 + + + + jxr + + validate + + + + + maven-checkstyle-plugin + 3.1.2 + + ${project.build.directory}/checkstyle + ${project.build.directory}/checkstyle/checkstyle-result.xml + ${basedir}/../etc/config/checkstyle.xml + **/module-info.java + + + + + checkstyle + + validate + + + + + org.glassfish.copyright + glassfish-copyright-maven-plugin + 1.39 + + ${basedir}/../etc/config/copyright-exclude + + git + + false + + true + + true + + false + + false + + + + + + + maven-enforcer-plugin + + + enforce-java-version + + enforce + + + + + To build this project JDK ${jdk.min.version} (or greater) is required. + ${jdk.min.version} + + + + + + + + @@ -47,20 +512,6 @@ - - dependentModules - - true - - jaxrs.all.build - - - - jaxrs-api - jaxrs-tck - examples - - dependentSpecification From dbe3fa0fb4367f9bd61392ba8f09f4ce6f92ac15 Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Wed, 21 Feb 2024 13:35:24 -0800 Subject: [PATCH 03/13] Fix CI job. Remove the unknown branch 4.0.0-SNAPSHOT and update the actions used. Signed-off-by: James R. Perkins --- .github/workflows/maven-package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-package.yml b/.github/workflows/maven-package.yml index 5fc3ceec4..c283960a6 100644 --- a/.github/workflows/maven-package.yml +++ b/.github/workflows/maven-package.yml @@ -3,9 +3,9 @@ name: Jakarta REST CI on: push: - branches: [ master, 4.0-SNAPSHOT ] + branches: [ main ] pull_request: - branches: [ master, 4.0-SNAPSHOT ] + branches: [ main ] jobs: build: @@ -16,11 +16,11 @@ jobs: java: ['17', '21' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' - name: Build with Maven - run: mvn -B verify + run: mvn -B -ntp clean verify -Djaxrs.all.build From da38d7257a896fca29c14ef2587e4b0ce3ee0736 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Fri, 9 Feb 2024 09:55:16 -0600 Subject: [PATCH 04/13] Remove @ManagedBean annotation --- .../chapters/appendix/_change-log.adoc | 4 +- .../appendix/_changes-since-3.1-release.adoc | 15 +++++++ .../chapters/environment/_javaee.adoc | 42 +------------------ 3 files changed, 20 insertions(+), 41 deletions(-) create mode 100644 jaxrs-spec/src/main/asciidoc/chapters/appendix/_changes-since-3.1-release.adoc diff --git a/jaxrs-spec/src/main/asciidoc/chapters/appendix/_change-log.adoc b/jaxrs-spec/src/main/asciidoc/chapters/appendix/_change-log.adoc index 75871f42c..716a214b3 100644 --- a/jaxrs-spec/src/main/asciidoc/chapters/appendix/_change-log.adoc +++ b/jaxrs-spec/src/main/asciidoc/chapters/appendix/_change-log.adoc @@ -1,6 +1,6 @@ //// ******************************************************************* -* Copyright (c) 2019 Eclipse Foundation +* Copyright (c) 2019, 2024 Eclipse Foundation * * This specification document is made available under the terms * of the Eclipse Foundation Specification License v1.0, which is @@ -12,6 +12,8 @@ [[change-log]] == Change Log +include::_changes-since-3.1-release.adoc[] + include::_changes-since-3.0-release.adoc[] include::_changes-since-2.1-release.adoc[] diff --git a/jaxrs-spec/src/main/asciidoc/chapters/appendix/_changes-since-3.1-release.adoc b/jaxrs-spec/src/main/asciidoc/chapters/appendix/_changes-since-3.1-release.adoc new file mode 100644 index 000000000..d0e644ede --- /dev/null +++ b/jaxrs-spec/src/main/asciidoc/chapters/appendix/_changes-since-3.1-release.adoc @@ -0,0 +1,15 @@ +//// +******************************************************************* +* Copyright (c) 2024 Eclipse Foundation +* +* This specification document is made available under the terms +* of the Eclipse Foundation Specification License v1.0, which is +* available at https://www.eclipse.org/legal/efsl.php. +******************************************************************* +//// + +[[changes-since-3.1-release]] +=== Changes Since 3.1 Release + +* <>: Removal of `@ManagedBean` +annotation support. Managed bean support is now part of CDI. \ No newline at end of file diff --git a/jaxrs-spec/src/main/asciidoc/chapters/environment/_javaee.adoc b/jaxrs-spec/src/main/asciidoc/chapters/environment/_javaee.adoc index 3c8992df7..cb7674614 100644 --- a/jaxrs-spec/src/main/asciidoc/chapters/environment/_javaee.adoc +++ b/jaxrs-spec/src/main/asciidoc/chapters/environment/_javaee.adoc @@ -1,6 +1,6 @@ //// ******************************************************************* -* Copyright (c) 2019, 2020 Eclipse Foundation +* Copyright (c) 2019, 2024 Eclipse Foundation * * This specification document is made available under the terms * of the Eclipse Foundation Specification License v1.0, which is @@ -37,43 +37,6 @@ Additionally, web application’s `` and servlet’s server-side features or injected into server-side JAX-RS components. See Javadoc for `Application.getProperties` for more information. -[[managed_beans]] -==== Managed Beans - -In a product that supports Managed Beans, implementations MUST support -the use of Managed Beans as root resource classes, providers and -`Application` subclasses. - -For example, a bean that uses a managed-bean interceptor can be defined -as a JAX-RS resource as follows: - -[source,java] ----- -@ManagedBean -@Path("/managedbean") -public class ManagedBeanResource { - - public static class MyInterceptor { - @AroundInvoke - public String around(InvocationContext ctx) throws Exception { - System.out.println("around() called"); - return (String) ctx.proceed(); - } - } - - @GET - @Produces("text/plain") - @Interceptors(MyInterceptor.class) - public String getIt() { - return "Hi managedbean!"; - } -} ----- - -The example above uses a managed-bean interceptor to intercept calls to -the resource method `getIt`. See <> for -additional requirements on Managed Beans. - [[cdi]] ==== Context and Dependency Injection (CDI) @@ -203,8 +166,7 @@ form `application/*+xml`. [[additional_reqs]] ==== Additional Requirements -The following additional requirements apply when using Managed Beans, -CDI-style Beans or EJBs as resource classes, providers or `Application` +The following additional requirements apply when using CDI-style Beans or EJBs as resource classes, providers or `Application` subclasses: * For JAX-RS resources and providers where the JAX-RS implementation From 26788559a1dabb4abe6d3937f13264aaf4d0314c Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Tue, 13 Feb 2024 15:00:08 -0600 Subject: [PATCH 05/13] Add changes from release-3.1.x TCK to release-3.2 --- jaxrs-tck-docs/TCK-Exclude-List.txt | 11 ++++++++++- jaxrs-tck-docs/tckbundle.sh | 11 +++++++++-- .../rs/container/responsecontext/JAXRSClientIT.java | 7 +++++-- .../tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java | 4 +++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/jaxrs-tck-docs/TCK-Exclude-List.txt b/jaxrs-tck-docs/TCK-Exclude-List.txt index c1c1b0587..3d77d18f3 100644 --- a/jaxrs-tck-docs/TCK-Exclude-List.txt +++ b/jaxrs-tck-docs/TCK-Exclude-List.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License v. 2.0, which is available at @@ -76,6 +76,9 @@ ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWi ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithStringCallbackWhileServerWaitTest ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithStringClassWhileServerWaitTest +# https://github.com/jakartaee/rest/issues/1162 +ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java#sseBroadcastTest + # # ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java#connectionLostForDefault500msTest @@ -152,3 +155,9 @@ ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithStr ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithResponseClassTest ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithGenericTypeStringTest ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithGenericTypeResponseTest + +https://github.com/jakartaee/rest/issues/1138 +ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT#getNormalizedUriTest + +https://github.com/jakartaee/rest/issues/1163 +ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT#setEntityStreamTest \ No newline at end of file diff --git a/jaxrs-tck-docs/tckbundle.sh b/jaxrs-tck-docs/tckbundle.sh index 150dd6bc8..769525637 100644 --- a/jaxrs-tck-docs/tckbundle.sh +++ b/jaxrs-tck-docs/tckbundle.sh @@ -1,6 +1,6 @@ #!/bin/bash -xe -# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License v. 2.0, which is available at @@ -40,6 +40,7 @@ mvn rm -rf $WORKSPACE/bundle +mkdir -p $WORKSPACE/bundle mkdir -p $WORKSPACE/bundle/docs mkdir -p $WORKSPACE/bundle/docs/html-usersguide mkdir -p $WORKSPACE/bundle/docs/pdf-usersguide @@ -51,17 +52,23 @@ cp $WORKSPACE/jaxrs-tck-docs/*.html $WORKSPACE/bundle/docs/ cp $WORKSPACE/jaxrs-tck-docs/*.txt $WORKSPACE/bundle/docs/ cp -r $WORKSPACE/jaxrs-tck-docs/assertions $WORKSPACE/bundle/docs/ -mkdir -p $WORKSPACE/bundle cp $WORKSPACE/jaxrs-tck/target/*.jar $WORKSPACE/bundle/ cd $WORKSPACE/bundle +mkdir -p $WORKSPACE/bundle/META-INF if [[ "$1" == "epl" || "$1" == "EPL" ]]; then cp $WORKSPACE/LICENSE.md $WORKSPACE/bundle/LICENSE.md + cp $WORKSPACE/LICENSE.md $WORKSPACE/bundle/META-INF/LICENSE.md cp $WORKSPACE/jaxrs-tck/pom.epl.xml $WORKSPACE/bundle/restful-ws-tck-"$VERSION".pom + jar -uvf restful-ws-tck-"$VERSION".jar META-INF/LICENSE.md + rm -rf $WORKSPACE/bundle/META-INF zip -r restful-ws-tck-"$VERSION".zip * else cp $WORKSPACE/jaxrs-tck-docs/LICENSE_EFTL.md $WORKSPACE/bundle/LICENSE.md + cp $WORKSPACE/jaxrs-tck-docs/LICENSE_EFTL.md $WORKSPACE/bundle/META-INF/LICENSE.md cp $WORKSPACE/jaxrs-tck/pom.xml $WORKSPACE/bundle/jakarta-restful-ws-tck-"$VERSION".pom + jar -uvf jakarta-restful-ws-tck-"$VERSION".jar META-INF/LICENSE.md + rm -rf $WORKSPACE/bundle/META-INF zip -r jakarta-restful-ws-tck-"$VERSION".zip * fi diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java index c40db3fbc..e2dfd3706 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -53,7 +53,7 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.AfterEach; - +import org.junit.jupiter.api.Disabled; /* * @class.setup_props: webServerHost; * webServerPort; @@ -1103,6 +1103,7 @@ public void setEntityTest() throws Fault { * Throws IOException. */ @Test + @Disabled public void setEntityStreamTest() throws Fault { setProperty(Property.SEARCH_STRING, ResponseFilter.ENTITY); setProperty(Property.SEARCH_STRING, "OK"); @@ -1121,6 +1122,7 @@ public void setEntityStreamTest() throws Fault { * Throws IOException. */ @Test + @Disabled public void setStatusTest() throws Fault { for (Response.Status status : Response.Status.values()) { String content = String.valueOf(status.getStatusCode()); @@ -1142,6 +1144,7 @@ public void setStatusTest() throws Fault { * Throws IOException. */ @Test + @Disabled public void setStatusInfoTest() throws Fault { for (Response.Status status : Response.Status.values()) { String content = String.valueOf(status.getStatusCode()); diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java index 3fbaaa58c..52a001c55 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -34,6 +34,7 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; /* * @class.setup_props: webServerHost; @@ -414,6 +415,7 @@ public void getMatchedURIsTest2() throws Fault { * obtained from an injected UriInfo */ @Test + @Disabled public void getNormalizedUriTest() throws Fault { setProperty(Property.REQUEST, buildRequest(GET, URIInfoTest.DECODED)); invoke(); From ca1af9949ce3c1f43e7809455e645b1a492edb09 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Tue, 13 Feb 2024 17:47:38 -0600 Subject: [PATCH 06/13] Missed change from PR 1173 --- .../ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java index 2a6e1dd92..0df09ad51 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -46,6 +46,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.TestInfo; @@ -143,6 +144,7 @@ public void cleanup() throws Fault { * @test_Strategy: */ @Test + @Disabled public void sseBroadcastTest() throws Fault { int MSG_MAX = 7; int wait = 25; From 9505cd9a7eab273dc8902f20532767efa72a34e8 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Thu, 15 Feb 2024 16:12:28 -0600 Subject: [PATCH 07/13] Remove excludes from issue 1199 --- jaxrs-tck-docs/TCK-Exclude-List.txt | 4 ++-- .../rs/ee/rs/container/responsecontext/JAXRSClientIT.java | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/jaxrs-tck-docs/TCK-Exclude-List.txt b/jaxrs-tck-docs/TCK-Exclude-List.txt index 3d77d18f3..db5d32412 100644 --- a/jaxrs-tck-docs/TCK-Exclude-List.txt +++ b/jaxrs-tck-docs/TCK-Exclude-List.txt @@ -156,8 +156,8 @@ ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithRes ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithGenericTypeStringTest ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithGenericTypeResponseTest -https://github.com/jakartaee/rest/issues/1138 +# https://github.com/jakartaee/rest/issues/1138 ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT#getNormalizedUriTest -https://github.com/jakartaee/rest/issues/1163 +# https://github.com/jakartaee/rest/issues/1163 ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT#setEntityStreamTest \ No newline at end of file diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java index e2dfd3706..c40db3fbc 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -53,7 +53,7 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Disabled; + /* * @class.setup_props: webServerHost; * webServerPort; @@ -1103,7 +1103,6 @@ public void setEntityTest() throws Fault { * Throws IOException. */ @Test - @Disabled public void setEntityStreamTest() throws Fault { setProperty(Property.SEARCH_STRING, ResponseFilter.ENTITY); setProperty(Property.SEARCH_STRING, "OK"); @@ -1122,7 +1121,6 @@ public void setEntityStreamTest() throws Fault { * Throws IOException. */ @Test - @Disabled public void setStatusTest() throws Fault { for (Response.Status status : Response.Status.values()) { String content = String.valueOf(status.getStatusCode()); @@ -1144,7 +1142,6 @@ public void setStatusTest() throws Fault { * Throws IOException. */ @Test - @Disabled public void setStatusInfoTest() throws Fault { for (Response.Status status : Response.Status.values()) { String content = String.valueOf(status.getStatusCode()); From 4f825dfbe99f9937b429e3e2f9fe1f75e25d59c8 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Mon, 19 Feb 2024 14:09:03 -0600 Subject: [PATCH 08/13] Pull in 4.0 changes from PR 1146 --- .../tck/ws/rs/common/JAXRSCommonClient.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java index e50a1f2b0..d5c06b142 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/common/JAXRSCommonClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -715,29 +715,29 @@ protected void clearProperty(Property key) { assertEquals(T first, T second, Object... message) { if (first == null && second == null) return; - assertFalse(first == null && second != null, message.toString()); - assertFalse(first != null && second == null, message.toString()); + assertFalse(first == null && second != null, objectsToString(message)); + assertFalse(first != null && second == null, objectsToString(message)); if (first instanceof Comparable) - assertTrue(((Comparable) first).compareTo(second) == 0, message.toString()); + assertTrue(((Comparable) first).compareTo(second) == 0, objectsToString(message)); else - assertTrue(first.equals(second), message.toString()); + assertTrue(first.equals(second), objectsToString(message)); } public static void // assertEqualsInt(int first, int second, Object... message) { - assertTrue(first == second, message.toString()); + assertTrue(first == second, objectsToString(message)); } public static void // assertEqualsLong(long first, long second, Object... message) { - assertTrue(first == second, message.toString()); + assertTrue(first == second, objectsToString(message)); } public static void // assertEqualsBool(boolean first, boolean second, Object... message) { - assertTrue(first == second, message.toString()); + assertTrue(first == second, objectsToString(message)); } /** @@ -751,7 +751,7 @@ protected void clearProperty(Property key) { */ public static void // assertNull(Object object, Object... message) { - assertTrue(object == null, message.toString()); + assertTrue(object == null, objectsToString(message)); } /** @@ -765,7 +765,7 @@ protected void clearProperty(Property key) { */ public static void // assertNotNull(Object object, Object... message) { - assertTrue(object != null, message.toString()); + assertTrue(object != null, objectsToString(message)); } /** @@ -795,7 +795,7 @@ public static void fault(Object... objects) throws Fault { */ public static void assertContains(String string, String substring, Object... message) { - assertTrue(string.contains(substring), message.toString()); + assertTrue(string.contains(substring), objectsToString(message)); } /** @@ -812,7 +812,7 @@ public static void assertContains(String string, String substring, */ public static void assertContainsIgnoreCase(String string, String substring, Object... message) { - assertTrue(string.toLowerCase().contains(substring.toLowerCase()), message.toString()); + assertTrue(string.toLowerCase().contains(substring.toLowerCase()), objectsToString(message)); } /** @@ -828,7 +828,7 @@ public static void assertContainsIgnoreCase(String string, String substring, */ public static void assertContains(T text, T subtext, Object... message) { - assertContains(text.toString(), subtext.toString(), message.toString()); + assertContains(text.toString(), subtext.toString(), objectsToString(message)); } /** @@ -845,7 +845,7 @@ public static void assertContains(T text, T subtext, Object... message) */ public static void assertContainsIgnoreCase(T text, T subtext, Object... message) { - assertContainsIgnoreCase(text.toString(), subtext.toString(), message.toString()); + assertContainsIgnoreCase(text.toString(), subtext.toString(), objectsToString(message)); } /** From 4397943ebcfb28ecc9202f9f39e8069d22fab63c Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Mon, 19 Feb 2024 14:26:40 -0600 Subject: [PATCH 09/13] Add 4.0 change from PR 1164 --- .../rs/ee/rs/container/responsecontext/ResponseFilter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java index 0bf416f1b..7c7c3c929 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/ResponseFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -317,6 +317,11 @@ public synchronized void write(byte[] b, int off, int len) write(b); } + @Override + public void close() throws IOException { + stream.close(); + } + public final byte[] intToByteArray(int value) { return new byte[] { (byte) (value & 0xff) }; } From d5f43a4b42c62e09e6d5d0b501c5a0bb771fd8b9 Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Mon, 19 Feb 2024 15:10:47 -0600 Subject: [PATCH 10/13] pull in changes from 4.0 for PR's 1172 and 1182 --- .../ee/sse/ssebroadcaster/JAXRSClientIT.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java index 0df09ad51..677e89514 100644 --- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java +++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java @@ -17,6 +17,7 @@ package ee.jakarta.tck.ws.rs.jaxrs21.ee.sse.ssebroadcaster; import java.util.List; +import java.util.ArrayList; import java.io.InputStream; import java.io.IOException; @@ -46,7 +47,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.TestInfo; @@ -144,7 +144,6 @@ public void cleanup() throws Fault { * @test_Strategy: */ @Test - @Disabled public void sseBroadcastTest() throws Fault { int MSG_MAX = 7; int wait = 25; @@ -190,17 +189,20 @@ public void sseBroadcastTest() throws Fault { } } - for (int i = 0; i != CLIENTS; i++) { - List events = clients[i].getEvents(); - assertEquals(events.size(), MSG_MAX + 1, - "Received unexpected number of events", events.size()); - assertTrue(events.get(0).contains("WELCOME"), - "Received unexpected message"+ events.get(0)); - for (int j = 0; j != MSG_MAX; j++) - assertEquals(events.get(j + 1), SSEMessage.MESSAGE + j, - "Received unexpected message", events.get(j + 1)); + List expectedEvents = new ArrayList(); + for (int j = 0; j != MSG_MAX; j++) { + expectedEvents.add(SSEMessage.MESSAGE + j); } + for (int i = 0; i != CLIENTS; i++) { + List events = clients[i].getEvents(); + assertEquals(events.size(), MSG_MAX + 1, + "Received unexpected number of events", events.size()); + assertTrue(events.get(0).contains("WELCOME"), + "Received unexpected message"+ events.get(0)); + assertTrue(events.containsAll(expectedEvents), "An expected message was not received"); + } + setProperty(Property.REQUEST, buildRequest(Request.GET, "broadcast/check")); invoke(); String response = getResponseBody(); From 80a43af4bd0d0f544634b85279830d5c424d428b Mon Sep 17 00:00:00 2001 From: jim-krueger Date: Mon, 19 Feb 2024 15:40:04 -0600 Subject: [PATCH 11/13] Fix exclude list --- jaxrs-tck-docs/TCK-Exclude-List.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jaxrs-tck-docs/TCK-Exclude-List.txt b/jaxrs-tck-docs/TCK-Exclude-List.txt index db5d32412..33f0b777e 100644 --- a/jaxrs-tck-docs/TCK-Exclude-List.txt +++ b/jaxrs-tck-docs/TCK-Exclude-List.txt @@ -76,9 +76,6 @@ ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWi ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithStringCallbackWhileServerWaitTest ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithStringClassWhileServerWaitTest -# https://github.com/jakartaee/rest/issues/1162 -ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/ssebroadcaster/JAXRSClientIT.java#sseBroadcastTest - # # ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java#connectionLostForDefault500msTest @@ -158,6 +155,3 @@ ee/jakarta/tck/ws/rs/jaxrs21/ee/client/rxinvoker/JAXRSClientIT.java#traceWithGen # https://github.com/jakartaee/rest/issues/1138 ee/jakarta/tck/ws/rs/ee/rs/core/uriinfo/JAXRSClientIT#getNormalizedUriTest - -# https://github.com/jakartaee/rest/issues/1163 -ee/jakarta/tck/ws/rs/ee/rs/container/responsecontext/JAXRSClientIT#setEntityStreamTest \ No newline at end of file From 3ab4d7010f7ec2d9dedbed929ed0c8cfc3e0467b Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Thu, 22 Feb 2024 08:54:13 -0800 Subject: [PATCH 12/13] Update the signature test generation plugin and the signature test file to match the current signatures. Signed-off-by: James R. Perkins --- jaxrs-tck/pom.xml | 20 +++++------ .../rs/signaturetest/jakarta.ws.rs.sig_4.0.0 | 33 ++++++++++++++++++- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml index 425c13453..1d7f2ed0e 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml @@ -97,12 +97,6 @@ provided - - org.netbeans.tools - sigtest-maven-plugin - 1.4 - - org.junit.jupiter @@ -147,9 +141,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.4 + 2.2 @@ -158,10 +152,16 @@ - ${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version} + ${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 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 699589332..db05c75e2 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 @@ 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 @@ -857,6 +867,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 @@ -1114,6 +1126,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 +1137,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 +1213,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 +1228,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 +1652,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 +1757,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 +1817,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 +1840,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 +1874,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 +1886,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 +1981,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 +2026,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}) + From 954c314e1b2e624af2e39a3fb37810194e625a26 Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Mon, 26 Feb 2024 11:36:32 -0800 Subject: [PATCH 13/13] Add missing 2024 copyright year to changed files. Signed-off-by: James R. Perkins --- etc/config/checkstyle.xml | 2 +- examples/pom.xml | 2 +- examples/src/main/java/jaxrs/examples/client/BasicExamples.java | 2 +- .../src/main/java/jaxrs/examples/client/spec/SpecExamples.java | 2 +- .../main/java/jaxrs/examples/link/clusterservice/Cluster.java | 2 +- .../main/java/jaxrs/examples/link/clusterservice/Machine.java | 2 +- jaxrs-spec/pom.xml | 2 +- jaxrs-spec/src/main/asciidoc/chapters/introduction/_status.adoc | 2 +- jaxrs-tck-docs/userguide/pom.xml | 2 +- jaxrs-tck/pom.xml | 2 +- .../resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/config/checkstyle.xml b/etc/config/checkstyle.xml index 0eb5f57f8..2c3f6c8fd 100644 --- a/etc/config/checkstyle.xml +++ b/etc/config/checkstyle.xml @@ -1,7 +1,7 @@