JPMS adjustments to the actual 3.1 Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java index eda6b28..fc807e6 100644 --- a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java +++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java
@@ -1,7 +1,7 @@ module ${package}.module { requires jakarta.ws.rs; - requires grizzly.http.server; + requires org.glassfish.grizzly.http.server; requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.container.grizzly2.http;
diff --git a/connectors/apache-connector/pom.xml b/connectors/apache-connector/pom.xml index f06225c..a9db082 100644 --- a/connectors/apache-connector/pom.xml +++ b/connectors/apache-connector/pom.xml
@@ -55,6 +55,41 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build>
diff --git a/connectors/apache-connector/src/test/java/module-info.java b/connectors/apache-connector/src/test/java/module-info.java index 94ff46c..f38053f 100644 --- a/connectors/apache-connector/src/test/java/module-info.java +++ b/connectors/apache-connector/src/test/java/module-info.java
@@ -34,7 +34,12 @@ requires org.junit.jupiter.api; requires org.junit.jupiter.engine; + requires org.junit.platform.commons; exports org.glassfish.jersey.apache.connector; opens org.glassfish.jersey.apache.connector; +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/connectors/grizzly-connector/pom.xml b/connectors/grizzly-connector/pom.xml index ca71bb9..a12bc1d 100644 --- a/connectors/grizzly-connector/pom.xml +++ b/connectors/grizzly-connector/pom.xml
@@ -82,6 +82,37 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build>
diff --git a/connectors/grizzly-connector/src/main/java/module-info.java b/connectors/grizzly-connector/src/main/java/module-info.java index 4494f54..8412c6c 100644 --- a/connectors/grizzly-connector/src/main/java/module-info.java +++ b/connectors/grizzly-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 @@ -19,7 +19,7 @@ requires jakarta.ws.rs; - requires grizzly.framework; + requires org.glassfish.grizzly; requires grizzly.http.client; requires org.glassfish.jersey.core.common;
diff --git a/connectors/grizzly-connector/src/test/java/module-info.java b/connectors/grizzly-connector/src/test/java/module-info.java index ffe27be..7955f4c 100644 --- a/connectors/grizzly-connector/src/test/java/module-info.java +++ b/connectors/grizzly-connector/src/test/java/module-info.java
@@ -20,11 +20,14 @@ requires jakarta.ws.rs; - requires grizzly.framework; + requires org.glassfish.grizzly; requires grizzly.http.client; -// requires grizzly.http.server; - requires grizzly.http; + requires org.glassfish.grizzly.http; +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml index 0fdeca1..80db186 100644 --- a/connectors/jdk-connector/pom.xml +++ b/connectors/jdk-connector/pom.xml
@@ -65,6 +65,33 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build>
diff --git a/connectors/jdk-connector/src/test/java/module-info.java b/connectors/jdk-connector/src/test/java/module-info.java index 31a6867..c853aef 100644 --- a/connectors/jdk-connector/src/test/java/module-info.java +++ b/connectors/jdk-connector/src/test/java/module-info.java
@@ -25,6 +25,14 @@ requires org.junit.jupiter.api; requires org.junit.jupiter.engine; + requires org.glassfish.grizzly.http; + requires org.glassfish.grizzly.http.server; + + // required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules + requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.tests.framework.provider.grizzly;
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml index 43d8d8c..8e3a895 100644 --- a/containers/grizzly2-http/pom.xml +++ b/containers/grizzly2-http/pom.xml
@@ -72,7 +72,46 @@ <artifactId>grizzly-npn-api</artifactId> <scope>test</scope> </dependency> - + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>${asm.version}</version> + </dependency> + <!--End of required by Grizzly* modules--> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId>
diff --git a/containers/grizzly2-http/src/main/java/module-info.java b/containers/grizzly2-http/src/main/java/module-info.java index a8b0f4d..26ba080 100644 --- a/containers/grizzly2-http/src/main/java/module-info.java +++ b/containers/grizzly2-http/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 @@ -22,9 +22,9 @@ requires jakarta.inject; requires static jakarta.xml.bind; - requires grizzly.framework; - requires grizzly.http.server; - requires grizzly.http; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http.server; + requires org.glassfish.grizzly.http; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;
diff --git a/containers/grizzly2-http/src/test/java/module-info.java b/containers/grizzly2-http/src/test/java/module-info.java index 8512428..eb9fc9d 100644 --- a/containers/grizzly2-http/src/test/java/module-info.java +++ b/containers/grizzly2-http/src/test/java/module-info.java
@@ -23,7 +23,7 @@ requires jakarta.ws.rs; requires org.eclipse.jetty.http2.client; - requires org.eclipse.jetty.http2.http.client.transport; + requires org.eclipse.jetty.http2.client.transport; requires org.bouncycastle.provider; requires org.bouncycastle.pkix; @@ -32,9 +32,15 @@ requires org.junit.jupiter.api; requires org.junit.jupiter.engine; - requires grizzly.http.server; - requires grizzly.http2; - requires grizzly.framework; + requires org.glassfish.grizzly.http.server; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http; + requires org.glassfish.grizzly.http2; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules requires org.glassfish.hk2.api; requires org.glassfish.hk2.locator;
diff --git a/containers/grizzly2-servlet/src/main/java/module-info.java b/containers/grizzly2-servlet/src/main/java/module-info.java index 8a426c8..2acb16f 100644 --- a/containers/grizzly2-servlet/src/main/java/module-info.java +++ b/containers/grizzly2-servlet/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,8 +18,8 @@ requires jakarta.ws.rs; requires jakarta.servlet; - requires grizzly.http.servlet; - requires grizzly.http.server; + requires org.glassfish.grizzly.servlet; + requires org.glassfish.grizzly.http.server; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.container.servlet.core;
diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java index cec55cc..2335932 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java
@@ -312,4 +312,4 @@ // do not close - let the servlet container close the stream } } -} +} \ No newline at end of file
diff --git a/containers/jetty-http/src/main/java/module-info.java b/containers/jetty-http/src/main/java/module-info.java index b90f9e0..0633819 100644 --- a/containers/jetty-http/src/main/java/module-info.java +++ b/containers/jetty-http/src/main/java/module-info.java
@@ -22,6 +22,7 @@ requires org.eclipse.jetty.http; requires org.eclipse.jetty.server; + requires org.eclipse.jetty.security; requires org.eclipse.jetty.util; requires org.glassfish.jersey.core.common;
diff --git a/core-client/pom.xml b/core-client/pom.xml index 24d981c..afef049 100644 --- a/core-client/pom.xml +++ b/core-client/pom.xml
@@ -119,6 +119,7 @@ <artifactId>jakarta.inject-api</artifactId> </dependency> +<!-- <dependency> <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> @@ -129,6 +130,7 @@ <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> </dependency> +--> <dependency> <!-- not to warn about missing activation -->
diff --git a/core-common/pom.xml b/core-common/pom.xml index 8be901b..660ec18 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml
@@ -213,12 +213,13 @@ <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> </dependency> +<!-- <dependency> <groupId>org.eclipse.angus</groupId> <artifactId>angus-activation</artifactId> <scope>provided</scope> <optional>true</optional> - </dependency> + </dependency> --> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId>
diff --git a/core-common/src/main/java/module-info.java b/core-common/src/main/java/module-info.java index 1ab1f23..3a3f1f5 100644 --- a/core-common/src/main/java/module-info.java +++ b/core-common/src/main/java/module-info.java
@@ -29,6 +29,7 @@ // Exports rather all, which corresponds to previous state without module-info exports org.glassfish.jersey; + exports org.glassfish.jersey.http; exports org.glassfish.jersey.internal; exports org.glassfish.jersey.internal.config; exports org.glassfish.jersey.internal.guava;
diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml index f7f4577..f932c5b 100644 --- a/examples/groovy/pom.xml +++ b/examples/groovy/pom.xml
@@ -29,6 +29,20 @@ <artifactId>groovy-all</artifactId> <type>pom</type> <version>${groovy.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/ext/proxy-client/pom.xml b/ext/proxy-client/pom.xml index 1c7fe41..88458a4 100644 --- a/ext/proxy-client/pom.xml +++ b/ext/proxy-client/pom.xml
@@ -83,5 +83,32 @@ <artifactId>jaxb-osgi</artifactId> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> </project>
diff --git a/ext/proxy-client/src/test/java/module-info.java b/ext/proxy-client/src/test/java/module-info.java index d2ad176..44b22ad 100644 --- a/ext/proxy-client/src/test/java/module-info.java +++ b/ext/proxy-client/src/test/java/module-info.java
@@ -31,4 +31,9 @@ exports org.glassfish.jersey.client.proxy; opens org.glassfish.jersey.client.proxy; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java b/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java index c23d32c..f9f58c8 100644 --- a/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java +++ b/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java
@@ -509,4 +509,4 @@ } -} +} \ No newline at end of file
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 d44f823..df3328a 100644 --- a/incubator/cdi-inject-weld/src/main/java/module-info.txt +++ b/incubator/cdi-inject-weld/src/main/java/module-info.txt
@@ -30,7 +30,7 @@ requires weld.core.impl; requires weld.se.core; requires weld.probe.core; - requires grizzly.http.server; + requires org.glassfish.grizzly.http.server; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/pom.xml b/pom.xml index 2e05d9d..d9845d3 100644 --- a/pom.xml +++ b/pom.xml
@@ -2329,6 +2329,11 @@ <wiremock.version>2.27.2</wiremock.version> <xerces.version>2.12.2</xerces.version> + <!--required by Grizzly* modules--> + <gmbal.version>4.0.3</gmbal.version> + <pfl.version>4.1.2</pfl.version> + <!--End of required by Grizzly* modules--> + <!-- Graal VM --> <graalvm.version>20.3.12</graalvm.version> @@ -2367,6 +2372,7 @@ <jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version> <jetty.version>12.0.3</jetty.version> <jetty9.version>9.4.53.v20231009</jetty9.version> + <jetty.servlet.api.version>5.0.2</jetty.servlet.api.version> <jetty11.version>11.0.18</jetty11.version> <jetty.plugin.version>12.0.3</jetty.plugin.version> <jsonb.api.version>3.0.0</jsonb.api.version>
diff --git a/test-framework/providers/grizzly2/pom.xml b/test-framework/providers/grizzly2/pom.xml index 84de880..db1918d 100644 --- a/test-framework/providers/grizzly2/pom.xml +++ b/test-framework/providers/grizzly2/pom.xml
@@ -53,5 +53,36 @@ <artifactId>jersey-container-grizzly2-servlet</artifactId> <version>${project.version}</version> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> </project>
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 6c87636..f5dab7a 100644 --- a/test-framework/providers/grizzly2/src/main/java/module-info.java +++ b/test-framework/providers/grizzly2/src/main/java/module-info.java
@@ -20,9 +20,9 @@ requires jakarta.servlet; requires jakarta.ws.rs; - requires grizzly.framework; - requires grizzly.http.server; - requires grizzly.http.servlet; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http.server; + requires org.glassfish.grizzly.servlet; requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.core.common;
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 93cb667..c18f8f0 100644 --- a/test-framework/providers/grizzly2/src/test/java/module-info.java +++ b/test-framework/providers/grizzly2/src/test/java/module-info.java
@@ -21,6 +21,14 @@ requires jakarta.servlet; requires jakarta.ws.rs; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.servlet; + requires org.glassfish.grizzly.http.server; +// required by Grizzly* modules + requires gmbal; + requires pfl.tf; +// end of required by Grizzly* modules + requires org.glassfish.jersey.tests.framework.core; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/tests/integration/JERSEY-2988/pom.xml b/tests/integration/JERSEY-2988/pom.xml index ea11488..89b7aa9 100644 --- a/tests/integration/JERSEY-2988/pom.xml +++ b/tests/integration/JERSEY-2988/pom.xml
@@ -80,8 +80,8 @@ <artifactId>maven-failsafe-plugin</artifactId> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> </plugins> </build>
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml index 02416df..a115e0d 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml
@@ -121,6 +121,33 @@ <artifactId>jersey-container-grizzly2-http</artifactId> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <profiles>
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 33cf646..b815950 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
@@ -22,10 +22,15 @@ requires weld.se.core; requires weld.core.impl; - requires grizzly.http.server; + requires org.glassfish.grizzly.http.server; requires org.hibernate.validator; requires org.hibernate.validator.cdi; +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules + requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.core.server;
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 9c53534..d0dc3c5 100644 --- a/tests/integration/cdi-integration/cdi-client-on-server/pom.xml +++ b/tests/integration/cdi-integration/cdi-client-on-server/pom.xml
@@ -115,6 +115,33 @@ <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <profiles>
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 cf45446..48936dd 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
@@ -35,4 +35,9 @@ exports org.glassfish.jersey.tests.cdi.client; opens org.glassfish.jersey.tests.cdi.client; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ 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 44a90bd..9ffc8b0 100644 --- a/tests/integration/cdi-integration/cdi-log-check/pom.xml +++ b/tests/integration/cdi-integration/cdi-log-check/pom.xml
@@ -110,6 +110,33 @@ <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build>
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 fad5add..41bf4b1 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
@@ -40,4 +40,9 @@ exports org.glassfish.jersey.tests.cdi.resources.test; opens org.glassfish.jersey.tests.cdi.resources.test; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-manually-bound/pom.xml b/tests/integration/cdi-integration/cdi-manually-bound/pom.xml index 740fbc5..4b3f0fb 100644 --- a/tests/integration/cdi-integration/cdi-manually-bound/pom.xml +++ b/tests/integration/cdi-integration/cdi-manually-bound/pom.xml
@@ -105,5 +105,32 @@ </exclusions> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> </project>
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 aeacc09..b0d7552 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
@@ -38,4 +38,9 @@ requires org.glassfish.jersey.tests.framework.provider.grizzly; exports org.glassfish.jersey.tests.cdi.manuallybound.test; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-resource-with-at-context/pom.xml b/tests/integration/cdi-integration/cdi-resource-with-at-context/pom.xml index ee4053a..b9fea90 100644 --- a/tests/integration/cdi-integration/cdi-resource-with-at-context/pom.xml +++ b/tests/integration/cdi-integration/cdi-resource-with-at-context/pom.xml
@@ -87,6 +87,33 @@ <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> </project>
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 b8a87a8..6b8783e 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
@@ -35,4 +35,9 @@ requires org.glassfish.jersey.tests.framework.provider.grizzly; exports org.glassfish.jersey.tests.cdi.resourceatcontext.test; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-singleton/pom.xml b/tests/integration/cdi-integration/cdi-singleton/pom.xml index 4effcbc..9474d62 100644 --- a/tests/integration/cdi-integration/cdi-singleton/pom.xml +++ b/tests/integration/cdi-integration/cdi-singleton/pom.xml
@@ -91,6 +91,33 @@ </exclusions> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> </project>
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 ad833a5..0ef5653 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
@@ -32,4 +32,9 @@ requires org.junit.jupiter.engine; exports org.glassfish.jersey.tests.cdi.singleton.test; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/tests/integration/cdi-integration/cdi-test-webapp/pom.xml b/tests/integration/cdi-integration/cdi-test-webapp/pom.xml index 37d1925..24ddaf8 100644 --- a/tests/integration/cdi-integration/cdi-test-webapp/pom.xml +++ b/tests/integration/cdi-integration/cdi-test-webapp/pom.xml
@@ -82,6 +82,33 @@ <optional>true</optional> <scope>provided</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build>
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 a7bb3d5..b169567 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
@@ -25,6 +25,12 @@ requires weld.se.core; requires org.hamcrest; + requires org.glassfish.grizzly.http.server; +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules + requires org.glassfish.jersey.tests.integration.cdi.test.webapp; requires org.glassfish.jersey.core.server;
diff --git a/tests/integration/cdi-integration/context-inject-on-server/pom.xml b/tests/integration/cdi-integration/context-inject-on-server/pom.xml index 54976a8..5234a2a 100644 --- a/tests/integration/cdi-integration/context-inject-on-server/pom.xml +++ b/tests/integration/cdi-integration/context-inject-on-server/pom.xml
@@ -69,6 +69,33 @@ <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <profiles> <profile>
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 4bd2777..1506d00 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
@@ -42,4 +42,9 @@ exports org.glassfish.jersey.tests.cdi.inject.test; opens org.glassfish.jersey.tests.cdi.inject.test; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/tests/integration/client-connector-provider/pom.xml b/tests/integration/client-connector-provider/pom.xml index 04f5111..76e646a 100644 --- a/tests/integration/client-connector-provider/pom.xml +++ b/tests/integration/client-connector-provider/pom.xml
@@ -57,6 +57,33 @@ <artifactId>jersey-test-framework-provider-grizzly2</artifactId> <scope>test</scope> </dependency> + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build> <finalName>${project.artifactId}</finalName>
diff --git a/tests/integration/client-connector-provider/src/test/java/module-info.java b/tests/integration/client-connector-provider/src/test/java/module-info.java index 7fa0966..d53708b 100644 --- a/tests/integration/client-connector-provider/src/test/java/module-info.java +++ b/tests/integration/client-connector-provider/src/test/java/module-info.java
@@ -28,4 +28,9 @@ requires org.glassfish.jersey.tests.framework.provider.grizzly; exports org.glassfish.jersey.tests.integration.client.connector.provider.test; + +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file
diff --git a/tests/integration/jersey-4099/pom.xml b/tests/integration/jersey-4099/pom.xml index 1b3d337..495d4f2 100644 --- a/tests/integration/jersey-4099/pom.xml +++ b/tests/integration/jersey-4099/pom.xml
@@ -85,7 +85,37 @@ <groupId>org.glassfish.jersey.ext.cdi</groupId> <artifactId>jersey-cdi1x</artifactId> </dependency> - + <!--required by Grizzly* modules--> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>${pfl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.gmbal</groupId> + <artifactId>gmbal</artifactId> + <version>${gmbal.version}</version> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--End of required by Grizzly* modules--> </dependencies> <build>
diff --git a/tests/integration/jersey-4099/src/test/java/module-info.java b/tests/integration/jersey-4099/src/test/java/module-info.java index 428bc79..76dde06 100644 --- a/tests/integration/jersey-4099/src/test/java/module-info.java +++ b/tests/integration/jersey-4099/src/test/java/module-info.java
@@ -30,4 +30,8 @@ requires org.glassfish.jersey.tests.framework.provider.grizzly; exports org.glassfish.jersey.tests.integration.jersey4099; +// required by Grizzly* modules + requires pfl.tf; + requires gmbal; +// end of required by Grizzly* modules } \ No newline at end of file