From c81fc8fb23202ab8fc08d92630ea9e06bcf188d6 Mon Sep 17 00:00:00 2001 From: jbescos Date: Fri, 19 Aug 2022 13:17:02 +0200 Subject: [PATCH 1/3] Support JDK19 Signed-off-by: Jorge Bescos Gascon --- etc/jenkins/Jenkinsfile_ci_build | 4 ++-- examples/groovy/pom.xml | 2 +- tests/integration/property-check/pom.xml | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 7c3f9ff093..a42997b475 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -32,12 +32,12 @@ pipeline { ''' } } - stage('JDK 16 ') { + stage('JDK 19 ') { agent { label 'centos-7' } tools { - jdk 'openjdk-jdk16-latest' + jdk 'openjdk-jdk19-latest' maven 'apache-maven-latest' } steps { diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml index 568f867b3e..e6b1ca883c 100644 --- a/examples/groovy/pom.xml +++ b/examples/groovy/pom.xml @@ -28,7 +28,7 @@ org.apache.groovy groovy-all pom - 4.0.0-alpha-3 + 4.0.4 org.glassfish.jersey.test-framework.providers diff --git a/tests/integration/property-check/pom.xml b/tests/integration/property-check/pom.xml index abe4c82cc0..ec5920e491 100644 --- a/tests/integration/property-check/pom.xml +++ b/tests/integration/property-check/pom.xml @@ -109,4 +109,28 @@ + + + + jdk19+ + + [19,) + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/SystemPropertiesConfigurationModelTest.java + + + + + + + + From f0754eb2888ab85901f14c0b8b17c4eaa4e553ac Mon Sep 17 00:00:00 2001 From: jansupol <15908245+jansupol@users.noreply.github.com> Date: Fri, 26 Aug 2022 15:34:00 +0200 Subject: [PATCH 2/3] Fix OSGi headers for CDI & MP Jersey modules to be compatible with EE8 (#5122) Signed-off-by: jansupol --- ext/bean-validation/pom.xml | 1 + ext/cdi/jersey-cdi-rs-inject/pom.xml | 14 + ext/cdi/jersey-cdi1x-servlet/pom.xml | 4 + ext/cdi/jersey-cdi1x-transaction/pom.xml | 6 +- ext/cdi/jersey-cdi1x-validation/pom.xml | 6 +- ext/cdi/jersey-cdi1x/pom.xml | 1 + ext/microprofile/mp-rest-client/pom.xml | 2 + incubator/cdi-inject-weld/pom.xml | 3 +- inject/cdi2-se/pom.xml | 1 + pom.xml | 1 + .../gf-cdi-inject/arquillian.xml | 30 ++ .../cdi-integration/gf-cdi-inject/pom.xml | 375 ++++++++++++++++++ .../jersey/tests/cdi/gf/GFTestApp.java | 28 ++ .../jersey/tests/cdi/gf/GFTestResource.java | 37 ++ .../glassfish/jersey/tests/cdi/gf/GFTest.java | 58 +++ tests/integration/cdi-integration/pom.xml | 11 + 16 files changed, 575 insertions(+), 3 deletions(-) create mode 100644 tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml create mode 100644 tests/integration/cdi-integration/gf-cdi-inject/pom.xml create mode 100644 tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java create mode 100644 tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java create mode 100644 tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml index 00e1ab187e..51d88bf197 100644 --- a/ext/bean-validation/pom.xml +++ b/ext/bean-validation/pom.xml @@ -57,6 +57,7 @@ org.glassfish.jersey.server.validation.*;version=${project.version} ${javax.annotation.osgi.version}, + ${cdi.osgi.version}, javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}", * diff --git a/ext/cdi/jersey-cdi-rs-inject/pom.xml b/ext/cdi/jersey-cdi-rs-inject/pom.xml index f9748482ec..705c979c40 100644 --- a/ext/cdi/jersey-cdi-rs-inject/pom.xml +++ b/ext/cdi/jersey-cdi-rs-inject/pom.xml @@ -56,6 +56,20 @@ package + + org.apache.felix + maven-bundle-plugin + true + true + + + + ${cdi.osgi.version}, + * + + + + diff --git a/ext/cdi/jersey-cdi1x-servlet/pom.xml b/ext/cdi/jersey-cdi1x-servlet/pom.xml index d6ff4ccdbf..a18ea12b54 100644 --- a/ext/cdi/jersey-cdi1x-servlet/pom.xml +++ b/ext/cdi/jersey-cdi1x-servlet/pom.xml @@ -92,6 +92,10 @@ org.glassfish.jersey.ext.cdi1x.servlet.internal + + ${cdi.osgi.version}, + * + diff --git a/ext/cdi/jersey-cdi1x-transaction/pom.xml b/ext/cdi/jersey-cdi1x-transaction/pom.xml index b5fa91b2c5..7d78cc07d8 100644 --- a/ext/cdi/jersey-cdi1x-transaction/pom.xml +++ b/ext/cdi/jersey-cdi1x-transaction/pom.xml @@ -91,7 +91,11 @@ org.glassfish.jersey.ext.cdi1x.transaction.internal - ${javax.annotation.osgi.version},* + + ${javax.annotation.osgi.version}, + ${cdi.osgi.version}, + * + diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml index b4feba74de..85f6771a3d 100644 --- a/ext/cdi/jersey-cdi1x-validation/pom.xml +++ b/ext/cdi/jersey-cdi1x-validation/pom.xml @@ -103,7 +103,11 @@ org.glassfish.jersey.ext.cdi1x.validation.internal;version=${project.version} - ${javax.annotation.osgi.version},* + + ${javax.annotation.osgi.version}, + ${cdi.osgi.version}, + * + diff --git a/ext/cdi/jersey-cdi1x/pom.xml b/ext/cdi/jersey-cdi1x/pom.xml index 98f00bba3c..dfe9675d1d 100644 --- a/ext/cdi/jersey-cdi1x/pom.xml +++ b/ext/cdi/jersey-cdi1x/pom.xml @@ -87,6 +87,7 @@ ${javax.annotation.osgi.version}, ${hk2.osgi.version}, + ${cdi.osgi.version}, * diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml index 2261e3aff2..62001d9fbf 100644 --- a/ext/microprofile/mp-rest-client/pom.xml +++ b/ext/microprofile/mp-rest-client/pom.xml @@ -114,6 +114,8 @@ org.glassfish.jersey.restclient.*;version=${project.version} + ${cdi.osgi.version}, + org.eclipse.microprofile.rest.client.*;version="[1,3)", * diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml index 60722a5d1c..2eb3cf78c1 100644 --- a/incubator/cdi-inject-weld/pom.xml +++ b/incubator/cdi-inject-weld/pom.xml @@ -123,7 +123,8 @@ sun.misc.*;resolution:=optional, - ${jakarta.annotation.osgi.version}, + ${cdi.osgi.version}, + ${javax.annotation.osgi.version}, * diff --git a/inject/cdi2-se/pom.xml b/inject/cdi2-se/pom.xml index ce8bf78089..060d0c2534 100644 --- a/inject/cdi2-se/pom.xml +++ b/inject/cdi2-se/pom.xml @@ -87,6 +87,7 @@ sun.misc.*;resolution:=optional, + ${cdi.osgi.version}, ${javax.annotation.osgi.version}, * diff --git a/pom.xml b/pom.xml index dbc23b898a..71b31037e5 100644 --- a/pom.xml +++ b/pom.xml @@ -2207,6 +2207,7 @@ 1.2 2.0.2 + javax.enterprise.*;version="[1,3)" 3.2.6 5.1.0 1.16 diff --git a/tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml b/tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml new file mode 100644 index 0000000000..edfddfb4b5 --- /dev/null +++ b/tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml @@ -0,0 +1,30 @@ + + + + + + + true + + + + \ No newline at end of file diff --git a/tests/integration/cdi-integration/gf-cdi-inject/pom.xml b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml new file mode 100644 index 0000000000..c9bb4289a4 --- /dev/null +++ b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml @@ -0,0 +1,375 @@ + + + + + 4.0.0 + + org.glassfish.jersey.tests.integration.cdi + cdi-integration-project + 2.37-SNAPSHOT + + + gf-cdi-inject-on-server + jersey-tests-glassfish-inject-on-server + + Embedded GF tests @Inject + + + ${project.build.directory}/payara5 + ${glassfish.home}/glassfish/modules + ${gf.impl.version} + 5.7.2 + + + + + org.junit.jupiter + junit-jupiter + ${junit.jupiter.version} + test + + + + + + + + + + org.omnifaces.arquillian + arquillian-glassfish-server-managed + 1.2 + test + + + + jakarta.ws.rs + jakarta.ws.rs-api + + + + org.hamcrest + hamcrest + test + + + + org.glassfish.main.common + simple-glassfish-api + ${glassfish.container.version} + test + + + + org.jboss.arquillian.junit5 + arquillian-junit5-container + 1.7.0.Alpha10 + test + + + + org.glassfish.jersey.core + jersey-server + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + process-test-classes + + unpack + + + + + + + fish.payara.distributions + payara + 5.2022.2 + zip + false + ${project.build.directory} + + + + + + copy + process-test-classes + + copy + + + + + org.glassfish.jersey.ext + jersey-bean-validation + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-bean-validation.jar + + + org.glassfish.jersey.ext.cdi + jersey-cdi1x + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-cdi1x.jar + + + org.glassfish.jersey.ext.cdi + jersey-cdi1x-servlet + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-cdi1x-servlet.jar + + + org.glassfish.jersey.ext.cdi + jersey-cdi1x-transaction + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-cdi1x-transaction.jar + + + org.glassfish.jersey.ext.cdi + jersey-cdi-rs-inject + ${jersey.version} + jar + ${glassfish.home}/glassfish/modules + jersey-cdi-rs-inject.jar + + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-client.jar + + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-common.jar + + + org.glassfish.jersey.containers + jersey-container-grizzly2-http + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-container-grizzly2-http.jar + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-container-servlet.jar + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-container-servlet-core.jar + + + org.glassfish.jersey.ext + jersey-entity-filtering + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-entity-filtering.jar + + + org.glassfish.jersey.containers.glassfish + jersey-gf-ejb + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-gf-ejb.jar + + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-hk2.jar + + + org.glassfish.jersey.media + jersey-media-jaxb + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-media-jaxb.jar + + + org.glassfish.jersey.media + jersey-media-json-binding + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-media-json-binding.jar + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-media-json-jackson.jar + + + org.glassfish.jersey.media + jersey-media-json-processing + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-media-json-processing.jar + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-media-multipart.jar + + + org.glassfish.jersey.media + jersey-media-sse + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-media-sse.jar + + + org.glassfish.jersey.ext.microprofile + jersey-mp-rest-client + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-mp-rest-client.jar + + + org.glassfish.jersey.ext + jersey-mvc + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-mvc.jar + + + org.glassfish.jersey.ext + jersey-mvc-jsp + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-mvc-jsp.jar + + + org.glassfish.jersey.ext + jersey-proxy-client + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-proxy-client.jar + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + jar + true + ${glassfish.home}/glassfish/modules + jersey-server.jar + + + jakarta.ws.rs + jakarta.ws.rs-api + jar + true + ${glassfish.home}/glassfish/modules + jakarta.ws.rs-api.jar + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/GFTest.java + + org.glassfish.jersey.tests.integration.cdi:gf-cdi-inject-on-server + + ${glassfish.home} + 8080 + true + + + ${glassfish.home} + + + + + + \ No newline at end of file diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java new file mode 100644 index 0000000000..0d77c95489 --- /dev/null +++ b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2022 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 + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.glassfish.jersey.tests.cdi.gf; + +import org.glassfish.jersey.server.ResourceConfig; + +import javax.ws.rs.ApplicationPath; + +@ApplicationPath("/test") +public class GFTestApp extends ResourceConfig { + public GFTestApp() { + super(GFTestResource.class); + } +} diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java new file mode 100644 index 0000000000..8e39cc8aea --- /dev/null +++ b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2022 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 + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.glassfish.jersey.tests.cdi.gf; + +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; + +@Path("/") +public class GFTestResource { + @Inject + UriInfo uriInfo; + + @GET + @Path("info") + @Produces(MediaType.TEXT_PLAIN) + public String info() { + return uriInfo.getBaseUri().toASCIIString(); + } +} diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java b/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java new file mode 100644 index 0000000000..da49a8b447 --- /dev/null +++ b/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2022 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 + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.glassfish.jersey.tests.cdi.gf; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.core.Response; +import java.io.IOException; + +@ExtendWith(ArquillianExtension.class) +public class GFTest { + @Deployment(testable = false) + public static WebArchive createDeployment() throws IOException { + return createDeployment( + "gf-test", + GFTestApp.class, + GFTestResource.class + ); + } + + private static WebArchive createDeployment(String archiveName, Class...classes) { + WebArchive archive = ShrinkWrap.create(WebArchive.class, archiveName + ".war"); + archive.addClasses(classes); + return archive; + } + + @Test + public void testUriInfo() { + int port = Integer.parseInt(System.getProperty("webServerPort")); + try (Response response = ClientBuilder.newClient().target("http://localhost:" + port).path("gf-test/test/info").request().get()) { + String entity = response.readEntity(String.class); + System.out.println(entity); + Assertions.assertEquals(200, response.getStatus()); + Assertions.assertTrue(entity.contains("gf-test/test")); + } + } +} diff --git a/tests/integration/cdi-integration/pom.xml b/tests/integration/cdi-integration/pom.xml index b164acb1d1..36b5a6ae65 100644 --- a/tests/integration/cdi-integration/pom.xml +++ b/tests/integration/cdi-integration/pom.xml @@ -61,4 +61,15 @@ + + + gf-inject + + [11,16) + + + gf-cdi-inject + + + From 07463484c75a7e68108b5d87c12a741261db54c9 Mon Sep 17 00:00:00 2001 From: jansupol Date: Fri, 26 Aug 2022 22:57:11 +0200 Subject: [PATCH 3/3] Updated gf-cdi integration test for 3.x Signed-off-by: jansupol --- ext/bean-validation/pom.xml | 2 +- ext/microprofile/mp-rest-client/pom.xml | 2 +- .../cdi-integration/gf-cdi-inject/pom.xml | 28 +++++++------------ .../jersey/tests/cdi/gf/GFTestApp.java | 4 ++- .../jersey/tests/cdi/gf/GFTestResource.java | 12 ++++---- .../glassfish/jersey/tests/cdi/gf/GFTest.java | 4 +-- tests/integration/cdi-integration/pom.xml | 2 +- 7 files changed, 24 insertions(+), 30 deletions(-) diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml index 82a32c600a..914251e428 100644 --- a/ext/bean-validation/pom.xml +++ b/ext/bean-validation/pom.xml @@ -58,7 +58,7 @@ ${jakarta.annotation.osgi.version}, ${cdi.osgi.version}, - jakarta.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}", + jakarta.validation.*;resolution:=optional;version="${range;[==,4);${jakarta.validation.api.version}}", * diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml index 8c01379d7b..c85a4b0ff9 100644 --- a/ext/microprofile/mp-rest-client/pom.xml +++ b/ext/microprofile/mp-rest-client/pom.xml @@ -112,7 +112,7 @@ org.glassfish.jersey.microprofile.restclient.*;version=${project.version} - gf-cdi-inject-on-server, + ${cdi.osgi.version}, jakarta.decorator.*;version="[3.0,5)", org.eclipse.microprofile.config.*;version="!", * diff --git a/tests/integration/cdi-integration/gf-cdi-inject/pom.xml b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml index c9bb4289a4..7228461549 100644 --- a/tests/integration/cdi-integration/gf-cdi-inject/pom.xml +++ b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml @@ -22,7 +22,7 @@ org.glassfish.jersey.tests.integration.cdi cdi-integration-project - 2.37-SNAPSHOT + 3.0.99-SNAPSHOT gf-cdi-inject-on-server @@ -31,10 +31,10 @@ Embedded GF tests @Inject - ${project.build.directory}/payara5 + ${project.build.directory}/glassfish6 ${glassfish.home}/glassfish/modules ${gf.impl.version} - 5.7.2 + ${junit5.version} @@ -45,19 +45,13 @@ test - - - - - - - org.omnifaces.arquillian - arquillian-glassfish-server-managed - 1.2 - test + org.jboss.arquillian.container + arquillian-glassfish-managed-6 + 1.0.0.Alpha1 + jakarta.ws.rs jakarta.ws.rs-api @@ -104,11 +98,9 @@ - - - fish.payara.distributions - payara - 5.2022.2 + org.glassfish.main.distributions + glassfish + ${gf.impl.version} zip false ${project.build.directory} diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java index 0d77c95489..116e9230db 100644 --- a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java +++ b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestApp.java @@ -16,13 +16,15 @@ package org.glassfish.jersey.tests.cdi.gf; +import org.glassfish.jersey.CommonProperties; import org.glassfish.jersey.server.ResourceConfig; -import javax.ws.rs.ApplicationPath; +import jakarta.ws.rs.ApplicationPath; @ApplicationPath("/test") public class GFTestApp extends ResourceConfig { public GFTestApp() { super(GFTestResource.class); + property(CommonProperties.PROVIDER_DEFAULT_DISABLE, "ALL"); } } diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java index 8e39cc8aea..2664778257 100644 --- a/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java +++ b/tests/integration/cdi-integration/gf-cdi-inject/src/main/java/org/glassfish/jersey/tests/cdi/gf/GFTestResource.java @@ -16,12 +16,12 @@ package org.glassfish.jersey.tests.cdi.gf; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriInfo; @Path("/") public class GFTestResource { diff --git a/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java b/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java index da49a8b447..fc3ea3a003 100644 --- a/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java +++ b/tests/integration/cdi-integration/gf-cdi-inject/src/test/java/org/glassfish/jersey/tests/cdi/gf/GFTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import java.io.IOException; @ExtendWith(ArquillianExtension.class) diff --git a/tests/integration/cdi-integration/pom.xml b/tests/integration/cdi-integration/pom.xml index 8f2806ee6a..c14ab61cf3 100644 --- a/tests/integration/cdi-integration/pom.xml +++ b/tests/integration/cdi-integration/pom.xml @@ -65,7 +65,7 @@ gf-inject - [11,16) + [11,) gf-cdi-inject