You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2020/09/12 19:11:04 UTC
[qpid-broker-j] branch 7.1.x updated (d007293 -> 0a36324)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from d007293 QPID-8448: Make sure that actual connection is closed
new 18d6010 QPID-8464: [Broker-J] Upgrade jackson dependencies to latest versions
new 0974762 QPID-8465: [Broker-J] Upgrade jetty version
new 0a36324 QPID-8466: Update test dependencies
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dependency-verification/DEPENDENCIES_REFERENCE | 30 +++++++++++-----------
.../server/management/plugin/HttpManagement.java | 2 +-
.../transport/websocket/WebSocketProvider.java | 2 +-
.../dependency-verification/DEPENDENCIES_REFERENCE | 6 ++---
pom.xml | 18 ++++++-------
5 files changed, 29 insertions(+), 29 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/03: QPID-8464: [Broker-J] Upgrade jackson
dependencies to latest versions
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 18d60100a72b659f752f988be814bfbdefa90fc4
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sat Sep 12 02:15:49 2020 +0100
QPID-8464: [Broker-J] Upgrade jackson dependencies to latest versions
---
.../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 6 +++---
.../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 6 +++---
pom.xml | 4 ++--
3 files changed, 8 insertions(+), 8 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 d92150c..3a8209a 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
@@ -41,11 +41,11 @@ From: 'Apache Software Foundation' (http://db.apache.org/)
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'FasterXML' (http://fasterxml.com/)
- - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.10.2
+ - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.10.5
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.10.2
+ - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.10.5
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.10.2
+ - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.10.5
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'GlassFish Community' (https://glassfish.dev.java.net)
diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 412a4bf..da14385 100644
--- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -33,11 +33,11 @@ From: 'Apache Software Foundation' (http://www.apache.org)
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'FasterXML' (http://fasterxml.com/)
- - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.10.2
+ - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.10.5
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.10.2
+ - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.10.5
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.10.2
+ - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.10.5
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'QOS.ch' (http://www.qos.ch)
diff --git a/pom.xml b/pom.xml
index c49bcb8..9d7a90d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,8 +105,8 @@
<derby-version>10.13.1.1</derby-version>
<logback-version>1.2.3</logback-version>
<guava-version>27.0-jre</guava-version>
- <fasterxml-jackson-version>2.10.2</fasterxml-jackson-version>
- <fasterxml-jackson-databind-version>2.10.2</fasterxml-jackson-databind-version>
+ <fasterxml-jackson-version>2.10.5</fasterxml-jackson-version>
+ <fasterxml-jackson-databind-version>2.10.5</fasterxml-jackson-databind-version>
<slf4j-version>1.7.26</slf4j-version>
<jetty-version>9.4.19.v20190610</jetty-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 03/03: QPID-8466: Update test dependencies
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 0a36324b2c580248bfd9d2942fd9d6eca6f7d8f5
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sat Sep 12 02:10:43 2020 +0100
QPID-8466: Update test dependencies
(cherry picked from commit add243af25b5c848fa7e3b66bf7083fcd2f21461)
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ee29c2..fe6d3fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,13 +129,13 @@
<!-- test dependency version numbers -->
<junit-version>4.12</junit-version>
<mockito-version>2.28.2</mockito-version>
- <netty-version>4.1.32.Final</netty-version>
+ <netty-version>4.1.51.Final</netty-version>
<hamcrest-version>2.1</hamcrest-version>
<maven-core-version>3.5.4</maven-core-version>
<maven-resolver-version>1.1.1</maven-resolver-version>
<httpclient-version>4.5.3</httpclient-version>
- <qpid-jms-client-version>0.40.0</qpid-jms-client-version>
- <qpid-jms-client-amqp-0-x-version>6.3.3</qpid-jms-client-amqp-0-x-version>
+ <qpid-jms-client-version>0.54.0</qpid-jms-client-version>
+ <qpid-jms-client-amqp-0-x-version>6.3.4</qpid-jms-client-amqp-0-x-version>
<jaxb-api-version>2.3.1</jaxb-api-version>
<exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
@@ -151,9 +151,9 @@
<buildnumber-maven-plugin-version>1.4</buildnumber-maven-plugin-version>
<maven-jar-plugin-version>3.1.0</maven-jar-plugin-version>
<maven-surefire-report-plugin-version>2.22.0</maven-surefire-report-plugin-version>
- <h2.version>1.4.199</h2.version>
- <apache-directory-version>2.0.0-M23</apache-directory-version>
- <kerby-version>1.0.1</kerby-version>
+ <h2.version>1.4.200</h2.version>
+ <apache-directory-version>2.0.0.AM25</apache-directory-version>
+ <kerby-version>2.0.1</kerby-version>
<prometheus-client-version>0.9.0</prometheus-client-version>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/03: QPID-8465: [Broker-J] Upgrade jetty version
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 097476246eaa8a8b01d42a99f8d2582bb62a889a
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Fri Sep 11 23:27:04 2020 +0100
QPID-8465: [Broker-J] Upgrade jetty version
(cherry picked from commit 868199909bc1044612119b693b79b6d8c887a768)
---
.../dependency-verification/DEPENDENCIES_REFERENCE | 24 +++++++++++-----------
.../server/management/plugin/HttpManagement.java | 2 +-
.../transport/websocket/WebSocketProvider.java | 2 +-
pom.xml | 2 +-
4 files changed, 15 insertions(+), 15 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 3a8209a..4b7dc93 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
@@ -125,29 +125,29 @@ From: 'The CometD Project' (https://cometd.org)
License: Academic Free License v2.1 (https://github.com/dojo/dojo/blob/master/LICENSE) License: BSD License (https://github.com/dojo/dojo/blob/master/LICENSE)
From: 'Webtide' (https://webtide.com)
- - Jetty :: Continuation (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-continuation:jar:9.4.19.v20190610
+ - Jetty :: Continuation (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-continuation:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Http Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-http:jar:9.4.19.v20190610
+ - Jetty :: Http Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-http:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: IO Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-io:jar:9.4.19.v20190610
+ - Jetty :: IO Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-io:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Security (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-security:jar:9.4.19.v20190610
+ - Jetty :: Security (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-security:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Server Core (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-server:jar:9.4.19.v20190610
+ - Jetty :: Server Core (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-server:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Servlet Handling (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlet:jar:9.4.19.v20190610
+ - Jetty :: Servlet Handling (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlet:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Utility Servlets and Filters (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlets:jar:9.4.19.v20190610
+ - Jetty :: Utility Servlets and Filters (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlets:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Utilities (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-util:jar:9.4.19.v20190610
+ - Jetty :: Utilities (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-util:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Websocket :: API (http://www.eclipse.org/jetty/websocket-api) org.eclipse.jetty.websocket:websocket-api:jar:9.4.19.v20190610
+ - Jetty :: Websocket :: API (http://www.eclipse.org/jetty/websocket-api) org.eclipse.jetty.websocket:websocket-api:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Websocket :: Common (http://www.eclipse.org/jetty/websocket-common) org.eclipse.jetty.websocket:websocket-common:jar:9.4.19.v20190610
+ - Jetty :: Websocket :: Common (http://www.eclipse.org/jetty/websocket-common) org.eclipse.jetty.websocket:websocket-common:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Websocket :: Server (http://www.eclipse.org/jetty/websocket-server) org.eclipse.jetty.websocket:websocket-server:jar:9.4.19.v20190610
+ - Jetty :: Websocket :: Server (http://www.eclipse.org/jetty/websocket-server) org.eclipse.jetty.websocket:websocket-server:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
- - Jetty :: Websocket :: Servlet Interface (http://www.eclipse.org/jetty/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.19.v20190610
+ - Jetty :: Websocket :: Servlet Interface (http://www.eclipse.org/jetty/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.31.v20200723
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 43da9db..0aeb2b7 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -951,7 +951,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
}
@Override
- protected Thread newThread(final Runnable runnable)
+ public Thread newThread(final Runnable runnable)
{
return _threadFactory.newThread(runnable);
}
diff --git a/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java b/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
index b098b54..757a9c1 100644
--- a/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
+++ b/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
@@ -331,7 +331,7 @@ class WebSocketProvider implements AcceptingTransport
private final ThreadFactory _threadFactory = QpidByteBuffer.createQpidByteBufferTrackingThreadFactory(r -> QBBTrackingThreadPool.super.newThread(r));
@Override
- protected Thread newThread(final Runnable runnable)
+ public Thread newThread(final Runnable runnable)
{
return _threadFactory.newThread(runnable);
}
diff --git a/pom.xml b/pom.xml
index 9d7a90d..9ee29c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
<fasterxml-jackson-version>2.10.5</fasterxml-jackson-version>
<fasterxml-jackson-databind-version>2.10.5</fasterxml-jackson-databind-version>
<slf4j-version>1.7.26</slf4j-version>
- <jetty-version>9.4.19.v20190610</jetty-version>
+ <jetty-version>9.4.31.v20200723</jetty-version>
<!-- dependency version numbers -->
<bonecp-version>0.7.1.RELEASE</bonecp-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org