diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml index da26f10805b..b3c1ebdf3cd 100644 --- a/bundles/jaxrs-ri/pom.xml +++ b/bundles/jaxrs-ri/pom.xml @@ -166,12 +166,12 @@ provided - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided @@ -180,14 +180,14 @@ provided - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api provided diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml index b0d60f6e85f..76d8d9f1d31 100644 --- a/containers/glassfish/jersey-gf-ejb/pom.xml +++ b/containers/glassfish/jersey-gf-ejb/pom.xml @@ -40,20 +40,20 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api ${ejb.version} provided - javax.interceptor - javax.interceptor-api + jakarta.interceptor + jakarta.interceptor-api ${javax.interceptor.version} provided org.glassfish.hk2.external - javax.inject + jakarta.inject provided diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml index 49e75e5da74..67a6cd4eeb5 100644 --- a/containers/grizzly2-http/pom.xml +++ b/containers/grizzly2-http/pom.xml @@ -35,7 +35,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject org.glassfish.grizzly diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml index caee66865ba..fd2dc6e212e 100644 --- a/containers/grizzly2-servlet/pom.xml +++ b/containers/grizzly2-servlet/pom.xml @@ -34,8 +34,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet4.version} diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml index 4bc5700c021..2cc2f48e2d5 100644 --- a/containers/jersey-servlet-core/pom.xml +++ b/containers/jersey-servlet-core/pom.xml @@ -34,18 +34,18 @@ - javax.servlet - servlet-api - ${servlet2.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.glassfish.hk2.external - javax.inject + jakarta.inject diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml index a9a66345515..31f63d18fab 100644 --- a/containers/jersey-servlet/pom.xml +++ b/containers/jersey-servlet/pom.xml @@ -34,9 +34,9 @@ - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided @@ -49,6 +49,10 @@ javax.servlet servlet-api + + jakarta.servlet + jakarta.servlet-api + diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml index eb3d0b8b826..58d9ce20fa0 100644 --- a/containers/jetty-http/pom.xml +++ b/containers/jetty-http/pom.xml @@ -35,7 +35,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject diff --git a/containers/netty-http/pom.xml b/containers/netty-http/pom.xml index beb0545de73..0faf9d2e15a 100644 --- a/containers/netty-http/pom.xml +++ b/containers/netty-http/pom.xml @@ -35,7 +35,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject org.glassfish.jersey.connectors diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml index e3bfb38e66d..5642f103387 100644 --- a/containers/simple-http/pom.xml +++ b/containers/simple-http/pom.xml @@ -35,7 +35,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject org.simpleframework diff --git a/core-client/pom.xml b/core-client/pom.xml index 798231eba6f..e8eb805a0cb 100644 --- a/core-client/pom.xml +++ b/core-client/pom.xml @@ -106,7 +106,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject diff --git a/core-common/pom.xml b/core-common/pom.xml index 5796421e94a..ea7c997ff7d 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -171,8 +171,8 @@ jakarta.ws.rs-api - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.osgi @@ -181,7 +181,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject org.glassfish.hk2 diff --git a/core-server/pom.xml b/core-server/pom.xml index 4d6dae03f7e..c8feb73a276 100644 --- a/core-server/pom.xml +++ b/core-server/pom.xml @@ -111,8 +111,8 @@ maven-jaxb-plugin - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb.api.version} @@ -178,13 +178,13 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.glassfish.hk2.external - javax.inject + jakarta.inject diff --git a/examples/bookmark-em/pom.xml b/examples/bookmark-em/pom.xml index e800535fd0a..41cc6c14323 100644 --- a/examples/bookmark-em/pom.xml +++ b/examples/bookmark-em/pom.xml @@ -34,8 +34,8 @@ jersey-media-json-jettison - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.glassfish.jersey.inject @@ -43,19 +43,19 @@ - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api ${ejb.version} provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api ${jta.api.version} provided diff --git a/examples/bookmark/pom.xml b/examples/bookmark/pom.xml index 4ebd3710ed4..306c4654113 100644 --- a/examples/bookmark/pom.xml +++ b/examples/bookmark/pom.xml @@ -34,16 +34,16 @@ jersey-media-json-jettison - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.glassfish.jersey.inject jersey-hk2 - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api ${jta.api.version} provided diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml index 10b81ffe8fa..cf1a1f9a639 100644 --- a/examples/bookstore-webapp/pom.xml +++ b/examples/bookstore-webapp/pom.xml @@ -54,13 +54,13 @@ jersey-hk2 - javax.servlet - servlet-api - ${servlet2.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} - javax.servlet - jstl + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api ${jstl.version} diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml index ff1d17a6759..0b2149e0473 100644 --- a/examples/cdi-webapp/pom.xml +++ b/examples/cdi-webapp/pom.xml @@ -40,8 +40,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided @@ -146,7 +146,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject provided diff --git a/examples/declarative-linking/pom.xml b/examples/declarative-linking/pom.xml index 692ce52b97f..43c1837ca01 100644 --- a/examples/declarative-linking/pom.xml +++ b/examples/declarative-linking/pom.xml @@ -45,13 +45,13 @@ - javax.el - javax.el-api + jakarta.el + jakarta.el-api org.glassfish - javax.el + jakarta.el diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java index 76b42926de5..0ac70091904 100644 --- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java +++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java @@ -94,10 +94,10 @@ public class ExtendedWadlWebappOsgiTest { public static Option[] configuration() { List - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java index c36dd819ecf..dd8974082fd 100644 --- a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java +++ b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java @@ -113,7 +113,7 @@ public List - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java index a6a20fd223e..e070b0a6737 100644 --- a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java +++ b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java @@ -83,7 +83,7 @@ public List - javax.servlet - servlet-api - ${servlet2.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml index 7808a58d8ec..4c1909ee48c 100644 --- a/ext/spring4/pom.xml +++ b/ext/spring4/pom.xml @@ -122,9 +122,9 @@ - javax.servlet - javax.servlet-api - 3.0.1 + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml index d2560bc6a90..837a1e96d77 100644 --- a/incubator/declarative-linking/pom.xml +++ b/incubator/declarative-linking/pom.xml @@ -49,13 +49,13 @@ - javax.el - javax.el-api + jakarta.el + jakarta.el-api provided org.glassfish - javax.el + jakarta.el provided diff --git a/incubator/html-json/pom.xml b/incubator/html-json/pom.xml index e2e2437c951..df44488b3fd 100644 --- a/incubator/html-json/pom.xml +++ b/incubator/html-json/pom.xml @@ -72,8 +72,8 @@ ${project.version} - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml index 47a181318ea..9a7ea8416d9 100644 --- a/media/jaxb/pom.xml +++ b/media/jaxb/pom.xml @@ -121,12 +121,12 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.glassfish.hk2.external - javax.inject + jakarta.inject org.glassfish.hk2 diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml index b8fe8d629d3..a458bb3881d 100644 --- a/media/json-binding/pom.xml +++ b/media/json-binding/pom.xml @@ -70,7 +70,8 @@ org.glassfish - javax.json + jakarta.json + ${jsonp.ri.version} @@ -83,12 +84,31 @@ javax.el el-api + + jakarta.el + jakarta.el-api + + + javax.json.bind + javax.json.bind-api + + + javax.json + javax.json-api + - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api + ${jsonb.api.version} + + + + jakarta.json + jakarta.json-api + ${jsonp.ri.version} diff --git a/media/json-processing/pom.xml b/media/json-processing/pom.xml index 60022e925ff..ac3de80e99e 100644 --- a/media/json-processing/pom.xml +++ b/media/json-processing/pom.xml @@ -77,7 +77,7 @@ org.glassfish - javax.json + jakarta.json org.glassfish diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml index afbb8f30fdd..92153b417d6 100644 --- a/media/moxy/pom.xml +++ b/media/moxy/pom.xml @@ -91,9 +91,31 @@ ${project.version} + + jakarta.json + jakarta.json-api + ${jsonp.ri.version} + + + + org.glassfish + jakarta.json + ${jsonp.ri.version} + + org.eclipse.persistence org.eclipse.persistence.moxy + + + javax.json + javax.json-api + + + jakarta.json + jakarta.json-api + + diff --git a/media/sse/pom.xml b/media/sse/pom.xml index be75d2665cb..16f9426d70c 100644 --- a/media/sse/pom.xml +++ b/media/sse/pom.xml @@ -37,7 +37,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject org.glassfish.jersey.core diff --git a/pom.xml b/pom.xml index b9550a676b7..235aecfad11 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.eclipse.ee4j project - 1.0.5 + 1.0.5 org.glassfish.jersey @@ -1365,8 +1365,8 @@ ${jaxrs.api.impl.version} - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api ${javax.annotation.version} @@ -1377,8 +1377,8 @@ - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api ${jta.api.version} @@ -1418,7 +1418,7 @@ org.glassfish.hk2.external - javax.inject + jakarta.inject ${hk2.version} @@ -1533,8 +1533,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb.api.version} @@ -1556,15 +1556,15 @@ - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api ${javax.persistence.version} provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api ${ejb.version} provided @@ -1672,19 +1672,19 @@ ${fasterxml.classmate.version} - javax.el - javax.el-api + jakarta.el + jakarta.el-api ${javax.el.version} org.glassfish - javax.el + jakarta.el ${javax.el.impl.version} org.glassfish - javax.json + jakarta.json ${jsonp.ri.version} @@ -1880,8 +1880,8 @@ - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api ${jsonb.api.version} @@ -1944,7 +1944,7 @@ 2.16 6.8.1 3.3 - 3.2.2 + 3.2.3 5.0 1.3.3 1.7 @@ -1953,26 +1953,26 @@ 1.9.59 1.6 1.13 - 2.4.0 + 2.4.4 18.0 1.3 1.6 - 2.5.0-b62 - 2.5.0-b56 + 2.5.0 + 5.1.0 4.5 2.9.6 1.9.13 3.22.0-GA - 1.3.2 + 1.3.4 1.3.2 - 3.0.1-b06 - 3.0.1-b09 - 1.2.2 - 1.0.2 + 3.0.2 + 3.0.2 + 1.2.3 + 2.2.2 2.0.1.Final - 2.3.1 - 2.3.1 - 1.0 + 2.3.2 + 2.3.2 + 1.0.1 2.1 2.1.3 3.3.0.Final @@ -1984,15 +1984,15 @@ 6.1.14 1.10.2 1.41 - 1.1 - 1.1.2 - 2.3.3 - 1.2 - 1.3 + 1.1.5 + 1.1.5 + 2.3.4 + 1.2.3 + 1.3.1 4.0.1 1.9.7 1.10.19 - 2.6.4 + 2.7.3 0.8.17 4.1.5.Final 1.6.7 @@ -2005,7 +2005,7 @@ 2.0.4 2.4 3.0.1 - 4.0.1 + 4.0.2 6.0.1 1.7.21 4.3.8.RELEASE @@ -2013,7 +2013,7 @@ 2.2.14.Final 3.0.0.Final 2.11.0 - 1.0.1 + 1.0.3 false diff --git a/test-framework/core/pom.xml b/test-framework/core/pom.xml index b86a91ff185..2667a59f37e 100644 --- a/test-framework/core/pom.xml +++ b/test-framework/core/pom.xml @@ -44,9 +44,9 @@ ${project.version} - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} org.glassfish.jersey.core diff --git a/test-framework/providers/grizzly2/pom.xml b/test-framework/providers/grizzly2/pom.xml index 9be48a0c033..e8ee3b37960 100644 --- a/test-framework/providers/grizzly2/pom.xml +++ b/test-framework/providers/grizzly2/pom.xml @@ -34,8 +34,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet4.version} diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index 741446508f2..b3b178d2615 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml @@ -55,8 +55,8 @@ test - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/tests/e2e-entity/pom.xml b/tests/e2e-entity/pom.xml index 335d5f53c92..a02ef838660 100644 --- a/tests/e2e-entity/pom.xml +++ b/tests/e2e-entity/pom.xml @@ -55,8 +55,8 @@ test - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml index 00fe51cf709..14b6e0f1e69 100644 --- a/tests/e2e-server/pom.xml +++ b/tests/e2e-server/pom.xml @@ -55,8 +55,8 @@ test - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml index 223c51f9569..250adbada22 100644 --- a/tests/e2e/pom.xml +++ b/tests/e2e/pom.xml @@ -55,8 +55,8 @@ test - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml index da8cd9bd93b..e144c60ec06 100644 --- a/tests/integration/async-jersey-filter/pom.xml +++ b/tests/integration/async-jersey-filter/pom.xml @@ -47,9 +47,9 @@ test - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/integration/cdi-beanvalidation-webapp/pom.xml b/tests/integration/cdi-beanvalidation-webapp/pom.xml index 6f7defe0e5f..bb00e3fdaaf 100644 --- a/tests/integration/cdi-beanvalidation-webapp/pom.xml +++ b/tests/integration/cdi-beanvalidation-webapp/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/cdi-ejb-test-webapp/pom.xml b/tests/integration/cdi-ejb-test-webapp/pom.xml index 85dc5a7dbad..bf62d47643c 100644 --- a/tests/integration/cdi-ejb-test-webapp/pom.xml +++ b/tests/integration/cdi-ejb-test-webapp/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided @@ -48,8 +48,8 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided diff --git a/tests/integration/cdi-multimodule/lib/pom.xml b/tests/integration/cdi-multimodule/lib/pom.xml index 21d5a1e009d..8b291f17656 100644 --- a/tests/integration/cdi-multimodule/lib/pom.xml +++ b/tests/integration/cdi-multimodule/lib/pom.xml @@ -38,8 +38,8 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided @@ -48,8 +48,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/cdi-multimodule/war1/pom.xml b/tests/integration/cdi-multimodule/war1/pom.xml index 4d1fd7b4057..697adc6b9df 100644 --- a/tests/integration/cdi-multimodule/war1/pom.xml +++ b/tests/integration/cdi-multimodule/war1/pom.xml @@ -38,9 +38,9 @@ provided - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/integration/cdi-multipart-webapp/pom.xml b/tests/integration/cdi-multipart-webapp/pom.xml index 55985beeb30..0255db1c36b 100644 --- a/tests/integration/cdi-multipart-webapp/pom.xml +++ b/tests/integration/cdi-multipart-webapp/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/cdi-test-webapp/pom.xml b/tests/integration/cdi-test-webapp/pom.xml index fc592e8ee79..3b36bf35848 100644 --- a/tests/integration/cdi-test-webapp/pom.xml +++ b/tests/integration/cdi-test-webapp/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml index a491ec4f16a..cc04744c219 100644 --- a/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml +++ b/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml @@ -52,13 +52,13 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api provided diff --git a/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml index 92c426ef938..16a2ff900c9 100644 --- a/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml +++ b/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml @@ -45,8 +45,8 @@ provided - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api provided @@ -70,8 +70,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/cdi-with-jersey-injection-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-webapp/pom.xml index d0e0c42559c..c22f1402ea9 100644 --- a/tests/integration/cdi-with-jersey-injection-webapp/pom.xml +++ b/tests/integration/cdi-with-jersey-injection-webapp/pom.xml @@ -48,8 +48,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/client-connector-provider/pom.xml b/tests/integration/client-connector-provider/pom.xml index d68560c4cda..20776e3a18d 100644 --- a/tests/integration/client-connector-provider/pom.xml +++ b/tests/integration/client-connector-provider/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/ejb-multimodule-reload/lib/pom.xml b/tests/integration/ejb-multimodule-reload/lib/pom.xml index 7810fc25c66..40a56321373 100644 --- a/tests/integration/ejb-multimodule-reload/lib/pom.xml +++ b/tests/integration/ejb-multimodule-reload/lib/pom.xml @@ -43,13 +43,13 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/ejb-multimodule-reload/war1/pom.xml b/tests/integration/ejb-multimodule-reload/war1/pom.xml index 1ece93790d1..34aae10ef50 100644 --- a/tests/integration/ejb-multimodule-reload/war1/pom.xml +++ b/tests/integration/ejb-multimodule-reload/war1/pom.xml @@ -49,12 +49,12 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api org.glassfish.hk2.external - javax.inject + jakarta.inject javax.inject diff --git a/tests/integration/ejb-multimodule-reload/war2/pom.xml b/tests/integration/ejb-multimodule-reload/war2/pom.xml index d94fa5ec765..f6828a02d72 100644 --- a/tests/integration/ejb-multimodule-reload/war2/pom.xml +++ b/tests/integration/ejb-multimodule-reload/war2/pom.xml @@ -44,8 +44,8 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api org.glassfish.jersey.test-framework.providers diff --git a/tests/integration/ejb-multimodule/lib/pom.xml b/tests/integration/ejb-multimodule/lib/pom.xml index bf067013c0e..f60c201fb99 100644 --- a/tests/integration/ejb-multimodule/lib/pom.xml +++ b/tests/integration/ejb-multimodule/lib/pom.xml @@ -38,13 +38,13 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/ejb-multimodule/war/pom.xml b/tests/integration/ejb-multimodule/war/pom.xml index 794c38fa72c..b8bc406893d 100644 --- a/tests/integration/ejb-multimodule/war/pom.xml +++ b/tests/integration/ejb-multimodule/war/pom.xml @@ -44,8 +44,8 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api org.glassfish.jersey.test-framework.providers diff --git a/tests/integration/ejb-test-webapp/pom.xml b/tests/integration/ejb-test-webapp/pom.xml index a691de67cc0..dedb68119a6 100644 --- a/tests/integration/ejb-test-webapp/pom.xml +++ b/tests/integration/ejb-test-webapp/pom.xml @@ -38,19 +38,19 @@ provided - javax.servlet - javax.servlet-api - 3.1-b07 + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml index 710e2e40ac8..26ce6ec051f 100644 --- a/tests/integration/j-376/pom.xml +++ b/tests/integration/j-376/pom.xml @@ -50,8 +50,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api diff --git a/tests/integration/j-59/lib/pom.xml b/tests/integration/j-59/lib/pom.xml index ffc43a6c6d5..04e6fce95e6 100644 --- a/tests/integration/j-59/lib/pom.xml +++ b/tests/integration/j-59/lib/pom.xml @@ -38,13 +38,13 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided diff --git a/tests/integration/jersey-2137/pom.xml b/tests/integration/jersey-2137/pom.xml index 0114c5aaef5..183fb9fb25c 100644 --- a/tests/integration/jersey-2137/pom.xml +++ b/tests/integration/jersey-2137/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided @@ -48,13 +48,13 @@ provided - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api provided - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api provided diff --git a/tests/integration/jersey-2154/pom.xml b/tests/integration/jersey-2154/pom.xml index faf5e55afcd..090d1b3452e 100644 --- a/tests/integration/jersey-2154/pom.xml +++ b/tests/integration/jersey-2154/pom.xml @@ -38,8 +38,8 @@ provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided @@ -48,8 +48,8 @@ provided - javax.ejb - javax.ejb-api + jakarta.ejb + jakarta.ejb-api provided diff --git a/tests/integration/servlet-request-wrapper-binding-2/pom.xml b/tests/integration/servlet-request-wrapper-binding-2/pom.xml index b47561b2ccb..bc53aaf2e77 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding-2/pom.xml @@ -42,9 +42,9 @@ jersey-servlet-portability - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java index db50a72b616..e2afcf10c11 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java +++ b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.function.Supplier; +import javax.servlet.http.HttpUpgradeHandler; import javax.ws.rs.core.GenericType; import javax.inject.Inject; @@ -401,6 +402,11 @@ public void setContentLength(int i) { getHttpServletResponse().setContentLength(i); } + @Override + public void setContentLengthLong(long length) { + getHttpServletResponse().setContentLengthLong(length); + } + @Override public void setContentType(String s) { getHttpServletResponse().setContentType(s); @@ -825,6 +831,21 @@ public void logout() throws ServletException { public void login(String u, String p) throws ServletException { getHttpServletRequest().login(u, p); } + + @Override + public String changeSessionId() { + return getHttpServletRequest().changeSessionId(); + } + + @Override + public long getContentLengthLong() { + return getHttpServletRequest().getContentLengthLong(); + } + + @Override + public T upgrade(Class aClass) throws IOException, ServletException { + return getHttpServletRequest().upgrade(aClass); + } } private static ServiceLocator getServiceLocator(InjectionManager injectionManager) { diff --git a/tests/integration/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml index 8e869c4758e..722a2debbcd 100644 --- a/tests/integration/servlet-request-wrapper-binding/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding/pom.xml @@ -42,9 +42,9 @@ jersey-servlet-portability - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/integration/spring4/pom.xml b/tests/integration/spring4/pom.xml index 9333385bc59..668a299c670 100644 --- a/tests/integration/spring4/pom.xml +++ b/tests/integration/spring4/pom.xml @@ -39,9 +39,9 @@ - javax.servlet - servlet-api - ${servlet2.version} + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml index f6f924b8b06..bbc277b8f73 100644 --- a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml +++ b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml @@ -123,9 +123,9 @@ - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml index 79188dfba81..10bd0dfd3cd 100644 --- a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml +++ b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml @@ -104,9 +104,9 @@ - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + ${servlet4.version} provided diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index 370de6d7d2c..6aeb7c2fece 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml @@ -96,8 +96,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test @@ -290,12 +290,12 @@ org.glassfish - javax.el + jakarta.el test org.glassfish - javax.json + jakarta.json test @@ -372,8 +372,14 @@ test - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api + test + + + com.sun.activation + jakarta.activation + 1.2.1 test diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java index 4f299aeb248..b054698c8e5 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java @@ -71,7 +71,7 @@ public static Option[] configuration() { mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").versionAsInProject(), mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").versionAsInProject(), mavenBundle().groupId("com.fasterxml").artifactId("classmate").versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("javax.el").versionAsInProject() + mavenBundle().groupId("org.glassfish").artifactId("jakarta.el").versionAsInProject() )); options = Helper.addPaxExamMavenLocalRepositoryProperty(options); diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java index 2f1a340d391..c0bf924b96a 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java @@ -57,13 +57,13 @@ public static Option[] configuration() { mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.moxy").versionAsInProject(), mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.core").versionAsInProject(), mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.asm").versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject(), + mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(), // validation mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").versionAsInProject(), mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").versionAsInProject(), mavenBundle().groupId("com.fasterxml").artifactId("classmate").versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("javax.el").versionAsInProject() + mavenBundle().groupId("org.glassfish").artifactId("jakarta.el").versionAsInProject() )); return Helper.asArray(options); diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java index 6ab4c5697ed..5369d8b692a 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java @@ -69,7 +69,7 @@ public static Option[] configuration() { // JSON processing. mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-processing") .versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject(), + mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(), mavenBundle().groupId("org.glassfish").artifactId("jsonp-jaxrs").versionAsInProject() )); diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java index 48480b2a2db..dbc299cb726 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java @@ -67,7 +67,7 @@ public static Option[] configuration() { mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-sse").versionAsInProject(), - mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject(), + mavenBundle().groupId("jakarta.servlet").artifactId("jakarta.servlet-api").versionAsInProject(), mavenBundle().groupId("org.glassfish.grizzly").artifactId("grizzly-http-servlet").versionAsInProject(), mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core") .versionAsInProject(), @@ -75,7 +75,7 @@ public static Option[] configuration() { .versionAsInProject(), // MBR/MBW for JSON-P is on the classpath. - mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject() + mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject() )); options = Helper.addPaxExamMavenLocalRepositoryProperty(options); diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java index 067fa8b8acf..f377ae7370c 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java @@ -129,7 +129,7 @@ public static List