From 9826a322efcb10f45a223a96187316b2f4a3f4e0 Mon Sep 17 00:00:00 2001 From: LoggingResearch <139747524+LoggingResearch@users.noreply.github.com> Date: Wed, 19 Jul 2023 15:03:20 +0800 Subject: [PATCH 1/5] Align Logging Level for Listener Timeout Exceptions with Debug --- .../main/java/org/eclipse/jetty/server/HttpChannelState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java index 426a88cd8f7..d28515d6dda 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java @@ -662,7 +662,7 @@ public class HttpChannelState catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener, x); + LOG.debug("{} while invoking onTimeout listener {}", x.toString(), listener, x); else LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener); } From ca7f1fca088a0fefaa06b80354b007cd5945bdbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 18:32:15 +0000 Subject: [PATCH 2/5] Bump the build-deps group with 5 updates Bumps the build-deps group with 5 updates: | Package | From | To | | --- | --- | --- | | [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) | `1.19.3` | `1.19.4` | | [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) | `3.2.3` | `3.2.5` | | [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.2.3` | `3.2.5` | | org.apache.maven.surefire:surefire-junit47 | `3.2.3` | `3.2.5` | | [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) | `3.10.2` | `3.11.0` | Updates `org.testcontainers:testcontainers-bom` from 1.19.3 to 1.19.4 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.3...1.19.4) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.2.3 to 3.2.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.3 to 3.2.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5) Updates `org.apache.maven.surefire:surefire-junit47` from 3.2.3 to 3.2.5 Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.10.2 to 3.11.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps - dependency-name: org.apache.maven.surefire:surefire-junit47 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps ... Signed-off-by: dependabot[bot] --- build-resources/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 32a80e94250..3cf6312cf7e 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -19,7 +19,7 @@ 3.4.0 true 3.1.0 - 3.2.3 + 3.2.5 UTF-8 diff --git a/pom.xml b/pom.xml index 44689368d92..da51885accf 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ 1.3.14 10.3.6 3.3.2 - 3.10.2 + 3.11.0 3.1.0 3.6.0 5.1.9 @@ -319,7 +319,7 @@ 3.3.1 3.5.1 3.3.0 - 3.2.3 + 3.2.5 3.9.0 3.4.0 2.2.3 @@ -343,7 +343,7 @@ 0 1.2.5 1.2.5 - 1.19.3 + 1.19.4 2.16.2 3.1.9.Final 1.7.0.Final From dcad8b7caab65b55084a2430bb256780890fb5a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 18:32:58 +0000 Subject: [PATCH 3/5] Bump the integration-deps group with 1 update Bumps the integration-deps group with 1 update: [org.wildfly.security:wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron). Updates `org.wildfly.security:wildfly-elytron` from 2.2.2.Final to 2.2.3.Final - [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.2.2.Final...2.2.3.Final) --- updated-dependencies: - dependency-name: org.wildfly.security:wildfly-elytron dependency-type: direct:production update-type: version-update:semver-patch dependency-group: integration-deps ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44689368d92..04ff39ae5f2 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ 2.16.2 3.1.9.Final 1.7.0.Final - 2.2.2.Final + 2.2.3.Final 2.4.8 From a57f86e6c488a9d39b23f432e37c232f71ecf468 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 18:44:24 +0000 Subject: [PATCH 4/5] Bump the dev-dependencies group with 9 updates Bumps the dev-dependencies group with 9 updates: | Package | From | To | | --- | --- | --- | | [io.grpc:grpc-core](https://github.com/grpc/grpc-java) | `1.60.1` | `1.61.0` | | io.hawt:hawtio-default | `3.0.0` | `3.0.1` | | [org.apache.maven.plugin-tools:maven-plugin-tools-api](https://github.com/apache/maven-plugin-tools) | `3.10.2` | `3.11.0` | | [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) | `3.10.2` | `3.11.0` | | [org.asciidoctor:asciidoctor-maven-plugin](https://github.com/asciidoctor/asciidoctor-maven-plugin) | `2.2.4` | `2.2.5` | | [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | `2.41.1` | `2.43.0` | | [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) | `4.8.2.0` | `4.8.3.0` | | [org.codehaus.mojo:flatten-maven-plugin](https://github.com/mojohaus/flatten-maven-plugin) | `1.5.0` | `1.6.0` | | [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore) | `2.17.6` | `2.18.2` | Updates `io.grpc:grpc-core` from 1.60.1 to 1.61.0 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.60.1...v1.61.0) Updates `io.hawt:hawtio-default` from 3.0.0 to 3.0.1 Updates `org.apache.maven.plugin-tools:maven-plugin-tools-api` from 3.10.2 to 3.11.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0) Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.10.2 to 3.11.0 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0) Updates `org.asciidoctor:asciidoctor-maven-plugin` from 2.2.4 to 2.2.5 - [Release notes](https://github.com/asciidoctor/asciidoctor-maven-plugin/releases) - [Changelog](https://github.com/asciidoctor/asciidoctor-maven-plugin/blob/asciidoctor-maven-plugin-2.2.5/CHANGELOG.adoc) - [Commits](https://github.com/asciidoctor/asciidoctor-maven-plugin/compare/asciidoctor-maven-plugin-2.2.4...asciidoctor-maven-plugin-2.2.5) Updates `com.diffplug.spotless:spotless-maven-plugin` from 2.41.1 to 2.43.0 - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/maven/2.41.1...lib/2.43.0) Updates `com.github.spotbugs:spotbugs-maven-plugin` from 4.8.2.0 to 4.8.3.0 - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.2.0...spotbugs-maven-plugin-4.8.3.0) Updates `org.codehaus.mojo:flatten-maven-plugin` from 1.5.0 to 1.6.0 - [Release notes](https://github.com/mojohaus/flatten-maven-plugin/releases) - [Commits](https://github.com/mojohaus/flatten-maven-plugin/compare/1.5.0...1.6.0) Updates `com.google.cloud:google-cloud-datastore` from 2.17.6 to 2.18.2 - [Release notes](https://github.com/googleapis/java-datastore/releases) - [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/java-datastore/compare/v2.17.6...v2.18.2) --- updated-dependencies: - dependency-name: io.grpc:grpc-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: io.hawt:hawtio-default dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: org.apache.maven.plugin-tools:maven-plugin-tools-api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: org.asciidoctor:asciidoctor-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: com.diffplug.spotless:spotless-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: org.codehaus.mojo:flatten-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: com.google.cloud:google-cloud-datastore dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] --- build-resources/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- pom.xml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 32a80e94250..f17c9dfec17 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -41,7 +41,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.41.1 + 2.43.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 004df4699ad..1e6b1fbddc0 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -17,7 +17,7 @@ - 2.17.6 + 2.18.2 diff --git a/pom.xml b/pom.xml index 44689368d92..6761db30669 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ 1.11.3 4.5.14 4.4.16 - 2.2.4 + 2.2.5 2.2.14 2.5.11 9.6 @@ -220,16 +220,16 @@ 3.4.2 7.0.5 3.0.2 - 1.5.0 + 1.6.0 2.24.1 4.0.6 - 1.60.1 + 1.61.0 2.10.1 33.0.0-jre 5.1.0 1.0.10 2.2 - 3.0.0 + 3.0.1 5.3.6 4.6.5.Final 11.0.18.Final @@ -312,7 +312,7 @@ 3.6.0 3.3.0 3.6.3 - 3.10.2 + 3.11.0 3.0.1 3.1.0 1.9.18 @@ -338,7 +338,7 @@ UTF-8 src/it/settings.xml 2.0.9 - 4.8.2.0 + 4.8.3.0 2.1.1.RELEASE 0 1.2.5 @@ -1841,7 +1841,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.41.1 + 2.43.0 From c5a73c52f1847d8b8a122e455156d7dd16b25b39 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Mon, 29 Jan 2024 18:01:23 +0100 Subject: [PATCH 5/5] #11349 update to quiche version 0.20.0 Signed-off-by: Ludovic Orban --- .../eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java | 2 +- .../main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java index 2bfad6e253a..9c1990690c4 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/src/main/java/org/eclipse/jetty/quic/quiche/foreign/incubator/quiche_h.java @@ -33,7 +33,7 @@ public class quiche_h { // This interface is a translation of the quiche.h header of a specific version. // It needs to be reviewed each time the native lib version changes. - private static final String EXPECTED_QUICHE_VERSION = "0.18.0"; + private static final String EXPECTED_QUICHE_VERSION = "0.20.0"; public static final byte C_FALSE = 0; public static final byte C_TRUE = 1; diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java b/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java index b1ff0518922..2c321f0e862 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java +++ b/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java @@ -31,7 +31,7 @@ public interface LibQuiche extends Library { // This interface is a translation of the quiche.h header of a specific version. // It needs to be reviewed each time the native lib version changes. - String EXPECTED_QUICHE_VERSION = "0.18.0"; + String EXPECTED_QUICHE_VERSION = "0.20.0"; // The charset used to convert java.lang.String to char * and vice versa. Charset CHARSET = StandardCharsets.UTF_8; diff --git a/pom.xml b/pom.xml index c1ec1539eda..3abf6d2c080 100644 --- a/pom.xml +++ b/pom.xml @@ -265,7 +265,7 @@ 2.2.1.Final 3.5.3.Final 1.1 - 0.18.0 + 0.20.0 1.2 2.7 1.0.7