Skip to content

Commit 8bb92e5

Browse files
artembilangaryrussell
authored andcommitted
GH-736: Upgrade to RabbitMQ hop-2.1
Fixes #736 The latest `hop` makes most of its dependencies as `optional` to meet a reactive/non-reactive environment requirements
1 parent b896c89 commit 8bb92e5

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ subprojects { subproject ->
7272
ext {
7373
assertjVersion = '3.9.1'
7474
assertkVersion = '0.10'
75+
commonsHttpClientVersion = '4.5.5'
7576
hamcrestVersion = '1.3'
7677
jackson2Version = '2.9.5'
7778
junit4Version = '4.12'
@@ -81,7 +82,7 @@ subprojects { subproject ->
8182
logbackVersion = '1.2.3'
8283
mockitoVersion = '2.18.0'
8384
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.2.0'
84-
rabbitmqHttpClientVersion = '2.0.1.RELEASE'
85+
rabbitmqHttpClientVersion = '2.1.0.RELEASE'
8586

8687
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.0.BUILD-SNAPSHOT'
8788

@@ -253,28 +254,28 @@ project('spring-rabbit') {
253254
compile project(":spring-amqp")
254255

255256
compile "com.rabbitmq:amqp-client:$rabbitmqVersion"
256-
compile ("com.rabbitmq:http-client:$rabbitmqHttpClientVersion") {
257-
exclude group: 'org.springframework', module: 'spring-web'
258-
}
257+
compile "com.rabbitmq:http-client:$rabbitmqHttpClientVersion"
259258

260259
compile ("org.springframework:spring-aop:$springVersion", optional)
261260
compile "org.springframework:spring-context:$springVersion"
262261
compile "org.springframework:spring-messaging:$springVersion"
263262
compile "org.springframework:spring-tx:$springVersion"
264-
compile "org.springframework:spring-web:$springVersion"
265263

266264
compile "org.springframework.retry:spring-retry:$springRetryVersion"
267265

268266
compile ("ch.qos.logback:logback-classic:$logbackVersion", optional)
269267

270268
compile ("org.apache.logging.log4j:log4j-core:$log4jVersion", optional)
271269

270+
testCompile project(":spring-rabbit-junit")
272271
testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
273-
testRuntime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
274272
testCompile("com.willowtreeapps.assertk:assertk:$assertkVersion") {
275273
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-reflect'
276274
}
277-
testCompile project(":spring-rabbit-junit")
275+
276+
testRuntime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
277+
testRuntime "org.springframework:spring-web:$springVersion"
278+
testRuntime "org.apache.httpcomponents:httpclient:$commonsHttpClientVersion"
278279
}
279280

280281
compileTestKotlin {

0 commit comments

Comments
 (0)