From 62b3eaff8889a7b134c193aca66361329c8dc752 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 28 Feb 2024 11:46:13 -0500 Subject: [PATCH] Move Jackson enforcement for Dokka to all projects --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index fe4085ff3e..49260e636e 100644 --- a/build.gradle +++ b/build.gradle @@ -182,6 +182,15 @@ allprojects { } + // TODO until https://github.com/Kotlin/dokka/issues/3472 + configurations.matching { it.name.startsWith('dokka') }.configureEach { + resolutionStrategy.eachDependency { + if (requested.group.startsWith('com.fasterxml.jackson')) { + useVersion('2.15.3') + } + } + } + } configure(javaProjects) { subproject -> @@ -492,15 +501,6 @@ project('spring-integration-core') { apply plugin: 'org.jetbrains.dokka' - // TODO until https://github.com/Kotlin/dokka/issues/3472 - configurations.matching { it.name.startsWith('dokka') }.configureEach { - resolutionStrategy.eachDependency { - if (requested.group.startsWith('com.fasterxml.jackson')) { - useVersion('2.15.3') - } - } - } - dependencies { api 'org.springframework:spring-aop' api 'org.springframework:spring-context' @@ -1109,7 +1109,7 @@ tasks.register('api', Javadoc) { dokkaHtmlMultiModule { dependsOn 'api' moduleName.set('spring-integration') - outputDirectory.set(file("$buildDir/kdoc")) + outputDirectory.set(file('build/kdoc')) } apply from: "${rootDir}/gradle/docs.gradle"