Skip to content

Commit

Permalink
Merge pull request #4669 from MattGill98/CUSTCOM-22
Browse files Browse the repository at this point in the history
CUSTCOM-22 Upgrade Grizzly and Amend HTTP/2 Push Help Text
  • Loading branch information
MattGill98 authored Jun 2, 2020
2 parents 1526738 + 6fab8f8 commit f8679df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
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
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

0 comments on commit f8679df

Please sign in to comment.