From 7e566d697ab767a0399863a1435885cad27dd9b7 Mon Sep 17 00:00:00 2001 From: jansupol Date: Mon, 8 Jan 2024 19:46:56 +0100 Subject: [PATCH] Adopt new Grizzly 4.0.2 Signed-off-by: jansupol --- containers/grizzly-client/src/main/java/module-info.java | 6 +++--- containers/grizzly-server/src/main/java/module-info.java | 8 ++++---- pom.xml | 2 +- tests/e2e/non-deployable/src/test/java/module-info.java | 8 ++++---- tests/e2e/standard-config/src/test/java/module-info.java | 6 ++++-- tests/servlet/pom.xml | 4 +++- tests/tools/src/main/java/module-info.java | 8 ++++---- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/containers/grizzly-client/src/main/java/module-info.java b/containers/grizzly-client/src/main/java/module-info.java index 3ed7e997..14f06274 100644 --- a/containers/grizzly-client/src/main/java/module-info.java +++ b/containers/grizzly-client/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024 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,8 +21,8 @@ module org.glassfish.tyrus.container.grizzly.client { requires java.logging; requires jakarta.websocket; - requires grizzly.framework; - requires grizzly.http; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http; requires org.glassfish.tyrus.spi; requires org.glassfish.tyrus.client; requires org.glassfish.tyrus.core; diff --git a/containers/grizzly-server/src/main/java/module-info.java b/containers/grizzly-server/src/main/java/module-info.java index a987d9e1..229ff7f1 100644 --- a/containers/grizzly-server/src/main/java/module-info.java +++ b/containers/grizzly-server/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024 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 @@ -24,9 +24,9 @@ requires jakarta.websocket; requires jakarta.xml.bind; - requires grizzly.http; - requires grizzly.http.server; - requires grizzly.framework; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http; + requires org.glassfish.grizzly.http.server; requires org.glassfish.tyrus.core; requires org.glassfish.tyrus.spi; diff --git a/pom.xml b/pom.xml index 61376a3b..9a8e09bc 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 2.1.2 4.0.1 4.0.1 - 4.0.0 + 4.0.2 7.0.9 2.0.1 4.0.1 diff --git a/tests/e2e/non-deployable/src/test/java/module-info.java b/tests/e2e/non-deployable/src/test/java/module-info.java index 5ab1307a..b9d6f4d9 100644 --- a/tests/e2e/non-deployable/src/test/java/module-info.java +++ b/tests/e2e/non-deployable/src/test/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 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,9 +17,9 @@ module tyrus.tests.e2e.nondeployable { requires com.sun.xml.bind.osgi; - requires grizzly.framework; - requires grizzly.http; - requires grizzly.http.server; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http; + requires org.glassfish.grizzly.http.server; requires java.logging; diff --git a/tests/e2e/standard-config/src/test/java/module-info.java b/tests/e2e/standard-config/src/test/java/module-info.java index 2fb28198..5fb49637 100644 --- a/tests/e2e/standard-config/src/test/java/module-info.java +++ b/tests/e2e/standard-config/src/test/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024 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,7 +21,9 @@ module org.glassfish.tyrus.tests.e2e.stdconfig { requires java.logging; - requires grizzly.http.server; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http; + requires org.glassfish.grizzly.http.server; requires junit; diff --git a/tests/servlet/pom.xml b/tests/servlet/pom.xml index 82370fab..53dbc547 100755 --- a/tests/servlet/pom.xml +++ b/tests/servlet/pom.xml @@ -1,6 +1,6 @@ dynamic-deploy noappconfig oneappconfig diff --git a/tests/tools/src/main/java/module-info.java b/tests/tools/src/main/java/module-info.java index e9294b02..4b4021b8 100644 --- a/tests/tools/src/main/java/module-info.java +++ b/tests/tools/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024 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 @@ module org.glassfish.tyrus.test.tools { requires jakarta.websocket; - requires grizzly.framework; - requires grizzly.http; - requires grizzly.http.server; + requires org.glassfish.grizzly; + requires org.glassfish.grizzly.http; + requires org.glassfish.grizzly.http.server; requires junit;