root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source
pull/34945/head
Phillip Webb 2 years ago
parent 463701db18 3ba3558cff
commit 8d2f550f8c
8 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
Unescape Escape View File

@ -1,10 +1,10 @@
plugins { plugins {
id "java-library" id "java-library"
id "org.asciidoctor.jvm.convert" id "org.asciidoctor.jvm.convert"
id "org.springframework.boot.auto-configuration" id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.conventions" id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed" id "org.springframework.boot.deployed"
id "org.springframework.boot.optional-dependencies" id "org.springframework.boot.optional-dependencies"
} }
description = "Spring Boot Actuator AutoConfigure" description = "Spring Boot Actuator AutoConfigure"

4
spring-boot-project/spring-boot-devtools/build.gradle
Unescape Escape View File

@ -1,10 +1,10 @@
plugins { plugins {
id "java-library" id "java-library"
id "org.springframework.boot.auto-configuration" id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.conventions" id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed" id "org.springframework.boot.deployed"
id "org.springframework.boot.integration-test" id "org.springframework.boot.integration-test"
id "org.springframework.boot.optional-dependencies" id "org.springframework.boot.optional-dependencies"
} }
description = "Spring Boot Developer Tools" description = "Spring Boot Developer Tools"

2
spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle
Unescape Escape View File

@ -5,7 +5,7 @@ plugins {
description = "Starter for using Tomcat as the embedded servlet container. Default servlet container starter used by spring-boot-starter-web" description = "Starter for using Tomcat as the embedded servlet container. Default servlet container starter used by spring-boot-starter-web"
dependencies { dependencies {
api("jakarta.annotation:jakarta.annotation-api") api("jakarta.annotation:jakarta.annotation-api")
api("org.apache.tomcat.embed:tomcat-embed-core") { api("org.apache.tomcat.embed:tomcat-embed-core") {
exclude group: "org.apache.tomcat", module: "tomcat-annotations-api" exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.gradle
Unescape Escape View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'org.springframework.boot' version '{version}' id 'org.springframework.boot' version '{version}'
} }
if (project.hasProperty('applyApplicationPlugin')) { if (project.hasProperty('applyApplicationPlugin')) {

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-quartz/build.gradle
Unescape Escape View File

@ -6,10 +6,10 @@ plugins {
description = "Spring Boot Quartz smoke test" description = "Spring Boot Quartz smoke test"
dependencies { dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-quartz")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-quartz"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc"))
runtimeOnly("com.h2database:h2") runtimeOnly("com.h2database:h2")

20
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/build.gradle
Unescape Escape View File

@ -1,18 +1,18 @@
plugins { plugins {
id "java" id "java"
id "org.springframework.boot.conventions" id "org.springframework.boot.conventions"
} }
description = "Spring Boot Session smoke test" description = "Spring Boot Session smoke test"
dependencies { dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation("com.hazelcast:hazelcast") implementation("com.hazelcast:hazelcast")
implementation("org.springframework.session:spring-session-hazelcast") { implementation("org.springframework.session:spring-session-hazelcast") {
exclude group: "javax.annotation", module: "javax.annotation-api" exclude group: "javax.annotation", module: "javax.annotation-api"
} }
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
} }

25
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle
Unescape Escape View File

@ -1,19 +1,20 @@
plugins { plugins {
id "java" id "java"
id "org.springframework.boot.conventions" id "org.springframework.boot.conventions"
} }
description = "Spring Boot Session Mongodb smoke test" description = "Spring Boot Session Mongodb smoke test"
dependencies { dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation("org.springframework.session:spring-session-data-mongodb") implementation("org.springframework.session:spring-session-data-mongodb")
testImplementation("org.testcontainers:mongodb")
testImplementation("org.testcontainers:testcontainers") testImplementation("org.testcontainers:mongodb")
testImplementation("org.testcontainers:junit-jupiter") testImplementation("org.testcontainers:testcontainers")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("org.testcontainers:junit-jupiter")
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
} }

23
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle
Unescape Escape View File

@ -1,18 +1,19 @@
plugins { plugins {
id "java" id "java"
id "org.springframework.boot.conventions" id "org.springframework.boot.conventions"
} }
description = "Spring Boot Session Mongodb smoke test" description = "Spring Boot Session Mongodb smoke test"
dependencies { dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation("org.springframework.session:spring-session-data-redis") implementation("org.springframework.session:spring-session-data-redis")
testImplementation("org.testcontainers:testcontainers")
testImplementation("org.testcontainers:junit-jupiter") testImplementation("org.testcontainers:testcontainers")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("org.testcontainers:junit-jupiter")
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
} }

Write Preview
Loading…
Cancel
Save