commit a638934b1b3cc3915d0af4fade265a75f0ba3121
author David Pursehouse <dpursehouse@collab.net> Fri Nov 17 23:59:47 2017 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Nov 21 11:24:40 2017 +0000
tree 7ec50deee044df95aef1a9c542a0c94e9c2ea792
parent ac885b7b55b910e03f3bb52d01a4df028aed39e3

Upgrade amqp-client to 4.1.1

Change-Id: I2ffb91e3bc497712c6da480cdaf47acb22758573

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 70ed9e6..0af44ef 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,6 +3,6 @@
 def external_plugin_deps():
     maven_jar(
         name = "amqp_client",
-        artifact = "com.rabbitmq:amqp-client:3.5.2",
-        sha1 = "8d10edd29e08f78349bd1da9d18f81c9f8b90567",
+        artifact = "com.rabbitmq:amqp-client:4.1.1",
+        sha1 = "256f6c92c55a8d3cfae8d32e1a15713baedab184",
     )

src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java
index d0a872b..38b668f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java
@@ -160,7 +160,7 @@
       }
     } catch (URISyntaxException ex) {
       LOGGER.error(MSG("URI syntax error: {}"), amqp.uri);
-    } catch (IOException ex) {
+    } catch (IOException | TimeoutException ex) {
       LOGGER.error(MSG("Connection cannot be opened."), ex);
     } catch (KeyManagementException | NoSuchAlgorithmException ex) {
       LOGGER.error(MSG("Security error when opening connection."), ex);