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

CUSTCOM-22 Upgrade Grizzly and Amend HTTP/2 Push Help Text #4669

Merged
merged 3 commits into from
Jun 2, 2020
Merged

CUSTCOM-22 Upgrade Grizzly and Amend HTTP/2 Push Help Text #4669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a98289
Upgrade Grizzly version to 2.4.4.payara-p2
MattGill98 May 14, 2020
3dfba44
CUSTCOM-22 Amend HTTP/2 push admin console help text
MattGill98 May 14, 2020
6fab8f8
Merge branch 'master' into CUSTCOM-22
MattGill98 May 21, 2020
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
4 changes: 2 additions & 2 deletions appserver/admingui/web/src/main/resources/org/glassfish/web/admingui/Strings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
# Portions Copyright [2016-2018] [Payara Foundation and/or its affiliates.]
# Portions Copyright [2016-2020] [Payara Foundation and/or its affiliates.]

button.GetStatistics=Get Statistics

Expand Down Expand Up @@ -296,7 +296,7 @@ http.http2.cleanFrequencyCheck.help=The number of streams that must be closed be
http.http2.disableCipherCheck=Disable HTTP/2 Cipher Check:
http.http2.disableCipherCheck.help=Whether or not insecure cipher suites are allowed to establish TLS connections.
http.http2.pushEnabled=HTTP/2 Push Enabled:
http.http2.pushEnabled.help=Whether or not push is allowed by the server endpoints. The default is true.
http.http2.pushEnabled.help=Whether or not HTTP/2 push is allowed by the server endpoints.

http.CompressableMimeType=Compressible Mime Types:
http.CompressableMimeTypeHelp=Comma-separated list of MIME types for which HTTP compression is used
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 @@ -121,7 +121,7 @@
<!-- BOM-referenced versions -->
<jakartaee.api.version>8.0.0</jakartaee.api.version>
<servlet-api.version>4.0.2</servlet-api.version>
<grizzly.version>2.4.4.payara-p1</grizzly.version>
<grizzly.version>2.4.4.payara-p2</grizzly.version>
<jax-rs-api.impl.version>2.1.6</jax-rs-api.impl.version>
<jersey.version>2.30.payara-p2</jersey.version>
<jakarta.validation.version>2.0.2</jakarta.validation.version>
Expand Down