From fab4c452d274a5d4e18a0b7c33959cd6669a6090 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 15 Aug 2019 16:01:36 -0400 Subject: [PATCH] Move dep-management plugin out of root project Looks like `io.spring.dependency-management` plugin affects somehow a `makePDF` task, especially its `include 'index-single.adoc'` * Moving it away into `subprojects` sections brings PDF built back to normal * Upgrade to the `org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.2` --- build.gradle | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 8a77a04567..f7f987685d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion" - classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18' + classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.2' classpath 'io.spring.nohttp:nohttp-gradle:0.0.3.RELEASE' } } @@ -107,18 +107,6 @@ ext { allprojects { group = 'org.springframework.integration' - apply plugin: "io.spring.dependency-management" - - dependencyManagement { - resolutionStrategy { - cacheChangingModulesFor 0, 'seconds' - } - applyMavenExclusions = false - generatedPomCustomization { - enabled = false - } - } - repositories { maven { url 'https://repo.spring.io/libs-milestone' } if (version.endsWith('BUILD-SNAPSHOT')) { @@ -151,6 +139,17 @@ subprojects { subproject -> apply plugin: 'checkstyle' apply plugin: 'kotlin' apply plugin: 'kotlin-spring' + apply plugin: "io.spring.dependency-management" + + dependencyManagement { + resolutionStrategy { + cacheChangingModulesFor 0, 'seconds' + } + applyMavenExclusions = false + generatedPomCustomization { + enabled = false + } + } sourceSets { test {