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 2019/05/03 22:21:08 UTC
[qpid-jms-amqp-0-x] branch master updated (2b8edbe -> 451a604)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git.
from 2b8edbe QPID-8281: [JMS AMQP 0-x] Use correct kystore type in tests
new 3952394 QPID-8282: [JMS AMQP 0-x] Change minimum java version to 1.8
new 6b30a4d QPID-8282: [JMS AMQP 0-x] Use java.util.Base64 for base64 encoding/decoding
new a6d7bc2 NO-JIRA: Remove unused class DataUrlUtils
new 32989ea NO-JIRA: Fix NPE in ClasspathQuery used in integration tests
new 948ef00 QPID-8282: Bump parent apache pom version to 21 and upgrade maven plugin versions
new 3ded717 QPID-8282: Upgrade mockito to version 2.22.0
new 253e1d2 QPID-8282: Update test dependecies
new 4888d26 NO-JIRA: Fix java docs
new 451a604 NO-JIRA: Upgrade Qpid Broker dependency
The 9 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:
client/pom.xml | 2 +-
.../security/scram/AbstractScramSaslClient.java | 6 +-
.../java/org/apache/qpid/util/DataUrlUtils.java | 32 ---------
.../main/java/org/apache/qpid/util/Strings.java | 6 +-
.../handler/PooledConnectionFactoryTest.java | 6 +-
.../client/message/AbstractJMSMessageTest.java | 13 ++--
.../message/Encrypted010MessageFactoryTest.java | 2 +-
.../message/Encrypted091MessageFactoryTest.java | 2 +-
.../org/apache/qpid/test/utils/PortHelper.java | 3 +-
.../network/security/ssl/SSLUtilTest.java | 30 ++++-----
pom.xml | 78 +++++++++++++++-------
systests/pom.xml | 2 +-
.../systest/core/dependency/ClasspathQuery.java | 7 +-
.../destination/AddressBasedDestinationTest.java | 10 ++-
14 files changed, 103 insertions(+), 96 deletions(-)
delete mode 100644 client/src/main/java/org/apache/qpid/util/DataUrlUtils.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 08/09: NO-JIRA: Fix java docs
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 4888d26d32e5326c57342a159e92e21ab5ec1c66
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Fri May 3 22:27:20 2019 +0100
NO-JIRA: Fix java docs
---
client/src/test/java/org/apache/qpid/test/utils/PortHelper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java b/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java
index 68c6026..64a8314 100644
--- a/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java
+++ b/client/src/test/java/org/apache/qpid/test/utils/PortHelper.java
@@ -49,6 +49,7 @@ public class PortHelper
* Gets the next available port starting from given point.
*
* @param fromPort the port to scan for availability
+ * @return port number
* @throws java.util.NoSuchElementException if there are no ports available
*/
public int getNextAvailable(int fromPort)
@@ -74,7 +75,7 @@ public class PortHelper
/**
* Gets the next available port that is higher than all other port numbers issued
* thus far. If no port numbers have been issued, a default is used.
- *
+ * @return port number
* @throws java.util.NoSuchElementException if there are no ports available
*/
public int getNextAvailable()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 06/09: QPID-8282: Upgrade mockito to version
2.22.0
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 3ded7176d65b44edf72ec6da240771fbe9c0589c
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Thu May 2 00:00:54 2019 +0100
QPID-8282: Upgrade mockito to version 2.22.0
---
client/pom.xml | 2 +-
.../qpid/client/handler/PooledConnectionFactoryTest.java | 6 +++---
.../apache/qpid/client/message/AbstractJMSMessageTest.java | 13 ++++++-------
.../qpid/client/message/Encrypted010MessageFactoryTest.java | 2 +-
.../qpid/client/message/Encrypted091MessageFactoryTest.java | 2 +-
pom.xml | 4 ++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 76f84c8..59e99c7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java b/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
index 2a0cb99..8ebd4eb 100644
--- a/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.client.handler;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
diff --git a/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java b/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
index 2bde82b..6afd593 100644
--- a/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
@@ -21,10 +21,10 @@
package org.apache.qpid.client.message;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -112,10 +112,9 @@ public class AbstractJMSMessageTest extends QpidTestCase
return argThat( new ArgumentMatcher<AMQDestination>()
{
@Override
- public boolean matches(Object argument)
+ public boolean matches(AMQDestination argument)
{
- AMQDestination actual = (AMQDestination) argument;
- return actual.getAddressName().equals(expectedAddress);
+ return argument.getAddressName().equals(expectedAddress);
}
});
}
diff --git a/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java b/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
index be6da1f..73d69e3 100644
--- a/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.client.message;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java b/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
index 21f7e24..f89e76f 100644
--- a/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.client.message;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/pom.xml b/pom.xml
index 257ec8d..e0db178 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
<!-- test dependency version numbers -->
<junit-version>4.11</junit-version>
- <mockito-version>1.9.5</mockito-version>
+ <mockito-version>2.22.0</mockito-version>
<hamcrest-version>1.3</hamcrest-version>
<httpclient-version>4.5.3</httpclient-version>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 09/09: NO-JIRA: Upgrade Qpid Broker dependency
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 451a604ff81038ad569ef995caf9993e622391cb
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Fri May 3 22:28:25 2019 +0100
NO-JIRA: Upgrade Qpid Broker dependency
---
systests/pom.xml | 2 +-
.../qpid/systest/destination/AddressBasedDestinationTest.java | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/systests/pom.xml b/systests/pom.xml
index 85325b6..de02637 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -165,7 +165,7 @@
<properties>
<qpid.amqp.version>0-10</qpid.amqp.version>
<surefire.working.directory>${project.build.directory}${file.separator}surefire-reports${file.separator}${qpid.amqp.version}</surefire.working.directory>
- <qpid-broker-j-version>7.0.3</qpid-broker-j-version>
+ <qpid-broker-j-version>7.1.2</qpid-broker-j-version>
<qpid.systest.broker_admin>org.apache.qpid.systest.core.brokerj.SpawnQpidBrokerAdmin</qpid.systest.broker_admin>
<qpid.systest.java8.executable>java</qpid.systest.java8.executable>
<qpid.systest.virtualhost.blueprint>{"type":"BDB","globalAddressDomains":"[]"}</qpid.systest.virtualhost.blueprint>
diff --git a/systests/src/test/java/org/apache/qpid/systest/destination/AddressBasedDestinationTest.java b/systests/src/test/java/org/apache/qpid/systest/destination/AddressBasedDestinationTest.java
index 1665283..20323e3 100644
--- a/systests/src/test/java/org/apache/qpid/systest/destination/AddressBasedDestinationTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/destination/AddressBasedDestinationTest.java
@@ -455,10 +455,9 @@ public class AddressBasedDestinationTest extends JmsTestBase
AMQDestination dest = new AMQAnyDestination(addr);
- MessageConsumer cons;
try
{
- cons = jmsSession.createConsumer(dest);
+ jmsSession.createConsumer(dest);
if (useNonsenseArguments || useNonsenseExchangeType)
{
fail("Expected execution exception during exchange declare did not occur");
@@ -474,6 +473,11 @@ public class AddressBasedDestinationTest extends JmsTestBase
//for. We can't do the rest of the test as a result of the exception, just stop.
return;
}
+ else if (useNonsenseArguments && ( e.getMessage().contains(String.valueOf(ExecutionErrorCode.ILLEGAL_ARGUMENT.getValue())))
+ || e.getMessage().contains(String.valueOf(ExecutionErrorCode.INVALID_ARGUMENT.getValue())))
+ {
+ return;
+ }
else if (useNonsenseExchangeType && (e.getErrorCode().equals(String.valueOf(404))))
{
return;
@@ -499,7 +503,7 @@ public class AddressBasedDestinationTest extends JmsTestBase
// The client should be able to query and verify the existence of my-exchange (QPID-2774)
dest = new AMQAnyDestination("ADDR:my-exchange; {create: never}");
- cons = jmsSession.createConsumer(dest);
+ jmsSession.createConsumer(dest).close();
}
private String createExchangeArgsString(final boolean withExchangeArgs,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 05/09: QPID-8282: Bump parent apache pom
version to 21 and upgrade maven plugin versions
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 948ef002b4404a66d8164e0c47517567f8a1c1e3
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed May 1 23:49:55 2019 +0100
QPID-8282: Bump parent apache pom version to 21 and upgrade maven plugin versions
---
pom.xml | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8b275dc..257ec8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
</parent>
<groupId>org.apache.qpid</groupId>
@@ -92,25 +92,23 @@
<!-- dependency version numbers -->
<geronimo-jms-1-1-version>1.1.1</geronimo-jms-1-1-version>
- <velocity-version>1.4</velocity-version>
- <jython-version>2.5.3</jython-version>
<!-- test dependency version numbers -->
<junit-version>4.11</junit-version>
<mockito-version>1.9.5</mockito-version>
<hamcrest-version>1.3</hamcrest-version>
+ <httpclient-version>4.5.3</httpclient-version>
- <maven-core-version>3.5.0</maven-core-version>
- <maven-resolver-version>1.0.3</maven-resolver-version>
- <exec-maven-plugin-version>1.3.2</exec-maven-plugin-version>
+ <maven-core-version>3.5.4</maven-core-version>
+ <maven-resolver-version>1.1.1</maven-resolver-version>
+ <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
- <maven-rar-plugin-version>2.3</maven-rar-plugin-version>
- <license-maven-plugin-version>1.6</license-maven-plugin-version>
- <jacoco-plugin-version>0.7.0.201403182114</jacoco-plugin-version>
- <maven-jxr-plugin-version>2.3</maven-jxr-plugin-version>
- <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
- <jacoco-plugin-version>0.7.5.201505241946</jacoco-plugin-version>
- <apache-rat-plugin-version>0.11</apache-rat-plugin-version>
+ <maven-rar-plugin-version>2.4</maven-rar-plugin-version>
+ <license-maven-plugin-version>1.8</license-maven-plugin-version>
+ <jacoco-plugin-version>0.8.2</jacoco-plugin-version>
+ <maven-jxr-plugin-version>3.0.0</maven-jxr-plugin-version>
+ <findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
+ <apache-rat-plugin-version>0.12</apache-rat-plugin-version>
<maven-docbx-plugin-version>2.0.15</maven-docbx-plugin-version>
<maven-docbook-xml-plugin-version>5.0-all</maven-docbook-xml-plugin-version>
</properties>
@@ -219,6 +217,11 @@
<artifactId>maven-resolver-transport-http</artifactId>
<version>${maven-resolver-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient-version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -361,7 +364,6 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 03/09: NO-JIRA: Remove unused class DataUrlUtils
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit a6d7bc2ab6cb6fc074400e599dc5176298701af9
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed May 1 23:43:47 2019 +0100
NO-JIRA: Remove unused class DataUrlUtils
---
.../java/org/apache/qpid/util/DataUrlUtils.java | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/client/src/main/java/org/apache/qpid/util/DataUrlUtils.java b/client/src/main/java/org/apache/qpid/util/DataUrlUtils.java
deleted file mode 100644
index 16c5012..0000000
--- a/client/src/main/java/org/apache/qpid/util/DataUrlUtils.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.qpid.util;
-
-import javax.xml.bind.DatatypeConverter;
-
-public class DataUrlUtils
-{
- public static String getDataUrlForBytes(final byte[] bytes)
- {
- StringBuilder inlineURL = new StringBuilder("data:;base64,");
- inlineURL.append(DatatypeConverter.printBase64Binary(bytes));
- return inlineURL.toString();
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 01/09: QPID-8282: [JMS AMQP 0-x] Change minimum
java version to 1.8
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 39523942fb291765cc987e742d5c6a8720659b8e
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed May 1 22:44:08 2019 +0100
QPID-8282: [JMS AMQP 0-x] Change minimum java version to 1.8
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3b4ec9f..8b275dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,9 +77,9 @@
<properties>
<minimum-maven-version>3.0.0</minimum-maven-version>
- <minimum-java-version>1.7.0</minimum-java-version>
- <java.source>1.7</java.source>
- <java.target>1.7</java.target>
+ <minimum-java-version>1.8.0</minimum-java-version>
+ <java.source>1.8</java.source>
+ <java.target>1.8</java.target>
<!-- Directory used for per test log file output -->
<test.output.dir>${basedir}${file.separator}target${file.separator}surefire-reports${file.separator}junit</test.output.dir>
@@ -455,8 +455,8 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.7,1.8)</version>
- <message>Please, use JDK 1.7 for release</message>
+ <version>${minimum-java-version}</version>
+ <message>Please, use JDK 1.8 for release</message>
</requireJavaVersion>
</rules>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 02/09: QPID-8282: [JMS AMQP 0-x] Use
java.util.Base64 for base64 encoding/decoding
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 6b30a4d508bd529744636d5ee9a548b5935cc6eb
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed May 1 23:37:04 2019 +0100
QPID-8282: [JMS AMQP 0-x] Use java.util.Base64 for base64 encoding/decoding
---
.../security/scram/AbstractScramSaslClient.java | 6 ++---
.../main/java/org/apache/qpid/util/Strings.java | 6 ++---
.../network/security/ssl/SSLUtilTest.java | 30 +++++++++++-----------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/client/src/main/java/org/apache/qpid/client/security/scram/AbstractScramSaslClient.java b/client/src/main/java/org/apache/qpid/client/security/scram/AbstractScramSaslClient.java
index 6c23fd0..234f5c9 100644
--- a/client/src/main/java/org/apache/qpid/client/security/scram/AbstractScramSaslClient.java
+++ b/client/src/main/java/org/apache/qpid/client/security/scram/AbstractScramSaslClient.java
@@ -37,7 +37,7 @@ import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
import org.apache.qpid.util.Strings;
@@ -194,7 +194,7 @@ public abstract class AbstractScramSaslClient implements SaslClient
String clientFinalMessageWithoutProof =
- "c=" + DatatypeConverter.printBase64Binary(GS2_HEADER.getBytes(ASCII))
+ "c=" + Base64.getEncoder().encodeToString(GS2_HEADER.getBytes(ASCII))
+ ",r=" + _serverNonce;
String authMessage = _clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
@@ -213,7 +213,7 @@ public abstract class AbstractScramSaslClient implements SaslClient
_serverSignature = computeHmac(serverKey, authMessage);
String finalMessageWithProof = clientFinalMessageWithoutProof
- + ",p=" + DatatypeConverter.printBase64Binary(clientProof);
+ + ",p=" + Base64.getEncoder().encodeToString(clientProof);
return finalMessageWithProof.getBytes();
}
catch (UnsupportedEncodingException e)
diff --git a/client/src/main/java/org/apache/qpid/util/Strings.java b/client/src/main/java/org/apache/qpid/util/Strings.java
index b94ac11..e2cd921 100644
--- a/client/src/main/java/org/apache/qpid/util/Strings.java
+++ b/client/src/main/java/org/apache/qpid/util/Strings.java
@@ -22,6 +22,7 @@ package org.apache.qpid.util;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -33,9 +34,6 @@ import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.xml.bind.DatatypeConverter;
-
-
/**
* Strings
*
@@ -135,7 +133,7 @@ public final class Strings
throw new IllegalArgumentException("Cannot convert string '"+ base64String+ "'to a byte[] - it does not appear to be base64 data");
}
- return DatatypeConverter.parseBase64Binary(base64String);
+ return Base64.getDecoder().decode(base64String);
}
public static interface Resolver
diff --git a/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java b/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
index e547c20..eab531d 100644
--- a/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
+++ b/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
import java.nio.ByteBuffer;
import java.security.KeyStore;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Collections;
import java.util.List;
@@ -32,7 +33,6 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.TrustManagerFactory;
-import javax.xml.bind.DatatypeConverter;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.TransportException;
@@ -320,7 +320,7 @@ public class SSLUtilTest extends QpidTestCase
return clientEngine;
}
- private static byte[] TRUSTSTORE = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAANAAAAAgAPa2V5c3RvcmUyLWFsaWFzAAABVutBZIkABVguNTA5AAAGHzCCBhsw"
+ private static byte[] TRUSTSTORE = Base64.getDecoder().decode("/u3+7QAAAAIAAAANAAAAAgAPa2V5c3RvcmUyLWFsaWFzAAABVutBZIkABVguNTA5AAAGHzCCBhsw"
+"ggQDoAMCAQICCQCrOvhXap7bYTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJVUzEQMA4GA1UE"
+"CBMHcHJpdmF0ZTERMA8GA1UEBxMIcHJvdmluY2UxDTALBgNVBAoTBGNpdHkxGTAXBgNVBAMTEGFt"
+"cXAuZXhhbXBsZS5jb20wHhcNMTYwOTAyMTQxNTE1WhcNMjYwNzEyMTQxNTE1WjBcMQswCQYDVQQG"
@@ -689,7 +689,7 @@ public class SSLUtilTest extends QpidTestCase
// X509v3 Subject Alternative Name:
// DNS:amqp.example.com
- private static byte[] KEYSTORE_1 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQOSYAAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_1 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQOSYAAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+"AQUABIIJbpiFtanggVFjHUoiw5SBLNdnZpIbHao5oqJ6X7ra2IYE5pAYc8lA00P8GAt8ZfVFU/r1"
+"iSj26gWQzbnOqgICfLEe1UNPzMmutxCKHUkZIqlXgvc/Ga7eNhZFxLYoJcjSHcH3rXjfiLihR7fi"
+"ig7OavC88c3qnZld9SHcVSGquUQf65UlMDcLz5ro4JCWojxP0HqmaysTfVW0qGNSeGZcLM4F8siO"
@@ -766,7 +766,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=amqp.example.com
// X509v3 Subject Alternative Name:
// DNS:amqp1.example.com
- private static byte[] KEYSTORE_2 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQOxJAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_2 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQOxJAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+"AQUABIIJb7B1Wn+7tr/UMY9U5S1jldHUBVs55D+bq9mEnI+15JSYH0HOgTeG2GHUMFg5s+P9sMX6"
+"OQL5awZrIrj/IBm3H1JGYvQ90tGNZpbIyPxx912QRfM9qwx4x9q8/EX4C4HqUYzHPrwhtdauGuM7"
+"0v2QMKG6ZKTb9f8VSXhhrntVA0V3hmHpFozpIm1vFjFHQvKwOk0H/ig0ZBCPEBGT447lSn8DyM42"
@@ -844,7 +844,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=amqp.example.com
// X509v3 Subject Alternative Name:
// DNS:amqp1.example.com, DNS:amqp2.example.com
- private static byte[] KEYSTORE_3 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQPpoAAAJiDCCCYQwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_3 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQPpoAAAJiDCCCYQwDgYKKwYBBAEqAhEB"
+"AQUABIIJcMesQe4dg1MYgHKVJCEUzCTpgJu3iTGwbnLOOhraGFn02YXh0Axbwws2hD0SH8XYF4h3"
+"pVI+YbXCWHiQzzn0/5mbSEAQcNBqPR+UTQULdDpI5jGWlf3oPRdqRLP/zAXzgb5N2bmbtdLQ02NK"
+"pvhRHNnLWmTBUokkBRUkh8kiUH3Xu8qIaJbK7ge0yglerFOK6kzic1PZwfvdzsoBxgb0CTHfzOK2"
@@ -923,7 +923,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=amqp.example.com
// X509v3 Subject Alternative Name:
// DNS:amqp1.example.com, DNS:*.example.com
- private static byte[] KEYSTORE_4 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQP7OAAAJiDCCCYQwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_4 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQP7OAAAJiDCCCYQwDgYKKwYBBAEqAhEB"
+"AQUABIIJcM11nToM9HiebwkA/+F9HTYV7bjlRO04+J09z8yiaerv82Iik4bIZjsl2V8IPIjUACxM"
+"7ToGh+WiELoTTDtcjTrfAxk8CM1buiugzN8do8/VwTHpIyDmKQoEY+54Ma2S1r52mqpl5B4sJT3U"
+"25g1ahx23Ytwti9TNKf5NGDLuKrVzbidoYNc2p8yFQe7gaktKVSmIyaZOjRrwm9quoopKNdB/73k"
@@ -1002,7 +1002,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=*.example.com
// X509v3 Subject Alternative Name:
// DNS:amqp1.example.net, DNS:*.org
- private static byte[] KEYSTORE_5 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQQX7AAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_5 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQQX7AAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+"AQUABIIJbhJZvU/boEm92Z+W8kebBumXt/3K9qwGBIntSvmLduW4HIVcQ6+W3Q5Kbd7JiQbAut7b"
+"jicmydwnibrk7DimQAfCGsqud2ywj6eZwkXXa5ZNbuQKUQxP0me82awrQHYBkSaHJv2kwSdTQU7O"
+"la3CoRhtps1pInt00GjVbBEtBERcUrCVG7GtLbxKaOnDEaixK/ewS+7FnG83SfjEKCc5yso/aKaG"
@@ -1080,7 +1080,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=amqp.example.com
// X509v3 Subject Alternative Name:
// DNS:*
- private static byte[] KEYSTORE_6 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQQ/fAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_6 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQQ/fAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+"AQUABIIJb3fs2zcPchqg7CgqHGxwNehB9UogWD1nbgdXd5RtWrIg8Gifp05miLKUjPxQp1/L0D36"
+"XVyqVO7hINZZE3wb9p7PR+bzo7DWMuPZ7+2YzcX2fSLRLcT2h88L3wHjblYH19Bk19/H44JI6j2H"
+"NwVXbAJRAR/6gQJWDewRmkDmSwbiLZ+0pYGz6P5lucXWFt8T2h+pAqz0Ui400RxrpM49AadvCK6v"
@@ -1157,7 +1157,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=*
// X509v3 Subject Alternative Name:
// DNS:amqp.example.org, DNS:amqp1.example.org, DNS:amqp2.example.org
- private static byte[] KEYSTORE_7 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQRyQAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_7 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQRyQAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+"AQUABIIJb+vOaA9ERF3UR5QStjyDSVyHQneIIdOijZfbIxzvUHqZLXOZ6g03xiRs0mJ/RPgPPXo2"
+"EzR8U19YIljUdVw37yro4LpsH1buo+tzPC5p6PhLS28jaMCsLWKpnabAQfWptCgjSoOvKJ26XdxB"
+"NVJVPrBBscwP+ytgcwJ1wsAkkvOGazygincn7MJiBUNkd7HpJ2VjueeqgttwMKFKFifFdE390Has"
@@ -1234,7 +1234,7 @@ public class SSLUtilTest extends QpidTestCase
// Subject: C=US, ST=private, L=province, O=city, CN=*
// X509v3 Subject Alternative Name:
// DNS:amqp.example.org, DNS:example.org
- private static byte[] KEYSTORE_8 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQTD+AAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_8 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQTD+AAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+"AQUABIIJbjpQpyUW3ZmF8P1gwRce6uQCTe3hN+4Mft8FrnZRnv4kx0YW1cMRfyig89HYONM8KsS0"
+"BMoqT3xa5iCQ/oHBymb82OC4YWSAomHFNT2JoDWelNQfnMqjGt3UETBP7g06+ulDjEA5+DAsdcxy"
+"Jtt3Tpfjpe0s0I5jY3blGPV8yQDCNkahhqET6Jvg3PJYsHBE3ssPkTNKI5rMjzbt36pai/HlmjdU"
@@ -1308,7 +1308,7 @@ public class SSLUtilTest extends QpidTestCase
);
// Subject: C=US, ST=private, L=province, O=city, CN=amqp.example.org
- private static byte[] KEYSTORE_9 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQTqYAAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_9 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQTqYAAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+"AQUABIIJbnd59Bys8FgK8FREpm5Vsbq0uIbSE3nZFBNRVaYostRXeNA1fJok01wXBqrf05NfelKj"
+"+ttyFHwE8AKzLfF6vDusoEH4r3HUaQWoWMiOfCzljxjtrr/eQQFx92dX5+Z17BH4+92HZUzVPbSg"
+"31eoaZ24lTO7X8XXq0a43mnC/m3Vs9K590oCfXSDRsx8Ucr0VbUjR8jyLMxE6f4/cxBIhg2PTzCi"
@@ -1383,7 +1383,7 @@ public class SSLUtilTest extends QpidTestCase
);
// Subject: C=US, ST=private, L=province, O=city, CN=*.example.org
- private static byte[] KEYSTORE_10 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQT/DAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_10 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQT/DAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+"AQUABIIJb5zVRh9eulhVb9JI6dbHdLyWN/AwqIfERSIFCr/n0jn7MvWHPiMYQtYtzv+z7bkNVTv+"
+"Uec6wagRxHGu4bjcVuIs6zX2lUrO0L5rN3Jwcbu6bpMIxw7sAPw4/k7Kgvf1ddSOIn4WGiHrJf8G"
+"WvMy3rs9dnxSe8Z+TvUBn3yfFemMRpwnfGn6TuJsdBfzU/bm9dX8RBjMmwQgyHqVgzuvJtAkaQb8"
@@ -1457,7 +1457,7 @@ public class SSLUtilTest extends QpidTestCase
);
// Subject: C=US, ST=private, L=province, O=city, CN=*.org
- private static byte[] KEYSTORE_11 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQUx1AAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_11 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQUx1AAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+"AQUABIIJbuNPa7B2d1Mjkq6EBTzELi9V6XgirTYklPyKB3sQ5DUjlK+KoAsUI4oqAGOYPJDzHteq"
+"ocv5Dj2+741/Pi5Y6DDvls+6fHrmlJk3QOuVJT4yaI5vo9FJ3FUCUyDohvYrRfpA6gfTfO+QU6DI"
+"9G+D4+6gZtz2k4tdoFymtLQRzBS7+L3pFzl5uP7FA1UVWRZlHwsFyLmEmQhZlZcecYtCdTr018iV"
@@ -1531,7 +1531,7 @@ public class SSLUtilTest extends QpidTestCase
);
// Subject: C=US, ST=private, L=province, O=city, CN=*.*.org
- private static byte[] KEYSTORE_12 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQVfLAAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_12 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQVfLAAAJhjCCCYIwDgYKKwYBBAEqAhEB"
+"AQUABIIJbrIYGAiHi9UXY3+A7AqtiNSK6KUzH4bilTLdy875582mryHmiv7372P049JZ2NtA0FXk"
+"z/Idna6VGQmQfC7V/RWYpcCiiDcNFwpwCrnplPZw/6ItTDFaZQruZjIrgT3joyWGHvDvnzrTOGwt"
+"l/yAc3DPnOThuqRogsUHUHpCAxii7/a3fsy4bPvZowSn2s0xJKAt0wBtSEAywahpzbax2pHWFwff"
@@ -1605,7 +1605,7 @@ public class SSLUtilTest extends QpidTestCase
);
// Subject: C=US, ST=private, L=province, O=city, CN=*
- private static byte[] KEYSTORE_13 = DatatypeConverter.parseBase64Binary("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQWJoAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+ private static byte[] KEYSTORE_13 = Base64.getDecoder().decode("/u3+7QAAAAIAAAABAAAAAQAKc2VsZnNpZ25lZAAAAVbrQWJoAAAJhzCCCYMwDgYKKwYBBAEqAhEB"
+"AQUABIIJb2KqIXFhF34E/cZLKwQIiZncYFYOrfP3HUNTvAXWuX1F2prq4VIiq8zrsLpFB07UrfdL"
+"7+xfuC9WJJ09455608neFGtH7K6V5ntULLicLOEkz/jH0WgHBsZjUFXhAl+DivFI880OT7z2FC2E"
+"odYUp35Un/cSbfyxjYBQtu64X+u5g+05UW5GhxHCUrHik/5sJYimER/ZrM3SV1ctnllqtJeZx6sn"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 04/09: NO-JIRA: Fix NPE in ClasspathQuery used
in integration tests
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 32989eaca9de49c1e0b7df343162084c63940ccd
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed May 1 23:44:59 2019 +0100
NO-JIRA: Fix NPE in ClasspathQuery used in integration tests
---
.../org/apache/qpid/systest/core/dependency/ClasspathQuery.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java b/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java
index 9f4844c..97fce1f 100644
--- a/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java
+++ b/systests/src/main/java/org/apache/qpid/systest/core/dependency/ClasspathQuery.java
@@ -154,7 +154,12 @@ public class ClasspathQuery
private String buildClassPath(final Class<?> clientClazz, final Collection<String> gavs)
{
- List<File> classpathElements = new ArrayList<>(_classpathCache.getUnchecked(gavs));
+ final List<File> cached = _classpathCache.getUnchecked(gavs);
+ List<File> classpathElements = new ArrayList<>();
+ if (cached != null)
+ {
+ classpathElements.addAll(cached);
+ }
classpathElements.add(getLocalClasspathElement(clientClazz));
return Joiner.on(System.getProperty("path.separator")).join(classpathElements);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms-amqp-0-x] 07/09: QPID-8282: Update test dependecies
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git
commit 253e1d201fd6d430136ac47c6188e0b31d903934
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Fri May 3 22:26:57 2019 +0100
QPID-8282: Update test dependecies
---
pom.xml | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e0db178..d970ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,8 @@
<test.output.dir>${basedir}${file.separator}target${file.separator}surefire-reports${file.separator}junit</test.output.dir>
<logback-version>1.2.2</logback-version>
- <guava-version>18.0</guava-version>
- <fasterxml-jackson-version>2.5.3</fasterxml-jackson-version>
+ <guava-version>27.0-jre</guava-version>
+ <fasterxml-jackson-version>2.9.8</fasterxml-jackson-version>
<slf4j-version>1.7.25</slf4j-version>
<!-- dependency version numbers -->
@@ -151,6 +151,36 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org