JPMS Grizzly 4.0.2 integration
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/connectors/apache-connector/pom.xml b/connectors/apache-connector/pom.xml
index a9db082..f06225c 100644
--- a/connectors/apache-connector/pom.xml
+++ b/connectors/apache-connector/pom.xml
@@ -55,41 +55,6 @@
<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 f38053f..241ba6d 100644
--- a/connectors/apache-connector/src/test/java/module-info.java
+++ b/connectors/apache-connector/src/test/java/module-info.java
@@ -38,8 +38,4 @@
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 a12bc1d..ca71bb9 100644
--- a/connectors/grizzly-connector/pom.xml
+++ b/connectors/grizzly-connector/pom.xml
@@ -82,37 +82,6 @@
<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/test/java/module-info.java b/connectors/grizzly-connector/src/test/java/module-info.java
index 7955f4c..733eed1 100644
--- a/connectors/grizzly-connector/src/test/java/module-info.java
+++ b/connectors/grizzly-connector/src/test/java/module-info.java
@@ -24,10 +24,6 @@
requires grizzly.http.client;
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 80db186..0fdeca1 100644
--- a/connectors/jdk-connector/pom.xml
+++ b/connectors/jdk-connector/pom.xml
@@ -65,33 +65,6 @@
<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 c853aef..b5650fd 100644
--- a/connectors/jdk-connector/src/test/java/module-info.java
+++ b/connectors/jdk-connector/src/test/java/module-info.java
@@ -28,11 +28,6 @@
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/connectors/jetty11-connector/pom.xml b/connectors/jetty11-connector/pom.xml
index ec70396..c25195f 100644
--- a/connectors/jetty11-connector/pom.xml
+++ b/connectors/jetty11-connector/pom.xml
@@ -120,46 +120,6 @@
<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-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-->
</dependencies>
<build>
diff --git a/connectors/jetty11-connector/src/test/java/module-info.java b/connectors/jetty11-connector/src/test/java/module-info.java
index 319b51d..eb47e83 100644
--- a/connectors/jetty11-connector/src/test/java/module-info.java
+++ b/connectors/jetty11-connector/src/test/java/module-info.java
@@ -30,11 +30,6 @@
requires org.junit.jupiter.engine;
requires org.hamcrest;
- // required by Grizzly* modules
- requires pfl.tf;
- requires gmbal;
-// end of required by Grizzly* modules
-
requires jakarta.xml.bind;
requires org.glassfish.jersey.tests.framework.core;
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
index 8e3a895..f2f9fc3 100644
--- a/containers/grizzly2-http/pom.xml
+++ b/containers/grizzly2-http/pom.xml
@@ -72,46 +72,6 @@
<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/test/java/module-info.java b/containers/grizzly2-http/src/test/java/module-info.java
index eb9fc9d..bf57de9 100644
--- a/containers/grizzly2-http/src/test/java/module-info.java
+++ b/containers/grizzly2-http/src/test/java/module-info.java
@@ -37,11 +37,6 @@
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/ext/proxy-client/pom.xml b/ext/proxy-client/pom.xml
index 88458a4..1c7fe41 100644
--- a/ext/proxy-client/pom.xml
+++ b/ext/proxy-client/pom.xml
@@ -83,32 +83,5 @@
<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 44b22ad..3796a82 100644
--- a/ext/proxy-client/src/test/java/module-info.java
+++ b/ext/proxy-client/src/test/java/module-info.java
@@ -32,8 +32,4 @@
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/pom.xml b/pom.xml
index d9845d3..c223d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2329,11 +2329,6 @@
<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>
@@ -2343,7 +2338,7 @@
<cdi.api.version>4.0.1</cdi.api.version>
<cdi.osgi.version>jakarta.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
<ejb.version>4.0.1</ejb.version>
- <grizzly2.version>4.0.1</grizzly2.version>
+ <grizzly2.version>4.0.2</grizzly2.version>
<grizzly.client.version>1.16</grizzly.client.version>
<grizzly.npn.version>2.0.0</grizzly.npn.version>
<hk2.version>3.0.5</hk2.version>
diff --git a/test-framework/providers/grizzly2/pom.xml b/test-framework/providers/grizzly2/pom.xml
index db1918d..84de880 100644
--- a/test-framework/providers/grizzly2/pom.xml
+++ b/test-framework/providers/grizzly2/pom.xml
@@ -53,36 +53,5 @@
<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/test/java/module-info.java b/test-framework/providers/grizzly2/src/test/java/module-info.java
index c18f8f0..e0f1309 100644
--- a/test-framework/providers/grizzly2/src/test/java/module-info.java
+++ b/test-framework/providers/grizzly2/src/test/java/module-info.java
@@ -24,10 +24,6 @@
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;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml
index a115e0d..02416df 100644
--- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml
+++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/pom.xml
@@ -121,33 +121,6 @@
<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 b815950..37aab72 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
@@ -26,11 +26,6 @@
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 d0dc3c5..9c53534 100644
--- a/tests/integration/cdi-integration/cdi-client-on-server/pom.xml
+++ b/tests/integration/cdi-integration/cdi-client-on-server/pom.xml
@@ -115,33 +115,6 @@
<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 48936dd..cf45446 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,9 +35,4 @@
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 9ffc8b0..44a90bd 100644
--- a/tests/integration/cdi-integration/cdi-log-check/pom.xml
+++ b/tests/integration/cdi-integration/cdi-log-check/pom.xml
@@ -110,33 +110,6 @@
<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 41bf4b1..fad5add 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,9 +40,4 @@
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 4b3f0fb..740fbc5 100644
--- a/tests/integration/cdi-integration/cdi-manually-bound/pom.xml
+++ b/tests/integration/cdi-integration/cdi-manually-bound/pom.xml
@@ -105,32 +105,5 @@
</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 b0d7552..aeacc09 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,9 +38,4 @@
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 b9fea90..ee4053a 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,33 +87,6 @@
<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 6b8783e..b8a87a8 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,9 +35,4 @@
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 9474d62..4effcbc 100644
--- a/tests/integration/cdi-integration/cdi-singleton/pom.xml
+++ b/tests/integration/cdi-integration/cdi-singleton/pom.xml
@@ -91,33 +91,6 @@
</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 0ef5653..ad833a5 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,9 +32,4 @@
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 24ddaf8..37d1925 100644
--- a/tests/integration/cdi-integration/cdi-test-webapp/pom.xml
+++ b/tests/integration/cdi-integration/cdi-test-webapp/pom.xml
@@ -82,33 +82,6 @@
<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 b169567..51db17e 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
@@ -26,10 +26,6 @@
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;
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 5234a2a..54976a8 100644
--- a/tests/integration/cdi-integration/context-inject-on-server/pom.xml
+++ b/tests/integration/cdi-integration/context-inject-on-server/pom.xml
@@ -69,33 +69,6 @@
<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 1506d00..4bd2777 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,9 +42,4 @@
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 76e646a..04f5111 100644
--- a/tests/integration/client-connector-provider/pom.xml
+++ b/tests/integration/client-connector-provider/pom.xml
@@ -57,33 +57,6 @@
<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 d53708b..7fa0966 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,9 +28,4 @@
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 495d4f2..b404462 100644
--- a/tests/integration/jersey-4099/pom.xml
+++ b/tests/integration/jersey-4099/pom.xml
@@ -85,37 +85,6 @@
<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 76dde06..428bc79 100644
--- a/tests/integration/jersey-4099/src/test/java/module-info.java
+++ b/tests/integration/jersey-4099/src/test/java/module-info.java
@@ -30,8 +30,4 @@
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
