Skip to content

Commit dc88048

Browse files
artembilangaryrussell
artembilan
authored and
garyrussell
committed
Upgrade dependencies (#1098)
* Upgrade dependencies Use a `dependencyManagement` for those projects which bring BOMs * Downgrade `org.asciidoctor.convert` plugin
1 parent e6929a0 commit dc88048

File tree

1 file changed

+82
-98
lines changed

1 file changed

+82
-98
lines changed

‎build.gradle‎

Lines changed: 82 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,27 @@ buildscript {
44
maven { url 'https://repo.spring.io/plugins-release' }
55
}
66
dependencies {
7-
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
7+
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.5'
88
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
99
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
1010
}
1111
}
1212

1313
plugins {
14-
id "org.sonarqube" version '2.7.1'
14+
id 'base'
15+
id 'project-report'
16+
id 'idea'
17+
id 'org.sonarqube' version '2.7.1'
1518
id 'org.asciidoctor.convert' version '1.6.1'
1619
id 'org.ajoberstar.grgit' version '3.1.1'
17-
id "io.spring.nohttp" version "0.0.3.RELEASE"
18-
id "io.spring.dependency-management" version "1.0.8.RELEASE" apply false
20+
id 'io.spring.nohttp' version '0.0.3.RELEASE'
21+
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
1922
}
2023

2124
description = 'Spring AMQP'
2225

23-
apply plugin: 'base'
24-
apply plugin: 'project-report'
25-
apply plugin: 'idea'
26-
2726
ext {
28-
isTravisBuild = System.getenv().get("TRAVIS") == 'true'
27+
isTravisBuild = System.getenv().get('TRAVIS') == 'true'
2928
linkHomepage = 'https://projects.spring.io/spring-amqp'
3029
linkCi = 'https://build.spring.io/browse/AMQP'
3130
linkIssue = 'https://jira.spring.io/browse/AMQP'
@@ -38,23 +37,22 @@ ext {
3837
files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
3938

4039
assertjVersion = '3.13.2'
41-
assertkVersion = '0.19'
42-
commonsHttpClientVersion = '4.5.9'
40+
assertkVersion = '0.20'
41+
commonsHttpClientVersion = '4.5.10'
4342
googleJsr305Version = '3.0.2'
44-
hamcrestVersion = '1.3'
45-
jackson2Version = '2.9.9.20190807'
43+
hamcrestVersion = '2.1'
44+
jacksonVersion = '2.9.9.20190807'
4645
jaywayJsonPathVersion = '2.4.0'
4746
junit4Version = '4.12'
48-
junitJupiterVersion = '5.5.1'
49-
junitPlatformVersion = '1.5.1'
47+
junitJupiterVersion = '5.5.2'
5048
log4jVersion = '2.12.1'
5149
logbackVersion = '1.2.3'
5250
mockitoVersion = '3.0.0'
5351
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.7.3'
5452
rabbitmqHttpClientVersion = '3.2.0.RELEASE'
55-
reactorVersion = '3.3.0.RC1'
56-
springDataCommonsVersion = '2.2.0.RC3'
57-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RC2'
53+
reactorVersion = 'Dysprosium-BUILD-SNAPSHOT'
54+
springDataCommonsVersion = '2.2.0.BUILD-SNAPSHOT'
55+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
5856
springRetryVersion = '1.2.4.RELEASE'
5957
}
6058

@@ -66,7 +64,7 @@ nohttp {
6664
allprojects {
6765
group = 'org.springframework.amqp'
6866

69-
apply plugin: "io.spring.dependency-management"
67+
apply plugin: 'io.spring.dependency-management'
7068

7169
dependencyManagement {
7270
resolutionStrategy {
@@ -76,6 +74,14 @@ allprojects {
7674
generatedPomCustomization {
7775
enabled = false
7876
}
77+
78+
imports {
79+
mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
80+
mavenBom "org.junit:junit-bom:$junitJupiterVersion"
81+
mavenBom "org.springframework:spring-framework-bom:$springVersion"
82+
mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
83+
mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion"
84+
}
7985
}
8086

8187
repositories {
@@ -90,9 +96,9 @@ allprojects {
9096
ext {
9197
expandPlaceholders = '**/quick-tour.xml'
9298
javadocLinks = [
93-
"https://docs.oracle.com/javase/8/docs/api/",
94-
"https://docs.oracle.com/javaee/7/api/",
95-
"https://docs.spring.io/spring/docs/current/javadoc-api/"
99+
'https://docs.oracle.com/javase/8/docs/api/',
100+
'https://docs.oracle.com/javaee/7/api/',
101+
'https://docs.spring.io/spring/docs/current/javadoc-api/'
96102
] as String[]
97103
}
98104

@@ -124,26 +130,26 @@ subprojects { subproject ->
124130
// dependencies that are common across all java projects
125131
dependencies {
126132
compileOnly "com.google.code.findbugs:jsr305:$googleJsr305Version"
127-
testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion"
128-
testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion"
133+
testCompile 'org.apache.logging.log4j:log4j-core'
134+
testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
129135
testCompile ("org.mockito:mockito-core:$mockitoVersion") {
130136
exclude group: 'org.hamcrest', module: 'hamcrest-core'
131137
}
132138
testCompile "org.mockito:mockito-junit-jupiter:$mockitoVersion"
133-
testCompile "org.springframework:spring-test:$springVersion"
139+
testCompile 'org.springframework:spring-test'
134140

135-
testRuntime "org.apache.logging.log4j:log4j-jcl:$log4jVersion"
141+
testRuntime 'org.apache.logging.log4j:log4j-jcl'
136142

137-
testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
138-
testCompile "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
139-
testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
140-
testRuntime "org.junit.platform:junit-platform-launcher:$junitPlatformVersion"
143+
testCompile 'org.junit.jupiter:junit-jupiter-api'
144+
testCompile 'org.junit.jupiter:junit-jupiter-params'
145+
testRuntime 'org.junit.jupiter:junit-jupiter-engine'
146+
testRuntime 'org.junit.platform:junit-platform-launcher'
141147

142148
// To avoid compiler warnings about @API annotations in JUnit code
143149
testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'
144150

145-
testCompile "org.jetbrains.kotlin:kotlin-reflect"
146-
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
151+
testCompile 'org.jetbrains.kotlin:kotlin-reflect'
152+
testCompile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
147153

148154

149155
}
@@ -249,7 +255,7 @@ subprojects { subproject ->
249255

250256
checkstyle {
251257
configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
252-
toolVersion = "8.24"
258+
toolVersion = '8.24'
253259
}
254260

255261
artifacts {
@@ -271,10 +277,10 @@ subprojects { subproject ->
271277
}
272278

273279
from("${rootProject.projectDir}/src/dist") {
274-
include "license.txt"
275-
include "notice.txt"
276-
into "META-INF"
277-
expand(copyright: new Date().format("yyyy"), version: project.version)
280+
include 'license.txt'
281+
include 'notice.txt'
282+
into 'META-INF'
283+
expand(copyright: new Date().format('yyyy'), version: project.version)
278284
}
279285
}
280286

@@ -285,25 +291,20 @@ subprojects { subproject ->
285291

286292
project('spring-amqp') {
287293
description = 'Spring AMQP Core'
288-
dependencyManagement {
289-
imports {
290-
mavenBom "com.fasterxml.jackson:jackson-bom:$jackson2Version"
291-
}
292-
}
293294

294295
dependencies {
295296

296-
compile "org.springframework:spring-core:$springVersion"
297-
compile ("org.springframework:spring-messaging:$springVersion", optional)
298-
compile ("org.springframework:spring-oxm:$springVersion", optional)
299-
compile ("org.springframework:spring-context:$springVersion", optional)
297+
compile 'org.springframework:spring-core'
298+
compile ('org.springframework:spring-messaging', optional)
299+
compile ('org.springframework:spring-oxm', optional)
300+
compile ('org.springframework:spring-context', optional)
300301
compile ("org.springframework.retry:spring-retry:$springRetryVersion") {
301302
exclude group: 'org.springframework'
302303
}
303304

304-
compile ("com.fasterxml.jackson.core:jackson-core", optional)
305-
compile ("com.fasterxml.jackson.core:jackson-databind", optional)
306-
compile ("com.fasterxml.jackson.dataformat:jackson-dataformat-xml", optional)
305+
compile ('com.fasterxml.jackson.core:jackson-core', optional)
306+
compile ('com.fasterxml.jackson.core:jackson-databind', optional)
307+
compile ('com.fasterxml.jackson.dataformat:jackson-dataformat-xml', optional)
307308

308309
// Spring Data projection message binding support
309310
compile ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") {
@@ -320,39 +321,29 @@ project('spring-amqp') {
320321
project('spring-rabbit') {
321322
description = 'Spring RabbitMQ Support'
322323

323-
dependencyManagement {
324-
imports {
325-
mavenBom "com.fasterxml.jackson:jackson-bom:$jackson2Version"
326-
}
327-
}
328-
329324
dependencies {
330325

331-
compile project(":spring-amqp")
332-
326+
compile project(':spring-amqp')
333327
compile "com.rabbitmq:amqp-client:$rabbitmqVersion"
334328
compile ("com.rabbitmq:http-client:$rabbitmqHttpClientVersion", optional)
335-
336-
compile ("org.springframework:spring-aop:$springVersion", optional)
337-
compile "org.springframework:spring-context:$springVersion"
338-
compile "org.springframework:spring-messaging:$springVersion"
339-
compile "org.springframework:spring-tx:$springVersion"
340-
compile ("io.projectreactor:reactor-core:$reactorVersion", optional)
341-
329+
compile ('org.springframework:spring-aop', optional)
330+
compile 'org.springframework:spring-context'
331+
compile 'org.springframework:spring-messaging'
332+
compile 'org.springframework:spring-tx'
333+
compile ('io.projectreactor:reactor-core', optional)
342334
compile ("ch.qos.logback:logback-classic:$logbackVersion", optional)
335+
compile ('org.apache.logging.log4j:log4j-core', optional)
343336

344-
compile ("org.apache.logging.log4j:log4j-core:$log4jVersion", optional)
345-
346-
testCompile project(":spring-rabbit-junit")
337+
testCompile project(':spring-rabbit-junit')
347338
testCompile("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion")
348-
testRuntime "org.springframework:spring-web:$springVersion"
339+
testRuntime 'org.springframework:spring-web'
349340
testRuntime "org.apache.httpcomponents:httpclient:$commonsHttpClientVersion"
350-
testRuntime "com.fasterxml.jackson.module:jackson-module-kotlin"
341+
testRuntime 'com.fasterxml.jackson.module:jackson-module-kotlin'
351342
}
352343

353344
compileTestKotlin {
354345
kotlinOptions {
355-
jvmTarget = "1.8"
346+
jvmTarget = '1.8'
356347
}
357348
}
358349

@@ -363,8 +354,8 @@ project('spring-rabbit-junit') {
363354

364355
dependencies { // no spring-amqp dependencies allowed
365356

366-
compile "org.springframework:spring-core:$springVersion"
367-
compile "org.springframework:spring-test:$springVersion"
357+
compile 'org.springframework:spring-core'
358+
compile 'org.springframework:spring-test'
368359
compile ("junit:junit:$junit4Version") {
369360
optional(it)
370361
exclude group: 'org.hamcrest', module: 'hamcrest-core'
@@ -373,11 +364,11 @@ project('spring-rabbit-junit') {
373364
compile ("com.rabbitmq:http-client:$rabbitmqHttpClientVersion") {
374365
exclude group: 'org.springframework', module: 'spring-web'
375366
}
376-
compile "org.springframework:spring-web:$springVersion"
377-
compile ("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion", optional)
367+
compile 'org.springframework:spring-web'
368+
compile ('org.junit.jupiter:junit-jupiter-api', optional)
378369
compile "org.assertj:assertj-core:$assertjVersion"
379370
compile ("ch.qos.logback:logback-classic:$logbackVersion", optional)
380-
compile ("org.apache.logging.log4j:log4j-core:$log4jVersion", optional)
371+
compile ('org.apache.logging.log4j:log4j-core', optional)
381372
compileOnly 'org.apiguardian:apiguardian-api:1.0.0'
382373

383374
}
@@ -387,21 +378,16 @@ project('spring-rabbit-junit') {
387378
project('spring-rabbit-test') {
388379
description = 'Spring Rabbit Test Support'
389380

390-
dependencyManagement {
391-
imports {
392-
mavenBom "com.fasterxml.jackson:jackson-bom:$jackson2Version"
393-
}
394-
}
395-
396381
dependencies {
397382

398-
compile project(":spring-rabbit")
399-
compile "org.hamcrest:hamcrest-all:$hamcrestVersion"
383+
compile project(':spring-rabbit')
384+
compile "org.hamcrest:hamcrest-library:$hamcrestVersion"
385+
compile "org.hamcrest:hamcrest-core:$hamcrestVersion"
400386
compile ("org.mockito:mockito-core:$mockitoVersion") {
401387
exclude group: 'org.hamcrest', module: 'hamcrest-core'
402388
}
403-
testCompile project(":spring-rabbit").sourceSets.test.output
404-
testCompile project(":spring-rabbit-junit")
389+
testCompile project(':spring-rabbit').sourceSets.test.output
390+
testCompile project(':spring-rabbit-junit')
405391
}
406392

407393
}
@@ -423,8 +409,6 @@ task prepareAsciidocBuild(type: Sync) {
423409
into "$buildDir/asciidoc"
424410
}
425411

426-
apply plugin: 'org.asciidoctor.convert'
427-
428412
task reference(type: org.asciidoctor.gradle.AsciidoctorTask) {
429413
backends = ['pdf']
430414
sourceDir "$buildDir/asciidoc"
@@ -453,7 +437,7 @@ asciidoctor {
453437
backends = ['html5']
454438
options doctype: 'book', eruby: 'erubis'
455439
attributes 'docinfo': 'shared',
456-
stylesdir: "css/",
440+
stylesdir: 'css/',
457441
stylesheet: 'spring.css',
458442
'linkcss': true,
459443
'icons': 'font',
@@ -467,13 +451,13 @@ asciidoctor.dependsOn prepareAsciidocBuild
467451

468452
sonarqube {
469453
properties {
470-
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
471-
property "sonar.links.homepage", linkHomepage
472-
property "sonar.links.ci", linkCi
473-
property "sonar.links.issue", linkIssue
474-
property "sonar.links.scm", linkScmUrl
475-
property "sonar.links.scm_dev", linkScmDevConnection
476-
property "sonar.java.coveragePlugin", "jacoco"
454+
property 'sonar.jacoco.reportPath', "${buildDir.name}/jacoco.exec"
455+
property 'sonar.links.homepage', linkHomepage
456+
property 'sonar.links.ci', linkCi
457+
property 'sonar.links.issue', linkIssue
458+
property 'sonar.links.scm', linkScmUrl
459+
property 'sonar.links.scm_dev', linkScmDevConnection
460+
property 'sonar.java.coveragePlugin', 'jacoco'
477461
}
478462
}
479463

@@ -485,13 +469,13 @@ task api(type: Javadoc) {
485469
options.author = true
486470
options.header = rootProject.description
487471
options.overview = 'src/api/overview.html'
488-
options.stylesheetFile = file("src/api/stylesheet.css")
472+
options.stylesheetFile = file('src/api/stylesheet.css')
489473
options.links(rootProject.ext.javadocLinks)
490474

491475
source subprojects.collect { project ->
492476
project.sourceSets.main.allJava
493477
}
494-
destinationDir = new File(buildDir, "api")
478+
destinationDir = new File(buildDir, 'api')
495479
classpath = files(subprojects.collect { project ->
496480
project.sourceSets.main.compileClasspath
497481
})
@@ -507,7 +491,7 @@ task schemaZip(type: Zip) {
507491
def Properties schemas = new Properties();
508492
def shortName = subproject.name.replaceFirst("${rootProject.name}-", '')
509493

510-
if (subproject.name.endsWith("-rabbit")) {
494+
if (subproject.name.endsWith('-rabbit')) {
511495
shortName = 'rabbit'
512496
}
513497

0 commit comments

Comments
 (0)