Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adopt new Grizzly 4.0.2 #883

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Adopt new Grizzly 4.0.2 #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions containers/grizzly-client/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions containers/grizzly-server/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<activation.api.version>2.1.2</activation.api.version> <!-- inherited from JAX-B -->
<cdi-api.version>4.0.1</cdi-api.version>
<ejb-api.version>4.0.1</ejb-api.version>
<grizzly.version>4.0.0</grizzly.version>
<grizzly.version>4.0.2</grizzly.version>
<glassfish.version>7.0.9</glassfish.version>
<inject.api.version>2.0.1</inject.api.version><!-- inherited from CDI, do not update unless inline with it -->
<jaxb.api.version>4.0.1</jaxb.api.version>
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/non-deployable/src/test/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down
6 changes: 4 additions & 2 deletions tests/e2e/standard-config/src/test/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion tests/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 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
Expand Down Expand Up @@ -34,7 +34,9 @@
<module>async</module>
<module>autobahn-server</module>
<module>basic</module>
<!-- Until new GF with new grizzly is released
<module>embedded-glassfish-test</module>
-->
<module>dynamic-deploy</module>
<module>noappconfig</module>
<module>oneappconfig</module>
Expand Down
8 changes: 4 additions & 4 deletions tests/tools/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down