You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2020/06/11 10:13:37 UTC
[activemq-artemis] branch master updated (80e9e06 -> 181743f)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 80e9e06 This closes #3159
new 4641ded ARTEMIS-2799: satisfy checkstyle to get tests working
new 595b709 ARTEMIS-2795: update to proton-j 0.33.5 and qpid-jms 0.52.0
new 181743f This closes #3171
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:
pom.xml | 4 ++--
.../artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
[activemq-artemis] 02/03: ARTEMIS-2795: update to proton-j 0.33.5
and qpid-jms 0.52.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 595b70967779452e8a8eb7eb0be5f8a1e9617086
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jun 8 16:33:30 2020 +0100
ARTEMIS-2795: update to proton-j 0.33.5 and qpid-jms 0.52.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fdc766f..80fc80d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,10 +99,10 @@
<!-- this is basically for tests -->
<netty-tcnative-version>2.0.29.Final</netty-tcnative-version>
- <proton.version>0.33.4</proton.version>
+ <proton.version>0.33.5</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version>
- <qpid.jms.version>0.51.0</qpid.jms.version>
+ <qpid.jms.version>0.52.0</qpid.jms.version>
<johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version>
[activemq-artemis] 03/03: This closes #3171
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 181743f3023443d9ea551164b9bbc5d366a3e38f
Merge: 80e9e06 595b709
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jun 11 11:11:41 2020 +0100
This closes #3171
Merge branch 'update-proton-j-0.33.5-qpid-jms-0.52.0'
pom.xml | 4 ++--
.../artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
[activemq-artemis] 01/03: ARTEMIS-2799: satisfy checkstyle to get
tests working
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4641dedad62a42c374afa4ab270803de4f7a86a6
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jun 11 11:02:36 2020 +0100
ARTEMIS-2799: satisfy checkstyle to get tests working
---
.../artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
index 697569b..785e55b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
@@ -207,7 +207,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocator("tcp://127.0.0.1:61616?" +
TransportConstants.SSL_ENABLED_PROP_NAME + "=true;" +
TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME + "=" + storeType + ";" +
- TransportConstants.TRUSTSTORE_PATH_PROP_NAME + "=" + CLIENT_SIDE_TRUSTSTORE +";" +
+ TransportConstants.TRUSTSTORE_PATH_PROP_NAME + "=" + CLIENT_SIDE_TRUSTSTORE + ";" +
TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME + "=" + PASSWORD + ";" +
TransportConstants.SNIHOST_PROP_NAME + "=badhost.com"));