Skip to content

Commit 62b3eaf

Browse files
committed
Move Jackson enforcement for Dokka to all projects
1 parent da717b5 commit 62b3eaf

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,15 @@ allprojects {
182182

183183
}
184184

185+
// TODO until https://github.com/Kotlin/dokka/issues/3472
186+
configurations.matching { it.name.startsWith('dokka') }.configureEach {
187+
resolutionStrategy.eachDependency {
188+
if (requested.group.startsWith('com.fasterxml.jackson')) {
189+
useVersion('2.15.3')
190+
}
191+
}
192+
}
193+
185194
}
186195

187196
configure(javaProjects) { subproject ->
@@ -492,15 +501,6 @@ project('spring-integration-core') {
492501

493502
apply plugin: 'org.jetbrains.dokka'
494503

495-
// TODO until https://github.com/Kotlin/dokka/issues/3472
496-
configurations.matching { it.name.startsWith('dokka') }.configureEach {
497-
resolutionStrategy.eachDependency {
498-
if (requested.group.startsWith('com.fasterxml.jackson')) {
499-
useVersion('2.15.3')
500-
}
501-
}
502-
}
503-
504504
dependencies {
505505
api 'org.springframework:spring-aop'
506506
api 'org.springframework:spring-context'
@@ -1109,7 +1109,7 @@ tasks.register('api', Javadoc) {
11091109
dokkaHtmlMultiModule {
11101110
dependsOn 'api'
11111111
moduleName.set('spring-integration')
1112-
outputDirectory.set(file("$buildDir/kdoc"))
1112+
outputDirectory.set(file('build/kdoc'))
11131113
}
11141114

11151115
apply from: "${rootDir}/gradle/docs.gradle"

0 commit comments

Comments
 (0)