Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
58c3b0d3
Commit
58c3b0d3
authored
Sep 27, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start building against snapshots for Spring AMQP 2.0.0.RELEASE
See gh-7053
parent
696cdb6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
RabbitAutoConfigurationTests.java
...boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+3
-4
pom.xml
spring-boot-dependencies/pom.xml
+1
-1
No files found.
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View file @
58c3b0d3
...
@@ -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
);
...
...
spring-boot-dependencies/pom.xml
View file @
58c3b0d3
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment