Rework dep mgmt again to avoid consumers picking up strict constraints
This paves the way for publishing Gradle module metadata once the problem caused by snapshot versions and our two-step publication process has been addressed. See gh-19609
This commit is contained in:
@@ -2,6 +2,7 @@ plugins {
|
||||
id 'java-library'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.deployed'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
}
|
||||
|
||||
description = 'Spring Boot Antlib'
|
||||
@@ -19,10 +20,11 @@ dependencies {
|
||||
antUnit "org.apache.ant:ant-antunit:1.3"
|
||||
antIvy "org.apache.ivy:ivy:2.4.0"
|
||||
|
||||
api platform(project(":spring-boot-project:spring-boot-dependencies"))
|
||||
|
||||
compileOnly project(":spring-boot-project:spring-boot-tools:spring-boot-loader")
|
||||
compileOnly "org.apache.ant:ant:${antVersion}"
|
||||
|
||||
implementation enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))
|
||||
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")
|
||||
implementation "org.springframework:spring-core"
|
||||
}
|
||||
|
||||
@@ -2,12 +2,14 @@ plugins {
|
||||
id 'java-library'
|
||||
id 'maven-publish'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
}
|
||||
|
||||
description = 'Spring Boot Configuration Metadata'
|
||||
|
||||
dependencies {
|
||||
implementation enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent"))
|
||||
api platform(project(path: ":spring-boot-project:spring-boot-parent"))
|
||||
|
||||
implementation "com.vaadin.external.google:android-json"
|
||||
|
||||
testImplementation "org.junit.jupiter:junit-jupiter"
|
||||
|
||||
@@ -4,6 +4,7 @@ plugins {
|
||||
id 'org.asciidoctor.jvm.convert'
|
||||
id 'org.asciidoctor.jvm.pdf'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
id 'org.springframework.boot.maven-repository'
|
||||
id 'org.springframework.boot.optional-dependencies'
|
||||
}
|
||||
@@ -25,14 +26,16 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api platform(project(':spring-boot-project:spring-boot-dependencies'))
|
||||
|
||||
asciidoctorExtensions 'io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.3.0.RELEASE'
|
||||
implementation platform(project(':spring-boot-project:spring-boot-dependencies'))
|
||||
|
||||
implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools')
|
||||
implementation 'io.spring.gradle:dependency-management-plugin'
|
||||
implementation 'org.apache.commons:commons-compress'
|
||||
implementation 'org.springframework:spring-core'
|
||||
|
||||
optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies'))
|
||||
optional platform(project(':spring-boot-project:spring-boot-dependencies'))
|
||||
optional 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50'
|
||||
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter'
|
||||
|
||||
@@ -2,6 +2,7 @@ plugins {
|
||||
id 'java-library'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.deployed'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
}
|
||||
|
||||
description = 'Spring Boot Loader Tools'
|
||||
@@ -13,11 +14,11 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api platform(project(':spring-boot-project:spring-boot-dependencies'))
|
||||
api "org.apache.commons:commons-compress:1.19"
|
||||
|
||||
compileOnly "ch.qos.logback:logback-classic"
|
||||
|
||||
implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies'))
|
||||
implementation "org.springframework:spring-core"
|
||||
|
||||
loader project(":spring-boot-project:spring-boot-tools:spring-boot-loader")
|
||||
|
||||
@@ -2,14 +2,15 @@ plugins {
|
||||
id 'java-library'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.deployed'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
}
|
||||
|
||||
description = 'Spring Boot Loader'
|
||||
|
||||
dependencies {
|
||||
compileOnly "org.springframework:spring-core"
|
||||
api platform(project(":spring-boot-project:spring-boot-dependencies"))
|
||||
|
||||
implementation enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))
|
||||
compileOnly "org.springframework:spring-core"
|
||||
|
||||
testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ plugins {
|
||||
id 'org.asciidoctor.jvm.convert'
|
||||
id 'org.asciidoctor.jvm.pdf'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
id 'org.springframework.boot.maven-plugin'
|
||||
id 'org.springframework.boot.optional-dependencies'
|
||||
}
|
||||
@@ -13,25 +14,25 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api platform(project(':spring-boot-project:spring-boot-parent'))
|
||||
|
||||
compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations'
|
||||
compileOnly 'org.sonatype.plexus:plexus-build-api'
|
||||
|
||||
implementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent'))
|
||||
implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools')
|
||||
implementation 'org.apache.maven.shared:maven-common-artifact-filters'
|
||||
implementation 'org.apache.maven:maven-plugin-api'
|
||||
|
||||
intTestImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent'))
|
||||
intTestImplementation platform(project(':spring-boot-project:spring-boot-parent'))
|
||||
intTestImplementation 'org.apache.maven.shared:maven-invoker'
|
||||
intTestImplementation 'org.assertj:assertj-core'
|
||||
intTestImplementation 'org.junit.jupiter:junit-jupiter'
|
||||
|
||||
optional enforcedPlatform(project(':spring-boot-project:spring-boot-parent'))
|
||||
optional platform(project(':spring-boot-project:spring-boot-parent'))
|
||||
optional 'org.apache.maven.plugins:maven-shade-plugin'
|
||||
|
||||
runtimeOnly 'org.sonatype.plexus:plexus-build-api'
|
||||
|
||||
testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent'))
|
||||
testImplementation 'org.assertj:assertj-core'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter'
|
||||
testImplementation 'org.mockito:mockito-core'
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
plugins {
|
||||
id 'java-library'
|
||||
id 'org.springframework.boot.conventions'
|
||||
id 'org.springframework.boot.internal-dependency-management'
|
||||
}
|
||||
|
||||
description = 'Spring Boot Testing Support'
|
||||
|
||||
dependencies {
|
||||
api platform(project(path: ":spring-boot-project:spring-boot-parent"))
|
||||
|
||||
compileOnly "com.datastax.oss:java-driver-core"
|
||||
compileOnly "javax.servlet:javax.servlet-api"
|
||||
compileOnly "junit:junit"
|
||||
@@ -17,7 +20,6 @@ dependencies {
|
||||
compileOnly "org.springframework.data:spring-data-redis"
|
||||
compileOnly "org.testcontainers:testcontainers"
|
||||
|
||||
implementation enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent"))
|
||||
implementation "org.apache.maven.resolver:maven-resolver-connector-basic"
|
||||
implementation "org.apache.maven.resolver:maven-resolver-impl"
|
||||
implementation "org.apache.maven:maven-resolver-provider"
|
||||
|
||||
Reference in New Issue
Block a user