Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #3171 

Merge branch 'update-proton-j-0.33.5-qpid-jms-0.52.0'
This commit is contained in:
Robbie Gemmell 2020-06-11 11:11:41 +01:00
parent 80e9e068c5 595b709677
commit 181743f302
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -99,10 +99,10 @@
<!-- this is basically for tests --> <!-- this is basically for tests -->
<netty-tcnative-version>2.0.29.Final</netty-tcnative-version> <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> <resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.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> <johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version> <json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version> <javax.inject.version>1</javax.inject.version>

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
View File

@ -207,7 +207,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocator("tcp://127.0.0.1:61616?" + ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocator("tcp://127.0.0.1:61616?" +
TransportConstants.SSL_ENABLED_PROP_NAME + "=true;" + TransportConstants.SSL_ENABLED_PROP_NAME + "=true;" +
TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME + "=" + storeType + ";" + 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.TRUSTSTORE_PASSWORD_PROP_NAME + "=" + PASSWORD + ";" +
TransportConstants.SNIHOST_PROP_NAME + "=badhost.com")); TransportConstants.SNIHOST_PROP_NAME + "=badhost.com"));