From d985c589d6b49738c961244010e202b41ed7f2ab Mon Sep 17 00:00:00 2001 From: jansupol <15908245+jansupol@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:29:43 +0100 Subject: [PATCH] Preparation for 2.2.0 (#895) * Preparation for 2.2.0 Signed-off-by: jansupol --- archetypes/echo/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 6 ++-- archetypes/pom.xml | 2 +- bom/pom.xml | 2 +- bundles/client-jdk/pom.xml | 2 +- bundles/client/pom.xml | 2 +- bundles/pom.xml | 2 +- bundles/samples/pom.xml | 2 +- bundles/websocket-ri-archive/pom.xml | 2 +- bundles/websocket-ri-bundle/pom.xml | 2 +- bundles/websocket-risrc-licensee/pom.xml | 2 +- client/pom.xml | 2 +- containers/glassfish/cdi/pom.xml | 2 +- containers/glassfish/ejb/pom.xml | 2 +- containers/glassfish/pom.xml | 2 +- containers/grizzly-client/pom.xml | 2 +- containers/grizzly-server/pom.xml | 2 +- containers/inmemory/pom.xml | 2 +- containers/jdk-client/pom.xml | 2 +- containers/pom.xml | 2 +- containers/servlet/pom.xml | 2 +- core/pom.xml | 2 +- docs/pom.xml | 2 +- etc/jenkins/Jenkinsfile_ci_build | 26 ++++----------- ext/client-cli/pom.xml | 2 +- ext/client-java8/pom.xml | 2 +- ext/extension-deflate/pom.xml | 2 +- ext/monitoring-jmx/pom.xml | 2 +- ext/pom.xml | 2 +- pom.xml | 33 ++++++++++--------- samples/auction/pom.xml | 2 +- samples/cdi/pom.xml | 2 +- samples/chat/pom.xml | 2 +- samples/draw/pom.xml | 2 +- samples/echo-basic-auth/pom.xml | 2 +- samples/echo-https/pom.xml | 2 +- samples/echo/pom.xml | 2 +- samples/pom.xml | 2 +- samples/programmatic-echo/pom.xml | 2 +- samples/shared-collection/pom.xml | 2 +- samples/simplelife/pom.xml | 2 +- server/pom.xml | 2 +- spi/pom.xml | 2 +- tests/containers/jdk-client/pom.xml | 2 +- tests/containers/pom.xml | 2 +- tests/containers/servlet/pom.xml | 2 +- tests/e2e/application-config/pom.xml | 2 +- tests/e2e/jdk8/pom.xml | 2 +- tests/e2e/jetty/auth-basic/pom.xml | 2 +- tests/e2e/jetty/auth-digest/pom.xml | 2 +- tests/e2e/jetty/pom.xml | 2 +- tests/e2e/non-deployable/pom.xml | 2 +- tests/e2e/pom.xml | 2 +- tests/e2e/standard-config/pom.xml | 2 +- tests/pom.xml | 2 +- tests/qa/browser-test/pom.xml | 2 +- tests/qa/lifecycle-test/pom.xml | 2 +- tests/qa/pom.xml | 2 +- tests/release-test/pom.xml | 2 +- tests/servlet/async/pom.xml | 2 +- tests/servlet/autobahn-server/pom.xml | 2 +- tests/servlet/basic/pom.xml | 2 +- tests/servlet/debug/pom.xml | 2 +- tests/servlet/dynamic-deploy/pom.xml | 2 +- tests/servlet/embedded-glassfish-test/pom.xml | 6 ++-- tests/servlet/inject/pom.xml | 2 +- tests/servlet/maxsessions-per-app/pom.xml | 2 +- .../maxsessions-per-remoteaddr/pom.xml | 2 +- tests/servlet/mbean/pom.xml | 2 +- tests/servlet/noappconfig/pom.xml | 2 +- tests/servlet/oneappconfig/pom.xml | 2 +- tests/servlet/pom.xml | 16 +++++---- tests/servlet/remote-endpoint-timeout/pom.xml | 2 +- tests/servlet/session/pom.xml | 2 +- tests/servlet/twoappconfig/pom.xml | 2 +- tests/tools/pom.xml | 2 +- 76 files changed, 110 insertions(+), 119 deletions(-) diff --git a/archetypes/echo/pom.xml b/archetypes/echo/pom.xml index 05be9645..41fee98d 100644 --- a/archetypes/echo/pom.xml +++ b/archetypes/echo/pom.xml @@ -21,7 +21,7 @@ org.glassfish.tyrus.archetypes tyrus-archetypes-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/archetypes/echo/src/main/resources/archetype-resources/pom.xml b/archetypes/echo/src/main/resources/archetype-resources/pom.xml index d590616f..9801aa0c 100644 --- a/archetypes/echo/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/echo/src/main/resources/archetype-resources/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.plugin} + ${maven.compiler.plugin.version} true ${java.version} @@ -67,11 +67,11 @@ - 2.2.0-M1 + 2.2.0 11 ${project.version} UTF-8 - 3.11.0 + 3.11.0 3.4.0 diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1d9d4740..57a040b3 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT org.glassfish.tyrus.archetypes diff --git a/bom/pom.xml b/bom/pom.xml index 7d2f5452..ad467425 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -29,7 +29,7 @@ org.glassfish.tyrus tyrus-bom - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT pom Tyrus BOM diff --git a/bundles/client-jdk/pom.xml b/bundles/client-jdk/pom.xml index a8ce1a3e..d2ea5858 100644 --- a/bundles/client-jdk/pom.xml +++ b/bundles/client-jdk/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/bundles/client/pom.xml b/bundles/client/pom.xml index bc0fd497..638f428f 100644 --- a/bundles/client/pom.xml +++ b/bundles/client/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/bundles/pom.xml b/bundles/pom.xml index 37d2c8aa..f24cda1e 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT org.glassfish.tyrus.bundles diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml index 7020481d..315ce917 100644 --- a/bundles/samples/pom.xml +++ b/bundles/samples/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT tyrus-samples diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml index b172081a..97105d2f 100755 --- a/bundles/websocket-ri-archive/pom.xml +++ b/bundles/websocket-ri-archive/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT websocket-ri-archive diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml index 7afcbbd3..82bee98c 100755 --- a/bundles/websocket-ri-bundle/pom.xml +++ b/bundles/websocket-ri-bundle/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT websocket-ri-bundle diff --git a/bundles/websocket-risrc-licensee/pom.xml b/bundles/websocket-risrc-licensee/pom.xml index 63cd50ac..7660fa50 100755 --- a/bundles/websocket-risrc-licensee/pom.xml +++ b/bundles/websocket-risrc-licensee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.0.99-SNAPSHOT + 2.2.99-SNAPSHOT websocket-risrc-licensee diff --git a/client/pom.xml b/client/pom.xml index 56f8469d..33d9e987 100755 --- a/client/pom.xml +++ b/client/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml index f7002c85..5e07cfbd 100755 --- a/containers/glassfish/cdi/pom.xml +++ b/containers/glassfish/cdi/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-containers-glassfish-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT bundle diff --git a/containers/glassfish/ejb/pom.xml b/containers/glassfish/ejb/pom.xml index be041da8..5e905e44 100755 --- a/containers/glassfish/ejb/pom.xml +++ b/containers/glassfish/ejb/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-containers-glassfish-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT bundle diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml index 1b5766d8..19cf79fa 100755 --- a/containers/glassfish/pom.xml +++ b/containers/glassfish/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-containers-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/containers/grizzly-client/pom.xml b/containers/grizzly-client/pom.xml index 7b789022..f7006a0c 100755 --- a/containers/grizzly-client/pom.xml +++ b/containers/grizzly-client/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-containers-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT bundle diff --git a/containers/grizzly-server/pom.xml b/containers/grizzly-server/pom.xml index 39c4cdc1..177ce3b5 100755 --- a/containers/grizzly-server/pom.xml +++ b/containers/grizzly-server/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-containers-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT bundle diff --git a/containers/inmemory/pom.xml b/containers/inmemory/pom.xml index f4298b4b..7abb7c59 100644 --- a/containers/inmemory/pom.xml +++ b/containers/inmemory/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-containers-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT bundle diff --git a/containers/jdk-client/pom.xml b/containers/jdk-client/pom.xml index d225c23a..c8519977 100755 --- a/containers/jdk-client/pom.xml +++ b/containers/jdk-client/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-containers-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT bundle diff --git a/containers/pom.xml b/containers/pom.xml index 7828ba0a..a59b45ca 100755 --- a/containers/pom.xml +++ b/containers/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/containers/servlet/pom.xml b/containers/servlet/pom.xml index 4848e8c2..9929d839 100755 --- a/containers/servlet/pom.xml +++ b/containers/servlet/pom.xml @@ -21,7 +21,7 @@ org.glassfish.tyrus tyrus-containers-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 95be2bc0..9b4ea694 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index 8f5882e3..55090a75 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT tyrus-documentation diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index bc1fd896..f2306007 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -8,45 +8,31 @@ pipeline { stages { stage('Jersey build') { parallel { - stage('JDK 11 ') { + stage('JDK 17 ') { agent { label 'centos-7' } tools { - jdk 'openjdk-jdk11-latest' + jdk 'openjdk-jdk17-latest' maven 'apache-maven-latest' } steps { sh ''' - mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true + mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true -Pstaging ''' } } -// stage('JDK 13 ') { -// agent { -// label 'centos-7' -// } -// tools { -// jdk 'openjdk-jdk13-latest' -// maven 'apache-maven-latest' -// } -// steps { -// sh ''' -// mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true -// ''' -// } -// } - stage('JDK 17 ') { + stage('JDK 21 ') { agent { label 'centos-7' } tools { - jdk 'openjdk-jdk17-latest' + jdk 'openjdk-jdk21-latest' maven 'apache-maven-latest' } steps { sh ''' - mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true + mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true -Pstaging ''' } } diff --git a/ext/client-cli/pom.xml b/ext/client-cli/pom.xml index 0c6dee1b..88ad46ce 100644 --- a/ext/client-cli/pom.xml +++ b/ext/client-cli/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.ext tyrus-extensions-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/ext/client-java8/pom.xml b/ext/client-java8/pom.xml index c6ac84ac..1a8115be 100644 --- a/ext/client-java8/pom.xml +++ b/ext/client-java8/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.ext tyrus-extensions-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml index 44fe0a98..4bf0f81e 100644 --- a/ext/extension-deflate/pom.xml +++ b/ext/extension-deflate/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.ext tyrus-extensions-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml index 0ef99e3d..73ce5c3c 100644 --- a/ext/monitoring-jmx/pom.xml +++ b/ext/monitoring-jmx/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.ext tyrus-extensions-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT tyrus-monitoring-jmx diff --git a/ext/pom.xml b/ext/pom.xml index fca5b297..6daabf42 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index b8120a2a..231ad2bf 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT pom tyrus Tyrus is the reference implementation of Java API for WebSocket (JSR-356) @@ -101,25 +101,25 @@ - 2.2.0-M1 - - 3.0.0-M1 + 2.2.0 + 3.0.0 2.1.3 4.1.0.RC1 4.0.1 4.0.2 - 7.0.13 + 8.0.0-M3 2.0.1 - 4.0.1 - 4.0.4 + 4.0.2 + 4.0.5 2.14.5 2.1.3 - 1.1.5 - 6.1.0-M2 + 1.1.6 + 6.1.0 2.6.7 - 3.11.0 + 11 + 3.11.0 3.6.2 3.2.1 3.4.0 @@ -127,10 +127,10 @@ jakarta.websocket org.glassfish 0.0 - 2.1 - 2.1 + 2.2 + 2.2 11 - 2.1.0 + 2.2.0 0.0.0 ${api_package} @@ -138,7 +138,7 @@ org.glassfish.* - 2.1.1 + 2.2.0 ${spec_version}.99.b${build_number} ${new_impl_version}-b${build_number} ${spec_version}.99.b${build_number} @@ -382,9 +382,10 @@ org.apache.maven.plugins maven-compiler-plugin + ${maven.compiler.plugin.version} - 11 - 11 + ${java.version} + ${java.version} UTF-8 diff --git a/samples/auction/pom.xml b/samples/auction/pom.xml index 17fb59bb..a9e5f956 100755 --- a/samples/auction/pom.xml +++ b/samples/auction/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/cdi/pom.xml b/samples/cdi/pom.xml index 78cac466..16428449 100755 --- a/samples/cdi/pom.xml +++ b/samples/cdi/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/chat/pom.xml b/samples/chat/pom.xml index 01a98c8f..f5a85bbe 100755 --- a/samples/chat/pom.xml +++ b/samples/chat/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/draw/pom.xml b/samples/draw/pom.xml index c9479ad2..9b238661 100755 --- a/samples/draw/pom.xml +++ b/samples/draw/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/echo-basic-auth/pom.xml b/samples/echo-basic-auth/pom.xml index 46f764d5..9e584e0f 100755 --- a/samples/echo-basic-auth/pom.xml +++ b/samples/echo-basic-auth/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/echo-https/pom.xml b/samples/echo-https/pom.xml index 476add7a..35f0649d 100755 --- a/samples/echo-https/pom.xml +++ b/samples/echo-https/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml index 7d3b3952..10b7da11 100755 --- a/samples/echo/pom.xml +++ b/samples/echo/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/pom.xml b/samples/pom.xml index 048e73ea..1d256c87 100755 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -17,7 +17,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT org.glassfish.tyrus.samples diff --git a/samples/programmatic-echo/pom.xml b/samples/programmatic-echo/pom.xml index d4738e2a..a9757dcc 100755 --- a/samples/programmatic-echo/pom.xml +++ b/samples/programmatic-echo/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/shared-collection/pom.xml b/samples/shared-collection/pom.xml index 6886bad2..546120e3 100644 --- a/samples/shared-collection/pom.xml +++ b/samples/shared-collection/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/samples/simplelife/pom.xml b/samples/simplelife/pom.xml index 4cd6c992..a877e909 100755 --- a/samples/simplelife/pom.xml +++ b/samples/simplelife/pom.xml @@ -16,7 +16,7 @@ org.glassfish.tyrus.samples tyrus-samples-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/server/pom.xml b/server/pom.xml index 5e1c8653..e93c77d2 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/spi/pom.xml b/spi/pom.xml index a45a4025..9cb88317 100755 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/tests/containers/jdk-client/pom.xml b/tests/containers/jdk-client/pom.xml index 7e764e19..791718a0 100644 --- a/tests/containers/jdk-client/pom.xml +++ b/tests/containers/jdk-client/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-containers - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/containers/pom.xml b/tests/containers/pom.xml index 6277cb87..070b112c 100644 --- a/tests/containers/pom.xml +++ b/tests/containers/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT pom diff --git a/tests/containers/servlet/pom.xml b/tests/containers/servlet/pom.xml index 12ff9bf4..f0402e72 100644 --- a/tests/containers/servlet/pom.xml +++ b/tests/containers/servlet/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-containers - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/e2e/application-config/pom.xml b/tests/e2e/application-config/pom.xml index 062edb6b..24371dca 100755 --- a/tests/e2e/application-config/pom.xml +++ b/tests/e2e/application-config/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/e2e/jdk8/pom.xml b/tests/e2e/jdk8/pom.xml index d1f3806a..dd52127f 100644 --- a/tests/e2e/jdk8/pom.xml +++ b/tests/e2e/jdk8/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/e2e/jetty/auth-basic/pom.xml b/tests/e2e/jetty/auth-basic/pom.xml index 974993ed..b4acfe25 100644 --- a/tests/e2e/jetty/auth-basic/pom.xml +++ b/tests/e2e/jetty/auth-basic/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e-jetty - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT jar diff --git a/tests/e2e/jetty/auth-digest/pom.xml b/tests/e2e/jetty/auth-digest/pom.xml index a3a2793f..0f9285e1 100644 --- a/tests/e2e/jetty/auth-digest/pom.xml +++ b/tests/e2e/jetty/auth-digest/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e-jetty - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT jar diff --git a/tests/e2e/jetty/pom.xml b/tests/e2e/jetty/pom.xml index 795a0873..8da8d38a 100755 --- a/tests/e2e/jetty/pom.xml +++ b/tests/e2e/jetty/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT pom diff --git a/tests/e2e/non-deployable/pom.xml b/tests/e2e/non-deployable/pom.xml index d43bc547..f29971c2 100755 --- a/tests/e2e/non-deployable/pom.xml +++ b/tests/e2e/non-deployable/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml index 2a0995b2..b48dd772 100755 --- a/tests/e2e/pom.xml +++ b/tests/e2e/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT pom diff --git a/tests/e2e/standard-config/pom.xml b/tests/e2e/standard-config/pom.xml index a3268ab2..e98332fc 100755 --- a/tests/e2e/standard-config/pom.xml +++ b/tests/e2e/standard-config/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-e2e - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/pom.xml b/tests/pom.xml index 0d5f9047..686b0c02 100755 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT org.glassfish.tyrus.tests diff --git a/tests/qa/browser-test/pom.xml b/tests/qa/browser-test/pom.xml index 1de8a3c7..b69d5c6a 100755 --- a/tests/qa/browser-test/pom.xml +++ b/tests/qa/browser-test/pom.xml @@ -21,7 +21,7 @@ org.glassfish.tyrus.tests.qa tyrus-tests-qa-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/qa/lifecycle-test/pom.xml b/tests/qa/lifecycle-test/pom.xml index 5b1d92af..80fc70ac 100644 --- a/tests/qa/lifecycle-test/pom.xml +++ b/tests/qa/lifecycle-test/pom.xml @@ -21,7 +21,7 @@ org.glassfish.tyrus.tests.qa tyrus-tests-qa-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/qa/pom.xml b/tests/qa/pom.xml index 53ca9eed..2fe85e16 100644 --- a/tests/qa/pom.xml +++ b/tests/qa/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT org.glassfish.tyrus.tests.qa diff --git a/tests/release-test/pom.xml b/tests/release-test/pom.xml index 3f8099ee..3a257306 100644 --- a/tests/release-test/pom.xml +++ b/tests/release-test/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tyrus tyrus-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT ../../pom.xml diff --git a/tests/servlet/async/pom.xml b/tests/servlet/async/pom.xml index bf43769d..82f2dff1 100644 --- a/tests/servlet/async/pom.xml +++ b/tests/servlet/async/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/autobahn-server/pom.xml b/tests/servlet/autobahn-server/pom.xml index 68a46fb7..c6498f14 100644 --- a/tests/servlet/autobahn-server/pom.xml +++ b/tests/servlet/autobahn-server/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/basic/pom.xml b/tests/servlet/basic/pom.xml index a96d190f..3ee56b74 100644 --- a/tests/servlet/basic/pom.xml +++ b/tests/servlet/basic/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/debug/pom.xml b/tests/servlet/debug/pom.xml index 4456c536..769112e2 100644 --- a/tests/servlet/debug/pom.xml +++ b/tests/servlet/debug/pom.xml @@ -20,7 +20,7 @@ tyrus-tests-servlet-project org.glassfish.tyrus.tests.servlet - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0 diff --git a/tests/servlet/dynamic-deploy/pom.xml b/tests/servlet/dynamic-deploy/pom.xml index e0dd6b29..3172eeae 100644 --- a/tests/servlet/dynamic-deploy/pom.xml +++ b/tests/servlet/dynamic-deploy/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/embedded-glassfish-test/pom.xml b/tests/servlet/embedded-glassfish-test/pom.xml index 9c9d454d..7fcf3357 100644 --- a/tests/servlet/embedded-glassfish-test/pom.xml +++ b/tests/servlet/embedded-glassfish-test/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war @@ -31,7 +31,7 @@ Tyrus Servlet Tests on Glassfish - ${project.build.directory}/glassfish7 + ${project.build.directory}/glassfish8 ${glassfish.home}/glassfish/modules ${glassfish.version} @@ -304,7 +304,7 @@ org.apache.maven.plugins maven-compiler-plugin - 11 + ${java.version} diff --git a/tests/servlet/inject/pom.xml b/tests/servlet/inject/pom.xml index 91a00900..9d322433 100644 --- a/tests/servlet/inject/pom.xml +++ b/tests/servlet/inject/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/maxsessions-per-app/pom.xml b/tests/servlet/maxsessions-per-app/pom.xml index 1a15ba9d..d6322bcf 100755 --- a/tests/servlet/maxsessions-per-app/pom.xml +++ b/tests/servlet/maxsessions-per-app/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/maxsessions-per-remoteaddr/pom.xml b/tests/servlet/maxsessions-per-remoteaddr/pom.xml index 6c43763d..c7e392cb 100755 --- a/tests/servlet/maxsessions-per-remoteaddr/pom.xml +++ b/tests/servlet/maxsessions-per-remoteaddr/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/mbean/pom.xml b/tests/servlet/mbean/pom.xml index fd49a0d0..db381085 100644 --- a/tests/servlet/mbean/pom.xml +++ b/tests/servlet/mbean/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/noappconfig/pom.xml b/tests/servlet/noappconfig/pom.xml index 74c5c245..0113f5a1 100755 --- a/tests/servlet/noappconfig/pom.xml +++ b/tests/servlet/noappconfig/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/oneappconfig/pom.xml b/tests/servlet/oneappconfig/pom.xml index 9aef5ca7..0de0fab1 100755 --- a/tests/servlet/oneappconfig/pom.xml +++ b/tests/servlet/oneappconfig/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/pom.xml b/tests/servlet/pom.xml index 53dbc547..831f964c 100755 --- a/tests/servlet/pom.xml +++ b/tests/servlet/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT org.glassfish.tyrus.tests.servlet @@ -34,9 +34,6 @@ async autobahn-server basic - dynamic-deploy noappconfig oneappconfig @@ -50,6 +47,13 @@ debug - - + + + JDK21+ + [21,) + + embedded-glassfish-test + + + diff --git a/tests/servlet/remote-endpoint-timeout/pom.xml b/tests/servlet/remote-endpoint-timeout/pom.xml index 7d5b02fe..25cf9deb 100755 --- a/tests/servlet/remote-endpoint-timeout/pom.xml +++ b/tests/servlet/remote-endpoint-timeout/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/session/pom.xml b/tests/servlet/session/pom.xml index 0bc5de95..c9d3d1b5 100755 --- a/tests/servlet/session/pom.xml +++ b/tests/servlet/session/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/servlet/twoappconfig/pom.xml b/tests/servlet/twoappconfig/pom.xml index 8c6455ec..e1d40c28 100755 --- a/tests/servlet/twoappconfig/pom.xml +++ b/tests/servlet/twoappconfig/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT war diff --git a/tests/tools/pom.xml b/tests/tools/pom.xml index 70e1557c..b4fc8310 100755 --- a/tests/tools/pom.xml +++ b/tests/tools/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.tests tyrus-tests-project - 2.1.99-SNAPSHOT + 2.2.99-SNAPSHOT 4.0.0