JPMS build w/o tests Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/module-info.java b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/module-info.java index c2d395f..dd95b34 100644 --- a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/module-info.java +++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/module-info.java
@@ -1,7 +1,7 @@ module ${package}.module.test { requires jakarta.ws.rs; - requires junit; + requires org.junit.jupiter.api; requires com.example.archetype.grizzly.module;
diff --git a/connectors/netty-connector/pom.xml b/connectors/netty-connector/pom.xml index a4a5ee4..2b66df8 100644 --- a/connectors/netty-connector/pom.xml +++ b/connectors/netty-connector/pom.xml
@@ -49,6 +49,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + <version>${project.version}</version> +<!-- <scope>test</scope>--> + </dependency> </dependencies> <build>
diff --git a/connectors/netty-connector/src/main/java/module-info.java b/connectors/netty-connector/src/main/java/module-info.java index f148da5..0556416 100644 --- a/connectors/netty-connector/src/main/java/module-info.java +++ b/connectors/netty-connector/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -21,11 +21,20 @@ requires jakarta.inject; requires io.netty.all; + requires io.netty.buffer; + requires io.netty.handler; + requires io.netty.handler.proxy; + requires io.netty.codec; + requires io.netty.codec.http; + requires io.netty.codec.http2; + requires io.netty.common; + requires io.netty.resolver; + requires io.netty.transport; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; + requires org.glassfish.jersey.core.server; exports org.glassfish.jersey.netty.connector; exports org.glassfish.jersey.netty.connector.internal; -// opens org.glassfish.jersey.netty.connector; } \ No newline at end of file
diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java index 4a9836d..87551dd 100644 --- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java +++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java
@@ -16,7 +16,6 @@ package org.glassfish.jersey.netty.connector; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI;
diff --git a/containers/glassfish/jersey-gf-ejb/src/main/java/module-info.java b/containers/glassfish/jersey-gf-ejb/src/main/java/module-info.java index 78ea32b..b3917b8 100644 --- a/containers/glassfish/jersey-gf-ejb/src/main/java/module-info.java +++ b/containers/glassfish/jersey-gf-ejb/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -21,9 +21,9 @@ requires jakarta.ws.rs; requires static jakarta.activation; requires jakarta.annotation; - requires jakarta.ejb.api; + requires jakarta.ejb; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires ejb.container; requires internal.api;
diff --git a/containers/grizzly2-http/src/test/java/module-info.java b/containers/grizzly2-http/src/test/java/module-info.java index fbad5af..9e52f01 100644 --- a/containers/grizzly2-http/src/test/java/module-info.java +++ b/containers/grizzly2-http/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -29,7 +29,7 @@ requires org.bouncycastle.pkix; requires org.eclipse.jetty.client; requires org.hamcrest; - requires junit; + requires org.junit.jupiter.api; requires grizzly.http.server; requires grizzly.http2;
diff --git a/core-client/src/main/java/module-info.java b/core-client/src/main/java/module-info.java index a80a87e..bf58d5e 100644 --- a/core-client/src/main/java/module-info.java +++ b/core-client/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -31,6 +31,12 @@ exports org.glassfish.jersey.client.spi; exports org.glassfish.jersey.client.internal; + exports org.glassfish.jersey.client.innate to + org.glassfish.jersey.apache.connector, + org.glassfish.jersey.netty.connector, + org.glassfish.jersey.grizzly.connector, + org.glassfish.jersey.jetty.connector; + opens org.glassfish.jersey.client; opens org.glassfish.jersey.client.spi; opens org.glassfish.jersey.client.filter;
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java index d2ee89c..904c2e1 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
@@ -37,7 +37,7 @@ /** * @author Martin Snyder */ -public class JarFileScannerTest { +public class JarFileScannerTest extends AbstractFinderTest { private String jaxRsApiPath;
diff --git a/ext/cdi/jersey-cdi-rs-inject/pom.xml b/ext/cdi/jersey-cdi-rs-inject/pom.xml index 8a3ed0f..304cbfd 100644 --- a/ext/cdi/jersey-cdi-rs-inject/pom.xml +++ b/ext/cdi/jersey-cdi-rs-inject/pom.xml
@@ -76,6 +76,7 @@ <detectJavaApiLink>false</detectJavaApiLink> <detectLinks>false</detectLinks> <detectOfflineLinks>false</detectOfflineLinks> + <source>8</source> </configuration> </plugin> <plugin>
diff --git a/ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.java b/ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.java index 3d87334..c6d96b4 100644 --- a/ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.java +++ b/ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,6 +17,7 @@ module org.glassfish.jersey.ext.cdi.rs.inject { requires jakarta.ws.rs; requires jakarta.cdi; + requires jakarta.servlet; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;
diff --git a/ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.java b/ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.java index 27792e2..251515b 100644 --- a/ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.java +++ b/ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,7 +17,7 @@ module org.glassfish.jersey.ext.cdi1x.transaction { requires jakarta.annotation; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires jakarta.transaction; requires jakarta.ws.rs;
diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/module-info.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/module-info.java index 466eb95..45a3da4 100644 --- a/ext/cdi/jersey-cdi1x-validation/src/main/java/module-info.java +++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,7 +17,7 @@ module org.glassfish.jersey.ext.cdi1x.validation { requires jakarta.annotation; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires jakarta.cdi;
diff --git a/ext/cdi/jersey-weld2-se/pom.xml b/ext/cdi/jersey-weld2-se/pom.xml index fcaf47a..ab1b55c 100644 --- a/ext/cdi/jersey-weld2-se/pom.xml +++ b/ext/cdi/jersey-weld2-se/pom.xml
@@ -69,6 +69,12 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>jakarta.interceptor</groupId> + <artifactId>jakarta.interceptor-api</artifactId> + <version>${jakarta.interceptor.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build>
diff --git a/ext/microprofile/mp-rest-client/src/main/java/module-info.java b/ext/microprofile/mp-rest-client/src/main/java/module-info.java index e502961..f958c14 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/module-info.java +++ b/ext/microprofile/mp-rest-client/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -20,7 +20,7 @@ requires jakarta.annotation; requires jakarta.cdi; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires jakarta.json; requires jakarta.ws.rs;
diff --git a/ext/mvc-jsp/pom.xml b/ext/mvc-jsp/pom.xml index a98dfa7..707e885 100644 --- a/ext/mvc-jsp/pom.xml +++ b/ext/mvc-jsp/pom.xml
@@ -71,6 +71,10 @@ <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + </dependency> + <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> <version>${project.version}</version>
diff --git a/ext/mvc-mustache/src/main/java/module-info.java b/ext/mvc-mustache/src/main/java/module-info.java index 6bbf84f..65360fc 100644 --- a/ext/mvc-mustache/src/main/java/module-info.java +++ b/ext/mvc-mustache/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -19,7 +19,9 @@ requires jakarta.servlet; requires jakarta.ws.rs; - requires compiler; + requires jdk.compiler; + + requires com.github.mustachejava; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;
diff --git a/ext/rx/rx-client-guava/src/main/java/module-info.java b/ext/rx/rx-client-guava/src/main/java/module-info.java index fc9e8e3..ccf5a91 100644 --- a/ext/rx/rx-client-guava/src/main/java/module-info.java +++ b/ext/rx/rx-client-guava/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,7 +17,7 @@ module org.glassfish.jersey.ext.rx.client.guava { requires jakarta.ws.rs; - requires guava; + requires com.google.common; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/ext/rx/rx-client-rxjava2/src/main/java/module-info.java b/ext/rx/rx-client-rxjava2/src/main/java/module-info.java index a7c961f..70af086 100644 --- a/ext/rx/rx-client-rxjava2/src/main/java/module-info.java +++ b/ext/rx/rx-client-rxjava2/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,7 +17,7 @@ module org.glassfish.jersey.ext.rx.client.rxjava2 { requires jakarta.ws.rs; - requires rxjava; + requires io.reactivex.rxjava2; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/incubator/cdi-inject-weld/src/main/java/module-info.txt b/incubator/cdi-inject-weld/src/main/java/module-info.txt index 7c7437c..d44f823 100644 --- a/incubator/cdi-inject-weld/src/main/java/module-info.txt +++ b/incubator/cdi-inject-weld/src/main/java/module-info.txt
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -18,7 +18,7 @@ requires jakarta.annotation; requires jakarta.cdi; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires jakarta.servlet; // requires jakarta.persistence; requires jakarta.ws.rs;
diff --git a/incubator/cdi-inject-weld/src/test/java/module-info.txt b/incubator/cdi-inject-weld/src/test/java/module-info.txt index 89a3e5e..e9c2e19 100644 --- a/incubator/cdi-inject-weld/src/test/java/module-info.txt +++ b/incubator/cdi-inject-weld/src/test/java/module-info.txt
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -27,5 +27,5 @@ requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.core.server; - requires hamcrest.core; + requires org.hamcrest; } \ No newline at end of file
diff --git a/incubator/open-tracing/src/main/java/module-info.java b/incubator/open-tracing/src/main/java/module-info.java index 82ebaf8..aa82948 100644 --- a/incubator/open-tracing/src/main/java/module-info.java +++ b/incubator/open-tracing/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -19,8 +19,8 @@ requires jakarta.ws.rs; - requires opentracing.api; - requires opentracing.util; + requires io.opentracing.api; + requires io.opentracing.util; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;
diff --git a/inject/cdi2-se/src/main/java/module-info.java b/inject/cdi2-se/src/main/java/module-info.java index 741cfdf..eeb9a42 100644 --- a/inject/cdi2-se/src/main/java/module-info.java +++ b/inject/cdi2-se/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -19,7 +19,7 @@ requires jakarta.annotation; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires jakarta.ws.rs; requires jakarta.cdi;
diff --git a/pom.xml b/pom.xml index 2e73038..2e05d9d 100644 --- a/pom.xml +++ b/pom.xml
@@ -908,7 +908,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${mvn.compiler.plugin.version}</version> + <version>${compiler.mvn.plugin.version}</version> <inherited>true</inherited> <configuration> <excludes> @@ -936,7 +936,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${mvn.compiler.plugin.version}</version> + <version>${compiler.mvn.plugin.version}</version> <inherited>true</inherited> <executions> <execution> @@ -2090,12 +2090,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - <version>${hamcrest.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <version>${jmockit.version}</version>
diff --git a/test-framework/core/pom.xml b/test-framework/core/pom.xml index 9080322..e368a03 100644 --- a/test-framework/core/pom.xml +++ b/test-framework/core/pom.xml
@@ -81,6 +81,27 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>default-compile</id> + <configuration> + <compilerArgs> + <arg>--add-exports</arg> + <arg>org.junit.platform.commons/org.junit.platform.commons.util=org.glassfish.jersey.tests.framework.core</arg> + </compilerArgs> + <release>11</release> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> <surefire.coverage.argline> --add-exports org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED
diff --git a/test-framework/core/src/main/java/module-info.java b/test-framework/core/src/main/java/module-info.java index 0cea95e..6a8a788 100644 --- a/test-framework/core/src/main/java/module-info.java +++ b/test-framework/core/src/main/java/module-info.java
@@ -28,7 +28,7 @@ requires org.glassfish.jersey.container.servlet.core; - requires junit; + requires static junit; requires static org.junit.jupiter.api; requires static testng;
diff --git a/test-framework/providers/grizzly2/src/main/java/module-info.java b/test-framework/providers/grizzly2/src/main/java/module-info.java index 752ccff..6c87636 100644 --- a/test-framework/providers/grizzly2/src/main/java/module-info.java +++ b/test-framework/providers/grizzly2/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -20,6 +20,10 @@ requires jakarta.servlet; requires jakarta.ws.rs; + requires grizzly.framework; + requires grizzly.http.server; + requires grizzly.http.servlet; + requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/test-framework/providers/grizzly2/src/test/java/module-info.java b/test-framework/providers/grizzly2/src/test/java/module-info.java index fa5a8be..6248941 100644 --- a/test-framework/providers/grizzly2/src/test/java/module-info.java +++ b/test-framework/providers/grizzly2/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -38,6 +38,6 @@ opens org.glassfish.jersey.test.grizzly.pckg; opens org.glassfish.jersey.test.grizzly.web; - requires junit; - requires hamcrest.core; + requires org.junit.jupiter.api; + requires org.hamcrest; } \ No newline at end of file
diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml index 1e4e495..afcbea6 100644 --- a/tests/integration/async-jersey-filter/pom.xml +++ b/tests/integration/async-jersey-filter/pom.xml
@@ -62,8 +62,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/tests/integration/async-jersey-filter/src/test/java/module-info.java b/tests/integration/async-jersey-filter/src/test/java/module-info.java index 1b68a23..ef7c5fe 100644 --- a/tests/integration/async-jersey-filter/src/test/java/module-info.java +++ b/tests/integration/async-jersey-filter/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -27,7 +27,7 @@ requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external; - requires junit; + requires org.junit.jupiter.api; exports org.glassfish.jersey.tests.integration.async; exports org.glassfish.jersey.tests.integration.jersey2730;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/test/java/module-info.java index 8f7e829..d37e2cf 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -32,8 +32,8 @@ requires org.glassfish.jersey.tests.integration.cdi.beanvalidation.webapp; - requires junit; - requires hamcrest.core; + requires org.junit.jupiter.api; + requires org.hamcrest; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external;
diff --git a/tests/integration/cdi-integration/cdi-client-on-server/pom.xml b/tests/integration/cdi-integration/cdi-client-on-server/pom.xml index 012ce4c..40efd44 100644 --- a/tests/integration/cdi-integration/cdi-client-on-server/pom.xml +++ b/tests/integration/cdi-integration/cdi-client-on-server/pom.xml
@@ -55,11 +55,20 @@ </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <artifactId>jersey-test-framework-provider-external</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <artifactId>jersey-test-framework-provider-grizzly2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.glassfish.jersey.test-framework</groupId> <artifactId>jersey-test-framework-util</artifactId> <scope>provided</scope> @@ -117,6 +126,7 @@ <jersey.config.test.container.factory>${external.container.factory}</jersey.config.test.container.factory> <jersey.config.test.container.port>${external.container.port}</jersey.config.test.container.port> </systemPropertyVariables> + <argLine>--add-reads java.logging=ALL-UNNAMED --add-exports java.logging/java.util.logging=ALL-UNNAMED --add-modules=ALL-MODULE-PATH</argLine> </configuration> </plugin> </plugins>
diff --git a/tests/integration/cdi-integration/cdi-client-on-server/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-client-on-server/src/test/java/module-info.java index 03a08ea..923dd31 100644 --- a/tests/integration/cdi-integration/cdi-client-on-server/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-client-on-server/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -18,16 +18,20 @@ requires jakarta.inject; requires jakarta.ws.rs; + requires jakarta.cdi; requires weld.se.core; - requires junit; + requires org.jboss.logging; requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.inject.hk2; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external; + requires org.glassfish.jersey.tests.framework.provider.grizzly; requires org.junit.jupiter.api; requires org.junit.jupiter.engine; + + exports org.glassfish.jersey.tests.cdi.client; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-ejb-test-webapp/src/main/java/module-info.java b/tests/integration/cdi-integration/cdi-ejb-test-webapp/src/main/java/module-info.java index b8e728a..20d2723 100644 --- a/tests/integration/cdi-integration/cdi-ejb-test-webapp/src/main/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-ejb-test-webapp/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -20,7 +20,7 @@ requires jakarta.inject; requires jakarta.cdi; requires jakarta.annotation; - requires jakarta.ejb.api; + requires jakarta.ejb; opens org.glassfish.jersey.tests.cdi.resources; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml b/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml index ca11b19..dac9970 100644 --- a/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml
@@ -42,11 +42,18 @@ <artifactId>jakarta.enterprise.cdi-api</artifactId> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <dependency> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/src/test/java/module-info.java index e52fcca..ec65e8a 100644 --- a/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-iface-with-non-jaxrs-impl-test-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -20,7 +20,7 @@ requires jakarta.inject; requires jakarta.ws.rs; - requires junit; - requires hamcrest.core; + requires org.junit.jupiter.api; + requires org.hamcrest; requires org.glassfish.jersey.tests.framework.core; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-log-check/pom.xml b/tests/integration/cdi-integration/cdi-log-check/pom.xml index a461a69..b9fef66 100644 --- a/tests/integration/cdi-integration/cdi-log-check/pom.xml +++ b/tests/integration/cdi-integration/cdi-log-check/pom.xml
@@ -55,8 +55,17 @@ </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <artifactId>jersey-test-framework-provider-external</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <artifactId>jersey-test-framework-provider-grizzly2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> <scope>test</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-integration/cdi-log-check/src/main/java/module-info.java b/tests/integration/cdi-integration/cdi-log-check/src/main/java/module-info.java index 52fbba0..dfe7bdb 100644 --- a/tests/integration/cdi-integration/cdi-log-check/src/main/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-log-check/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -18,7 +18,7 @@ requires jakarta.ws.rs; requires jakarta.annotation; requires jakarta.inject; - requires jakarta.interceptor.api; + requires jakarta.interceptor; requires jakarta.cdi; requires java.logging;
diff --git a/tests/integration/cdi-integration/cdi-log-check/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-log-check/src/test/java/module-info.java index 8517d2a..1dd6735 100644 --- a/tests/integration/cdi-integration/cdi-log-check/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-log-check/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,16 +17,23 @@ module org.glassfish.jersey.tests.integration.cdi.log.check { requires java.logging; + requires jakarta.cdi; requires jakarta.inject; + requires jakarta.interceptor; requires jakarta.ws.rs; + requires weld.se.core; + requires org.jboss.logging; + requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.inject.hk2; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external; + requires org.glassfish.jersey.tests.framework.provider.grizzly; - requires junit; requires org.junit.jupiter.api; requires org.junit.jupiter.engine; + + exports org.glassfish.jersey.tests.cdi.resources; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-manually-bound/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-manually-bound/src/test/java/module-info.java index 47a0a8c..15888ac 100644 --- a/tests/integration/cdi-integration/cdi-manually-bound/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-manually-bound/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -29,7 +29,7 @@ requires org.glassfish.jersey.tests.integration.cdi.manually.bound; - requires junit; + requires org.junit.jupiter.api; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external;
diff --git a/tests/integration/cdi-integration/cdi-multipart-webapp/pom.xml b/tests/integration/cdi-integration/cdi-multipart-webapp/pom.xml index e43ca61..ce80a76 100644 --- a/tests/integration/cdi-integration/cdi-multipart-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-multipart-webapp/pom.xml
@@ -53,9 +53,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/tests/integration/cdi-integration/cdi-multipart-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-multipart-webapp/src/test/java/module-info.java index 8194a51..b6b6ab3 100644 --- a/tests/integration/cdi-integration/cdi-multipart-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-multipart-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -15,13 +15,16 @@ */ module org.glassfish.jersey.tests.integration.cdi.multipart.webapp { + requires jakarta.cdi; requires jakarta.ws.rs; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.media.multipart; - requires junit; + requires org.junit.jupiter.api; + requires org.junit.jupiter.params; + requires org.hamcrest; requires org.glassfish.jersey.tests.framework.core; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-resource-with-at-context/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-resource-with-at-context/src/test/java/module-info.java index dd5b164..05cd81d 100644 --- a/tests/integration/cdi-integration/cdi-resource-with-at-context/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-resource-with-at-context/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -27,7 +27,7 @@ requires weld.se.core; - requires junit; + requires org.junit.jupiter.api; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.integration.cdi.resource.context; requires org.glassfish.jersey.tests.framework.provider.grizzly;
diff --git a/tests/integration/cdi-integration/cdi-singleton/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-singleton/src/test/java/module-info.java index cca0271..7cbffac 100644 --- a/tests/integration/cdi-integration/cdi-singleton/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-singleton/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -28,7 +28,7 @@ requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external; requires org.glassfish.jersey.tests.framework.provider.grizzly; - requires junit; + requires org.junit.jupiter.api; exports org.glassfish.jersey.tests.cdi.singleton.test; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-test-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-test-webapp/src/test/java/module-info.java index 612ccc5..fe0fc38 100644 --- a/tests/integration/cdi-integration/cdi-test-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-test-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -14,28 +14,30 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -module org.glassfish.jersey.tests.integration.cdi.test.webapp.test { +module org.glassfish.jersey.tests.integration.cdi.test.webapp { requires java.logging; requires jakarta.annotation; + requires jakarta.cdi; requires jakarta.inject; requires jakarta.ws.rs; requires weld.se.core; - requires hamcrest.core; + requires org.hamcrest; requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.inject.hk2; requires org.glassfish.jersey.ext.weld2.se; + requires org.glassfish.jersey.ext.cdi1x; requires org.glassfish.jersey.container.grizzly2.http; - requires org.glassfish.jersey.tests.integration.cdi.test.webapp; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external; requires org.glassfish.jersey.tests.framework.provider.grizzly; - requires junit; + requires org.junit.jupiter.api; + requires org.junit.jupiter.params; exports org.glassfish.jersey.tests.cdi.resources.test; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml index 12cb676..e0d36e9 100644 --- a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
@@ -67,9 +67,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/src/test/java/module-info.java index a6f98fb..0ff30f8 100644 --- a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-cfg-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -15,12 +15,15 @@ */ module org.glassfish.jersey.tests.integration.cdi.injection.cfg { + requires jakarta.cdi; requires jakarta.inject; requires jakarta.ws.rs; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server; - requires junit; + requires org.junit.jupiter.api; + requires org.junit.jupiter.params; requires org.glassfish.jersey.tests.framework.core; + requires org.hamcrest; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml index 5a2bf95..2f25220 100644 --- a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml
@@ -81,9 +81,8 @@ </dependency> <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/src/test/java/module-info.java index 89b5ead..7c7ee83 100644 --- a/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -22,5 +22,8 @@ requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server; + requires org.junit.jupiter.api; + requires org.hamcrest; + requires org.glassfish.jersey.tests.framework.core; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/pom.xml b/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/pom.xml index 1171a86..418270e 100644 --- a/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/pom.xml
@@ -58,9 +58,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-bundle</artifactId> - <type>pom</type> + <groupId>org.glassfish.jersey.test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/src/test/java/module-info.java b/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/src/test/java/module-info.java index 7740438..429d5e2 100644 --- a/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/cdi-with-jersey-injection-webapp/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -23,4 +23,7 @@ requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.tests.framework.core; + + requires org.junit.jupiter.params; + requires org.hamcrest; } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/context-inject-on-server/src/test/java/module-info.java b/tests/integration/cdi-integration/context-inject-on-server/src/test/java/module-info.java index aef70d4..3d2a688 100644 --- a/tests/integration/cdi-integration/context-inject-on-server/src/test/java/module-info.java +++ b/tests/integration/cdi-integration/context-inject-on-server/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -module org.glassfish.jersey.tests.integration.cdi.inject.server.test { +module org.glassfish.jersey.tests.integration.cdi.inject.server { requires jakarta.annotation; requires jakarta.cdi; requires jakarta.inject; @@ -31,9 +31,8 @@ requires weld.se.core; - requires junit; + requires org.junit.jupiter.api; requires org.glassfish.jersey.tests.framework.core; - requires org.glassfish.jersey.tests.integration.cdi.inject.server; requires org.glassfish.jersey.tests.framework.provider.grizzly; exports org.glassfish.jersey.tests.cdi.inject.test;
diff --git a/tests/integration/ejb-multimodule/lib/pom.xml b/tests/integration/ejb-multimodule/lib/pom.xml index 3b29350..3402701 100644 --- a/tests/integration/ejb-multimodule/lib/pom.xml +++ b/tests/integration/ejb-multimodule/lib/pom.xml
@@ -47,6 +47,11 @@ <artifactId>jakarta.annotation-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build>
diff --git a/tests/integration/ejb-multimodule/lib/src/main/java/module-info.java b/tests/integration/ejb-multimodule/lib/src/main/java/module-info.java index e2a7ad0..ff74d10 100644 --- a/tests/integration/ejb-multimodule/lib/src/main/java/module-info.java +++ b/tests/integration/ejb-multimodule/lib/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -16,7 +16,7 @@ module org.glassfish.jersey.tests.integration.ejb.multimodule.lib { requires jakarta.ws.rs; - requires jakarta.ejb.api; + requires jakarta.ejb; exports org.glassfish.jersey.tests.integration.multimodule.ejb.lib; } \ No newline at end of file
diff --git a/tests/integration/ejb-multimodule/war/pom.xml b/tests/integration/ejb-multimodule/war/pom.xml index ca8216a..1f162f1 100644 --- a/tests/integration/ejb-multimodule/war/pom.xml +++ b/tests/integration/ejb-multimodule/war/pom.xml
@@ -38,6 +38,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>ejb-multimodule-lib</artifactId> <version>${project.version}</version>
diff --git a/tests/integration/ejb-multimodule/war/src/main/java/module-info.java b/tests/integration/ejb-multimodule/war/src/main/java/module-info.java index 6d35c25..e4cad14 100644 --- a/tests/integration/ejb-multimodule/war/src/main/java/module-info.java +++ b/tests/integration/ejb-multimodule/war/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -16,7 +16,7 @@ module org.glassfish.jersey.tests.integration.ejb.multimodule.war { requires jakarta.ws.rs; - requires jakarta.ejb.api; + requires jakarta.ejb; requires org.glassfish.jersey.tests.integration.ejb.multimodule.lib;
diff --git a/tests/integration/ejb-test-webapp/pom.xml b/tests/integration/ejb-test-webapp/pom.xml index 7258e8e..6da1e68 100644 --- a/tests/integration/ejb-test-webapp/pom.xml +++ b/tests/integration/ejb-test-webapp/pom.xml
@@ -53,6 +53,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-bundle</artifactId> <type>pom</type>
diff --git a/tests/integration/ejb-test-webapp/src/main/java/module-info.java b/tests/integration/ejb-test-webapp/src/main/java/module-info.java index 4ceeacf..f86647b 100644 --- a/tests/integration/ejb-test-webapp/src/main/java/module-info.java +++ b/tests/integration/ejb-test-webapp/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -16,7 +16,7 @@ module org.glassfish.jersey.tests.integration.ejb.test.webapp { requires jakarta.ws.rs; - requires jakarta.ejb.api; + requires jakarta.ejb; requires jakarta.servlet; requires java.logging;
diff --git a/tests/integration/jersey-2154/src/main/java/module-info.java b/tests/integration/jersey-2154/src/main/java/module-info.java index 0d93c2d..b295a3a 100644 --- a/tests/integration/jersey-2154/src/main/java/module-info.java +++ b/tests/integration/jersey-2154/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -15,7 +15,7 @@ */ module org.glassfish.jersey.tests.integration.jersey_2154 { - requires jakarta.ejb.api; + requires jakarta.ejb; requires jakarta.cdi; requires jakarta.ws.rs; } \ No newline at end of file
diff --git a/tests/integration/jersey-2612/src/main/java/module-info.java b/tests/integration/jersey-2612/src/main/java/module-info.java index 578bd03..dd73244 100644 --- a/tests/integration/jersey-2612/src/main/java/module-info.java +++ b/tests/integration/jersey-2612/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -19,8 +19,6 @@ requires jakarta.ws.rs; requires jakarta.xml.bind; - requires guava; - requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server; } \ No newline at end of file
diff --git a/tests/integration/jersey-780/pom.xml b/tests/integration/jersey-780/pom.xml index b9360df..6f37b3f 100644 --- a/tests/integration/jersey-780/pom.xml +++ b/tests/integration/jersey-780/pom.xml
@@ -50,11 +50,6 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope>
diff --git a/tests/integration/jersey-780/src/test/java/module-info.java b/tests/integration/jersey-780/src/test/java/module-info.java index 38839ce..986f96b 100644 --- a/tests/integration/jersey-780/src/test/java/module-info.java +++ b/tests/integration/jersey-780/src/test/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -22,5 +22,5 @@ requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.external; - requires junit; + requires org.junit.jupiter.api; } \ No newline at end of file