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 2018/11/12 10:51:49 UTC
[1/3] qpid-broker-j git commit: QPID-8259: [Broker-J] Upgrade Jetty
to version 9.4.12.v20180830
Repository: qpid-broker-j
Updated Branches:
refs/heads/master bed50962f -> 3b407342c
QPID-8259: [Broker-J] Upgrade Jetty to version 9.4.12.v20180830
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a70d7c3d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a70d7c3d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a70d7c3d
Branch: refs/heads/master
Commit: a70d7c3db78ac222b331d4c608dae44bb839b16d
Parents: bed5096
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Nov 12 10:28:01 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Nov 12 10:28:01 2018 +0000
----------------------------------------------------------------------
.../DEPENDENCIES_REFERENCE | 24 ++++++++++----------
.../management/plugin/HttpManagement.java | 8 +++----
pom.xml | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a70d7c3d/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
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 bf1cffa..8d21014 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
@@ -117,29 +117,29 @@ From: 'The Dojo Foundation' (http://dojotoolkit.org/foundation)
License: Academic Free License v2.1 (http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE) License: BSD License (http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE)
From: 'Webtide' (https://webtide.com)
- - Jetty :: Continuation (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-continuation:jar:9.4.3.v20170317
+ - Jetty :: Continuation (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-continuation:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Http Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-http:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: IO Utility (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-io:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Security (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-security:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Server Core (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-server:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Servlet Handling (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlet:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Utility Servlets and Filters (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-servlets:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Utilities (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-util:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Websocket :: API (http://www.eclipse.org/jetty/websocket-api) org.eclipse.jetty.websocket:websocket-api:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Websocket :: Common (http://www.eclipse.org/jetty/websocket-common) org.eclipse.jetty.websocket:websocket-common:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Websocket :: Server (http://www.eclipse.org/jetty/websocket-server) org.eclipse.jetty.websocket:websocket-server:jar:9.4.12.v20180830
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.3.v20170317
+ - Jetty :: Websocket :: Servlet Interface (http://www.eclipse.org/jetty/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.12.v20180830
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)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a70d7c3d/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
----------------------------------------------------------------------
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 f1b781d..b591010 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
@@ -35,9 +35,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
@@ -184,7 +184,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
private volatile boolean _serveUncompressedDojo;
private volatile Long _saslExchangeExpiry;
- private volatile ExecutorService _jettyServerExecutor;
+ private volatile ThreadPoolExecutor _jettyServerExecutor;
@ManagedObjectFactoryConstructor
public HttpManagement(Map<String, Object> attributes, Broker broker)
@@ -296,7 +296,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
{
LOGGER.debug("Starting up web server on {}", ports);
- _jettyServerExecutor = Executors.newSingleThreadExecutor(new DaemonThreadFactory("Jetty-Server-Thread"));
+ _jettyServerExecutor = new ScheduledThreadPoolExecutor(1, new DaemonThreadFactory("Jetty-Server-Thread"));
Server server = new Server(new ExecutorThreadPool(_jettyServerExecutor));
int lastPort = -1;
for (HttpPort<?> port : ports)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a70d7c3d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9389881..7dd573e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<guava-version>27.0-jre</guava-version>
<fasterxml-jackson-version>2.9.5</fasterxml-jackson-version>
<slf4j-version>1.7.25</slf4j-version>
- <jetty-version>9.4.3.v20170317</jetty-version>
+ <jetty-version>9.4.12.v20180830</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
[3/3] qpid-broker-j git commit: NO-JIRA: [Broker-J] Update qpid jms
client version to 0.37.0
Posted by or...@apache.org.
NO-JIRA: [Broker-J] Update qpid jms client version to 0.37.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/3b407342
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/3b407342
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/3b407342
Branch: refs/heads/master
Commit: 3b407342c45d128fd3c06d06f40aabcc9606a051
Parents: 606303b
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Nov 12 10:42:22 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Nov 12 10:42:22 2018 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3b407342/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94c3305..6fcbc34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<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.36.0</qpid-jms-client-version>
+ <qpid-jms-client-version>0.37.0</qpid-jms-client-version>
<qpid-jms-client-amqp-0-x-version>6.3.3</qpid-jms-client-amqp-0-x-version>
<jaxb-api-version>2.3.1</jaxb-api-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-broker-j git commit: QPID-8258: [Broker-J] Upgrade
dojotoolkit to version 1.14
Posted by or...@apache.org.
QPID-8258: [Broker-J] Upgrade dojotoolkit to version 1.14
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/606303b4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/606303b4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/606303b4
Branch: refs/heads/master
Commit: 606303b4d2aca0d7037cd9314a2eb93a59c5fbc4
Parents: a70d7c3
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Nov 12 10:32:06 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Nov 12 10:32:06 2018 +0000
----------------------------------------------------------------------
.../assembly/dependency-verification/DEPENDENCIES_REFERENCE | 6 +++---
pom.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/606303b4/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
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 8d21014..991b09f 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
@@ -112,9 +112,9 @@ From: 'The Apache Software Foundation' (https://www.apache.org/)
- Apache Qpid Broker-J WebSocket Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-websocket) org.apache.qpid:qpid-broker-plugins-websocket:jar
License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)
-From: 'The Dojo Foundation' (http://dojotoolkit.org/foundation)
- - Dojo Toolkit :: Bundles (http://dojotoolkit.org/dojo) org.dojotoolkit:dojo:pom:1.12.2
- License: Academic Free License v2.1 (http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE) License: BSD License (http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE)
+From: 'The CometD Project' (https://cometd.org)
+ - Dojo Toolkit :: Bundles (http://dojotoolkit.org/dojo) org.dojotoolkit:dojo:pom:1.14.0
+ 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.12.v20180830
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/606303b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7dd573e..94c3305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<csvjdbc-version>1.0.8</csvjdbc-version>
<jfreechart-version>1.0.13</jfreechart-version>
- <dojo-version>1.12.2</dojo-version>
+ <dojo-version>1.14.0</dojo-version>
<dstore-version>1.1.2</dstore-version>
<dgrid-version>1.2.1</dgrid-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org