diff --git a/.github/workflows/maven-package.yml b/.github/workflows/maven-package.yml index b3bfa858f..a70f370dd 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@v4 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 3951cdb96..b06d57814 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,195 +25,11 @@ 3.2.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 897207a92..b91280e22 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 - 3.2 - - - 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 27c504601..b0ade0768 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 55301d737..7b6add628 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 75fbff2f6..1fd7cdde9 100644 --- a/jaxrs-tck/pom.xml +++ b/jaxrs-tck/pom.xml @@ -34,132 +34,11 @@ 3.2.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 40ab972a0..b838f8b9a 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 421dfd929..6ed12eec1 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