From 53f55b47052f38ab6538d386d8a5b8a684313148 Mon Sep 17 00:00:00 2001 From: dakirily Date: Mon, 20 Nov 2023 16:29:12 +0100 Subject: [PATCH] QPID-8655: [Broker-J] Dependency updates for version 9.1.x --- .../DEPENDENCIES_REFERENCE | 54 +++++++++---------- .../graylog-logging-logback/pom.xml | 2 +- .../logback/graylog/GraylogAppender.java | 2 +- .../DEPENDENCIES_REFERENCE | 16 +++--- pom.xml | 30 +++++------ 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 9a3fb5093f..026c8a3efe 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -26,10 +26,10 @@ Apache Qpid Broker-J Bundles From: 'an unknown organization' - - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/failureaccess) com.google.guava:failureaccess:bundle:1.0.1 + - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/failureaccess) com.google.guava:failureaccess:bundle:1.0.2 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Guava: Google Core Libraries for Java (https://github.com/google/guava) com.google.guava:guava:bundle:32.1.3-jre + - Guava: Google Core Libraries for Java (https://github.com/google/guava) com.google.guava:guava:bundle:33.0.0-jre License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - J2ObjC Annotations (https://github.com/google/j2objc/) com.google.j2objc:j2objc-annotations:jar:2.8 @@ -50,13 +50,13 @@ From: 'an unknown organization' - Prometheus Java Span Context Supplier - OpenTelemetry Agent (http://github.com/prometheus/client_java/simpleclient_tracer/simpleclient_tracer_otel_agent) io.prometheus:simpleclient_tracer_otel_agent:bundle:0.16.0 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (https://www.bouncycastle.org/java.html) org.bouncycastle:bcpkix-jdk18on:jar:1.76 + - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (https://www.bouncycastle.org/java.html) org.bouncycastle:bcpkix-jdk18on:jar:1.77 License: Bouncy Castle Licence (https://www.bouncycastle.org/licence.html) - - Bouncy Castle Provider (https://www.bouncycastle.org/java.html) org.bouncycastle:bcprov-jdk18on:jar:1.76 + - Bouncy Castle Provider (https://www.bouncycastle.org/java.html) org.bouncycastle:bcprov-jdk18on:jar:1.77 License: Bouncy Castle Licence (https://www.bouncycastle.org/licence.html) - - Bouncy Castle ASN.1 Extension and Utility APIs (https://www.bouncycastle.org/java.html) org.bouncycastle:bcutil-jdk18on:jar:1.76 + - Bouncy Castle ASN.1 Extension and Utility APIs (https://www.bouncycastle.org/java.html) org.bouncycastle:bcutil-jdk18on:jar:1.77 License: Bouncy Castle Licence (https://www.bouncycastle.org/licence.html) - dgrid (https://www.webjars.org) org.webjars.bower:dgrid:jar:1.3.3 @@ -74,13 +74,13 @@ From: 'Apache Software Foundation' (http://db.apache.org/) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:jar:2.15.3 + - Jackson-annotations (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:jar:2.16.1 License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:jar:2.15.3 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:jar:2.16.1 License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:jar:2.15.3 + - jackson-databind (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:jar:2.16.1 License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) @@ -114,11 +114,11 @@ From: 'OW2' (http://www.ow2.org/) From: 'QOS.ch' (http://www.qos.ch) - - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.4.11 + - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.4.14 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) - - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.4.11 + - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.4.14 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) @@ -130,7 +130,7 @@ From: 'QOS.ch' (http://www.qos.ch) License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) - - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:2.0.9 + - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:2.0.10 License: MIT License (http://www.opensource.org/licenses/mit-license.php) @@ -224,67 +224,67 @@ From: 'The CometD Project' (https://cometd.org) From: 'Webtide' (https://webtide.com) - - Jetty :: Http Utility (https://eclipse.dev/jetty/jetty-http) org.eclipse.jetty:jetty-http:jar:11.0.18 + - Jetty :: Http Utility (https://eclipse.dev/jetty/jetty-http) org.eclipse.jetty:jetty-http:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: IO Utility (https://eclipse.dev/jetty/jetty-io) org.eclipse.jetty:jetty-io:jar:11.0.18 + - Jetty :: IO Utility (https://eclipse.dev/jetty/jetty-io) org.eclipse.jetty:jetty-io:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Rewrite Handler (https://eclipse.dev/jetty/jetty-rewrite) org.eclipse.jetty:jetty-rewrite:jar:11.0.18 + - Jetty :: Rewrite Handler (https://eclipse.dev/jetty/jetty-rewrite) org.eclipse.jetty:jetty-rewrite:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Security (https://eclipse.dev/jetty/jetty-security) org.eclipse.jetty:jetty-security:jar:11.0.18 + - Jetty :: Security (https://eclipse.dev/jetty/jetty-security) org.eclipse.jetty:jetty-security:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Server Core (https://eclipse.dev/jetty/jetty-server) org.eclipse.jetty:jetty-server:jar:11.0.18 + - Jetty :: Server Core (https://eclipse.dev/jetty/jetty-server) org.eclipse.jetty:jetty-server:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Servlet Handling (https://eclipse.dev/jetty/jetty-servlet) org.eclipse.jetty:jetty-servlet:jar:11.0.18 + - Jetty :: Servlet Handling (https://eclipse.dev/jetty/jetty-servlet) org.eclipse.jetty:jetty-servlet:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Utility Servlets and Filters (https://eclipse.dev/jetty/jetty-servlets) org.eclipse.jetty:jetty-servlets:jar:11.0.18 + - Jetty :: Utility Servlets and Filters (https://eclipse.dev/jetty/jetty-servlets) org.eclipse.jetty:jetty-servlets:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Utilities (https://eclipse.dev/jetty/jetty-util) org.eclipse.jetty:jetty-util:jar:11.0.18 + - Jetty :: Utilities (https://eclipse.dev/jetty/jetty-util) org.eclipse.jetty:jetty-util:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Webapp Application Support (https://eclipse.dev/jetty/jetty-webapp) org.eclipse.jetty:jetty-webapp:jar:11.0.18 + - Jetty :: Webapp Application Support (https://eclipse.dev/jetty/jetty-webapp) org.eclipse.jetty:jetty-webapp:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: XML utilities (https://eclipse.dev/jetty/jetty-xml) org.eclipse.jetty:jetty-xml:jar:11.0.18 + - Jetty :: XML utilities (https://eclipse.dev/jetty/jetty-xml) org.eclipse.jetty:jetty-xml:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Websocket :: Core :: Common (https://eclipse.dev/jetty/websocket-parent/websocket-core-common) org.eclipse.jetty.websocket:websocket-core-common:jar:11.0.18 + - Jetty :: Websocket :: Core :: Common (https://eclipse.dev/jetty/websocket-parent/websocket-core-common) org.eclipse.jetty.websocket:websocket-core-common:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Websocket :: Core :: Server (https://eclipse.dev/jetty/websocket-parent/websocket-core-server) org.eclipse.jetty.websocket:websocket-core-server:jar:11.0.18 + - Jetty :: Websocket :: Core :: Server (https://eclipse.dev/jetty/websocket-parent/websocket-core-server) org.eclipse.jetty.websocket:websocket-core-server:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Websocket :: org.eclipse.jetty.websocket :: API (https://eclipse.dev/jetty/websocket-parent/websocket-jetty-api) org.eclipse.jetty.websocket:websocket-jetty-api:jar:11.0.18 + - Jetty :: Websocket :: org.eclipse.jetty.websocket :: API (https://eclipse.dev/jetty/websocket-parent/websocket-jetty-api) org.eclipse.jetty.websocket:websocket-jetty-api:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Websocket :: org.eclipse.jetty.websocket :: Common (https://eclipse.dev/jetty/websocket-parent/websocket-jetty-common) org.eclipse.jetty.websocket:websocket-jetty-common:jar:11.0.18 + - Jetty :: Websocket :: org.eclipse.jetty.websocket :: Common (https://eclipse.dev/jetty/websocket-parent/websocket-jetty-common) org.eclipse.jetty.websocket:websocket-jetty-common:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Websocket :: org.eclipse.jetty.websocket :: Server (https://eclipse.dev/jetty/websocket-parent/websocket-jetty-server) org.eclipse.jetty.websocket:websocket-jetty-server:jar:11.0.18 + - Jetty :: Websocket :: org.eclipse.jetty.websocket :: Server (https://eclipse.dev/jetty/websocket-parent/websocket-jetty-server) org.eclipse.jetty.websocket:websocket-jetty-server:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - - Jetty :: Websocket :: Servlet (https://eclipse.dev/jetty/websocket-parent/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:11.0.18 + - Jetty :: Websocket :: Servlet (https://eclipse.dev/jetty/websocket-parent/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:11.0.19 License: Eclipse Public License - Version 2.0 (https://www.eclipse.org/legal/epl-2.0/) License: Apache Software License - Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0) diff --git a/broker-plugins/graylog-logging-logback/pom.xml b/broker-plugins/graylog-logging-logback/pom.xml index 26a24ae37f..e2285e8b95 100644 --- a/broker-plugins/graylog-logging-logback/pom.xml +++ b/broker-plugins/graylog-logging-logback/pom.xml @@ -23,7 +23,7 @@ org.apache.qpid qpid-broker-parent - 9.1.0-SNAPSHOT + 9.1.1-SNAPSHOT ../../pom.xml diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java index ac9e89bcef..f90cb519a2 100644 --- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java +++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java @@ -118,7 +118,7 @@ private GelfEncoder buildEncoder(Context context, GelfEncoderConfiguration setti encoder.setIncludeCallerData(settings.isCallerDataIncluded()); encoder.setIncludeRootCauseData(settings.hasRootExceptionDataIncluded()); encoder.setIncludeLevelName(settings.isLogLevelNameIncluded()); - encoder.setStaticFields(settings.getStaticFields()); + settings.getStaticFields().forEach(encoder::addStaticField); return encoder; } } diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 1c016a3bd1..c4f25099a7 100644 --- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -26,10 +26,10 @@ Apache Qpid Broker-J Performance Tests From: 'an unknown organization' - - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/failureaccess) com.google.guava:failureaccess:bundle:1.0.1 + - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/failureaccess) com.google.guava:failureaccess:bundle:1.0.2 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Guava: Google Core Libraries for Java (https://github.com/google/guava) com.google.guava:guava:bundle:32.1.3-jre + - Guava: Google Core Libraries for Java (https://github.com/google/guava) com.google.guava:guava:bundle:33.0.0-jre License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - J2ObjC Annotations (https://github.com/google/j2objc/) com.google.j2objc:j2objc-annotations:jar:2.8 @@ -44,27 +44,27 @@ From: 'Apache Software Foundation' (http://www.apache.org) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:jar:2.15.3 + - Jackson-annotations (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:jar:2.16.1 License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:jar:2.15.3 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:jar:2.16.1 License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:jar:2.15.3 + - jackson-databind (https://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:jar:2.16.1 License: The Apache Software License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) From: 'QOS.ch' (http://www.qos.ch) - - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.4.11 + - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.4.14 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) - - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.4.11 + - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.4.14 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) - - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:2.0.9 + - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:2.0.10 License: MIT License (http://www.opensource.org/licenses/mit-license.php) diff --git a/pom.xml b/pom.xml index b8ba6eb28b..c81c8892da 100644 --- a/pom.xml +++ b/pom.xml @@ -104,13 +104,13 @@ 7.4.5 10.14.2.0 - 1.4.11 + 1.4.14 1.2.11.1 - 32.1.3-jre - 2.15.3 - 2.15.3 - 2.0.9 - 11.0.18 + 33.0.0-jre + 2.16.1 + 2.16.1 + 2.0.10 + 11.0.19 0.8.0.RELEASE @@ -130,8 +130,8 @@ 5.10.1 - 5.7.0 - 4.1.100.Final + 5.9.0 + 4.1.106.Final 2.2 3.8.6 1.8.2 @@ -141,7 +141,7 @@ 2.3.1 15.4 - 3.1.0 + 3.1.1 2.6 4.1.5 3.4.1 @@ -154,16 +154,16 @@ 2.0.15 5.0-all 1.4 - 3.11.0 + 3.12.1 3.3.0 - 3.2.2 - 3.2.2 + 3.2.3 + 3.2.3 2.2.224 2.0.0.AM27 2.0.3 - 1.76 - 1.76 - 3.0.0 + 1.77 + 1.77 + 5.0.1 0.16.0 false