root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Start building against snapshots for Spring AMQP 2.0.0.RELEASE 

See gh-7053
This commit is contained in:
Andy Wilkinson 2017-09-27 16:13:53 +01:00
parent 696cdb6b58
commit 58c3b0d390
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View File

@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.amqp;
import java.security.NoSuchAlgorithmException;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
import com.rabbitmq.client.Address;
@ -522,9 +521,8 @@ public class RabbitAutoConfigurationTests {
.run((context) -> {
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(
context);
assertThat(rabbitConnectionFactory.getSocketFactory())
.as("Must use default SocketFactory")
.isEqualTo(SocketFactory.getDefault());
assertThat(rabbitConnectionFactory.getSocketFactory()).isNull();
assertThat(rabbitConnectionFactory.isSSL()).isFalse();
});
}
@ -534,6 +532,7 @@ public class RabbitAutoConfigurationTests {
.withPropertyValues("spring.rabbitmq.ssl.enabled:true").run((context) -> {
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(
context);
assertThat(rabbitConnectionFactory.isSSL()).isTrue();
assertThat(rabbitConnectionFactory.getSocketFactory())
.as("SocketFactory must use SSL")
.isInstanceOf(SSLSocketFactory.class);

2
spring-boot-dependencies/pom.xml
View File

@ -164,7 +164,7 @@
<snakeyaml.version>1.18</snakeyaml.version>
<solr.version>6.6.1</solr.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-batch.version>4.0.0.M3</spring-batch.version>
<spring-data-releasetrain.version>Kay-RC3</spring-data-releasetrain.version>