Commit 58c3b0d3 authored by Andy Wilkinson's avatar Andy Wilkinson

Start building against snapshots for Spring AMQP 2.0.0.RELEASE

See gh-7053
parent 696cdb6b
...@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.amqp; ...@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.amqp;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
import com.rabbitmq.client.Address; import com.rabbitmq.client.Address;
...@@ -522,9 +521,8 @@ public class RabbitAutoConfigurationTests { ...@@ -522,9 +521,8 @@ public class RabbitAutoConfigurationTests {
.run((context) -> { .run((context) -> {
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory( com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(
context); context);
assertThat(rabbitConnectionFactory.getSocketFactory()) assertThat(rabbitConnectionFactory.getSocketFactory()).isNull();
.as("Must use default SocketFactory") assertThat(rabbitConnectionFactory.isSSL()).isFalse();
.isEqualTo(SocketFactory.getDefault());
}); });
} }
...@@ -534,6 +532,7 @@ public class RabbitAutoConfigurationTests { ...@@ -534,6 +532,7 @@ public class RabbitAutoConfigurationTests {
.withPropertyValues("spring.rabbitmq.ssl.enabled:true").run((context) -> { .withPropertyValues("spring.rabbitmq.ssl.enabled:true").run((context) -> {
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory( com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(
context); context);
assertThat(rabbitConnectionFactory.isSSL()).isTrue();
assertThat(rabbitConnectionFactory.getSocketFactory()) assertThat(rabbitConnectionFactory.getSocketFactory())
.as("SocketFactory must use SSL") .as("SocketFactory must use SSL")
.isInstanceOf(SSLSocketFactory.class); .isInstanceOf(SSLSocketFactory.class);
......
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<snakeyaml.version>1.18</snakeyaml.version> <snakeyaml.version>1.18</snakeyaml.version>
<solr.version>6.6.1</solr.version> <solr.version>6.6.1</solr.version>
<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version> <spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.0.0.RC1</spring-amqp.version> <spring-amqp.version>2.0.0.BUILD-SNAPSHOT</spring-amqp.version>
<spring-cloud-connectors.version>2.0.0.M1</spring-cloud-connectors.version> <spring-cloud-connectors.version>2.0.0.M1</spring-cloud-connectors.version>
<spring-batch.version>4.0.0.M3</spring-batch.version> <spring-batch.version>4.0.0.M3</spring-batch.version>
<spring-data-releasetrain.version>Kay-RC3</spring-data-releasetrain.version> <spring-data-releasetrain.version>Kay-RC3</spring-data-releasetrain.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment