Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-42441
This commit is contained in:
Phillip Webb
2024-09-24 14:31:40 -07:00
parent 0c1a042173 100bedc07d
commit 7b3077280c
135 changed files with 61 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@@ -3,7 +3,6 @@ plugins {
id "org.antora"
id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.optional-dependencies"
}

3
spring-boot-project/spring-boot-actuator/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.optional-dependencies"
id "org.springframework.boot.docker-test"
@@ -11,7 +10,7 @@ description = "Spring Boot Actuator"
dependencies {
api(project(":spring-boot-project:spring-boot"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))

1
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "java-library"
id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.optional-dependencies"

1
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "org.springframework.boot.bom"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

1
spring-boot-project/spring-boot-devtools/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "java-library"
id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.integration-test"
id "org.springframework.boot.optional-dependencies"

1
spring-boot-project/spring-boot-docker-compose/build.gradle
View File

@@ -1,7 +1,6 @@
plugins {
id "java-library"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.optional-dependencies"

1
spring-boot-project/spring-boot-docs/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "dev.adamko.dokkatoo-html"
id "java"
id "org.antora"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id 'org.jetbrains.kotlin.jvm'
}

1
spring-boot-project/spring-boot-parent/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "org.springframework.boot.bom"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

1
spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle
View File

@@ -1,5 +1,4 @@
plugins {
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.maven-repository"
}

1
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.optional-dependencies"

1
spring-boot-project/spring-boot-test/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "dev.adamko.dokkatoo-html"
id "java-library"
id "org.jetbrains.kotlin.jvm"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.optional-dependencies"
}

1
spring-boot-project/spring-boot-testcontainers/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "java-library"
id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.optional-dependencies"

1
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

1
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.annotation-processor"
}

1
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test"
}

1
spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "java"
id "eclipse"
id "org.springframework.boot.deployed"
id "org.springframework.boot.conventions"
id "org.springframework.boot.integration-test"
}

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java"
id "org.springframework.boot.conventions"
}
description = "Spring Boot Configuration Metadata Changelog Generator"

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.annotation-processor"
}

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@@ -6,7 +6,6 @@ plugins {
id "java-gradle-plugin"
id "maven-publish"
id "org.antora"
id "org.springframework.boot.conventions"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.maven-repository"
id "org.springframework.boot.optional-dependencies"

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
}
description = "Spring Boot Gradle Testing Support"

1
spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

7
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}
@@ -22,6 +21,8 @@ dependencies {
testRuntimeOnly("org.springframework:spring-webmvc")
}
tasks.named("checkArchitectureMain").configure {
prohibitObjectsRequireNonNull = false
tasks.configureEach {
if ("checkArchitectureMain".equals(it.name)) {
prohibitObjectsRequireNonNull = false
}
}

1
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

7
spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}
@@ -22,6 +21,8 @@ dependencies {
testRuntimeOnly("org.springframework:spring-webmvc")
}
tasks.named("checkArchitectureMain").configure {
prohibitObjectsRequireNonNull = false
tasks.configureEach {
if ("checkArchitectureMain".equals(it.name)) {
prohibitObjectsRequireNonNull = false
}
}

1
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "org.antora"
id "org.springframework.boot.conventions"
id "org.springframework.boot.maven-plugin"
id "org.springframework.boot.optional-dependencies"
id "org.springframework.boot.docker-test"

1
spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}

1
spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.optional-dependencies"
}

1
spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
View File

@@ -1,6 +1,5 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.optional-dependencies"
}

1
spring-boot-project/spring-boot/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id "dev.adamko.dokkatoo-html"
id "java-library"
id "org.jetbrains.kotlin.jvm"
id "org.springframework.boot.conventions"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.deployed"
id "org.springframework.boot.optional-dependencies"