diff --git a/actuator-webflux/build.gradle b/actuator-webflux/build.gradle index b599d21c..4e22849c 100644 --- a/actuator-webflux/build.gradle +++ b/actuator-webflux/build.gradle @@ -29,4 +29,4 @@ graalvmNative { buildArgs.add("META-INF/native-image/.*") } } -} \ No newline at end of file +} diff --git a/aot-smoke-test-support/build.gradle b/aot-smoke-test-support/build.gradle index 2a709e28..472cf097 100644 --- a/aot-smoke-test-support/build.gradle +++ b/aot-smoke-test-support/build.gradle @@ -15,4 +15,4 @@ dependencies { runtimeOnly("io.projectreactor.netty:reactor-netty-http") api("org.springframework:spring-webflux") api("org.springframework.boot:spring-boot-starter-test") -} \ No newline at end of file +} diff --git a/aot-smoke-test-third-party-hints/build.gradle b/aot-smoke-test-third-party-hints/build.gradle index ade0aaba..1da903cb 100644 --- a/aot-smoke-test-third-party-hints/build.gradle +++ b/aot-smoke-test-third-party-hints/build.gradle @@ -13,4 +13,4 @@ repositories { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework:spring-core") -} \ No newline at end of file +} diff --git a/cloud-discovery-consul/build.gradle b/cloud-discovery-consul/build.gradle index df5c5b83..d60e18d6 100644 --- a/cloud-discovery-consul/build.gradle +++ b/cloud-discovery-consul/build.gradle @@ -1,39 +1,37 @@ plugins { - id 'java' - id 'org.springframework.boot' - id 'org.springframework.aot.smoke-test' - id 'org.graalvm.buildtools.native' + id 'java' + id 'org.springframework.boot' + id 'org.springframework.aot.smoke-test' + id 'org.graalvm.buildtools.native' } ext { - set('springCloudVersion', "2022.0.0-SNAPSHOT") + set('springCloudVersion', "2022.0.0-SNAPSHOT") } dependencies { - implementation(platform( - org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation( - platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")) - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation("org.springframework.cloud:spring-cloud-starter-consul-discovery") + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")) + implementation("org.springframework.boot:spring-boot-starter") + implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation("org.springframework.cloud:spring-cloud-starter-consul-discovery") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") - aotSmokeTestImplementation(project(":aot-smoke-test-support")) - aotSmokeTestImplementation("org.awaitility:awaitility:4.2.0") + aotSmokeTestImplementation(project(":aot-smoke-test-support")) + aotSmokeTestImplementation("org.awaitility:awaitility:4.2.0") } aotSmokeTest { - webApplication = true + webApplication = true } graalvmNative { - binaries { - main { - buildArgs.add("--exclude-config") - buildArgs.add("/netty-.*") - buildArgs.add("META-INF/native-image/.*") - } - } -} \ No newline at end of file + binaries { + main { + buildArgs.add("--exclude-config") + buildArgs.add("/netty-.*") + buildArgs.add("META-INF/native-image/.*") + } + } +} diff --git a/cloud-discovery-zookeeper/build.gradle b/cloud-discovery-zookeeper/build.gradle index 9873eeec..9741ab6f 100644 --- a/cloud-discovery-zookeeper/build.gradle +++ b/cloud-discovery-zookeeper/build.gradle @@ -36,4 +36,4 @@ graalvmNative { buildArgs.add("META-INF/native-image/.*") } } -} \ No newline at end of file +} diff --git a/cloud-function-web/build.gradle b/cloud-function-web/build.gradle index 3aa8694d..67d4aea0 100644 --- a/cloud-function-web/build.gradle +++ b/cloud-function-web/build.gradle @@ -6,7 +6,7 @@ plugins { } ext { - set('springCloudVersion', "2022.0.0-SNAPSHOT") + set('springCloudVersion', "2022.0.0-SNAPSHOT") } dependencies { diff --git a/cloud-function-webflux/build.gradle b/cloud-function-webflux/build.gradle index 1f049ba6..4a72fada 100644 --- a/cloud-function-webflux/build.gradle +++ b/cloud-function-webflux/build.gradle @@ -6,7 +6,7 @@ plugins { } ext { - set('springCloudVersion', "2022.0.0-SNAPSHOT") + set('springCloudVersion', "2022.0.0-SNAPSHOT") } dependencies { diff --git a/cloud-task/build.gradle b/cloud-task/build.gradle index 1712b081..48421fc7 100644 --- a/cloud-task/build.gradle +++ b/cloud-task/build.gradle @@ -6,7 +6,7 @@ plugins { } ext { - set('springCloudVersion', "2022.0.0-SNAPSHOT") + set('springCloudVersion', "2022.0.0-SNAPSHOT") } dependencies { diff --git a/configuration-properties/build.gradle b/configuration-properties/build.gradle index 76445531..714565dc 100644 --- a/configuration-properties/build.gradle +++ b/configuration-properties/build.gradle @@ -14,4 +14,3 @@ dependencies { aotSmokeTestImplementation(project(":aot-smoke-test-support")) aotSmokeTestImplementation("org.awaitility:awaitility:4.2.0") } - diff --git a/data-redis/build.gradle b/data-redis/build.gradle index 51c99e3f..4eb9213b 100644 --- a/data-redis/build.gradle +++ b/data-redis/build.gradle @@ -23,4 +23,4 @@ graalvmNative { buildArgs.add("META-INF/native-image/.*") } } -} \ No newline at end of file +} diff --git a/ldap-odm/build.gradle b/ldap-odm/build.gradle index e7e52708..5fb395d7 100644 --- a/ldap-odm/build.gradle +++ b/ldap-odm/build.gradle @@ -1,27 +1,21 @@ plugins { - id 'java' - id 'org.springframework.boot' - id 'org.springframework.aot.smoke-test' - id 'org.graalvm.buildtools.native' + id 'java' + id 'org.springframework.boot' + id 'org.springframework.aot.smoke-test' + id 'org.graalvm.buildtools.native' } -apply plugin: "org.springframework.boot.aot" - dependencies { - implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.ldap:spring-ldap-core") - implementation("com.unboundid:unboundid-ldapsdk") + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.ldap:spring-ldap-core") + implementation("com.unboundid:unboundid-ldapsdk") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") - aotSmokeTestImplementation(project(":aot-smoke-test-support")) + aotSmokeTestImplementation(project(":aot-smoke-test-support")) } aotSmokeTest { - webApplication = true -} - -test { - useJUnitPlatform() + webApplication = true } diff --git a/logging-log4j2/build.gradle b/logging-log4j2/build.gradle index 3934c059..cb503d7c 100644 --- a/logging-log4j2/build.gradle +++ b/logging-log4j2/build.gradle @@ -7,13 +7,13 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation "org.springframework.boot:spring-boot-starter" - implementation "org.springframework.boot:spring-boot-starter-log4j2" - modules { - module("org.springframework.boot:spring-boot-starter-logging") { - replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback") - } - } + implementation "org.springframework.boot:spring-boot-starter" + implementation "org.springframework.boot:spring-boot-starter-log4j2" + modules { + module("org.springframework.boot:spring-boot-starter-logging") { + replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback") + } + } testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/logging-logback/build.gradle b/logging-logback/build.gradle index 41d68bd9..66d7cd3a 100644 --- a/logging-logback/build.gradle +++ b/logging-logback/build.gradle @@ -7,7 +7,7 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation "org.springframework.boot:spring-boot-starter" + implementation "org.springframework.boot:spring-boot-starter" testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/security-oauth2-authorization-server/build.gradle b/security-oauth2-authorization-server/build.gradle index 68fc11f2..7648b16a 100644 --- a/security-oauth2-authorization-server/build.gradle +++ b/security-oauth2-authorization-server/build.gradle @@ -1,34 +1,30 @@ plugins { - id 'java' - id 'org.springframework.boot' - id 'org.springframework.aot.smoke-test' - id 'org.graalvm.buildtools.native' + id 'java' + id 'org.springframework.boot' + id 'org.springframework.aot.smoke-test' + id 'org.graalvm.buildtools.native' } dependencies { - implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.security:spring-security-oauth2-authorization-server:1.0.0-M1") + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.security:spring-security-oauth2-authorization-server:1.0.0-M1") - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("org.springframework.security:spring-security-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.security:spring-security-test") - aotSmokeTestImplementation("com.fasterxml.jackson.core:jackson-databind") - aotSmokeTestImplementation(project(":aot-smoke-test-support")) + aotSmokeTestImplementation("com.fasterxml.jackson.core:jackson-databind") + aotSmokeTestImplementation(project(":aot-smoke-test-support")) } aotSmokeTest { - webApplication = true -} - -test { - useJUnitPlatform() + webApplication = true } graalvmNative { - binaries { - main { - buildArgs("--enable-http") - } - } + binaries { + main { + buildArgs("--enable-http") + } + } } diff --git a/session-jdbc/build.gradle b/session-jdbc/build.gradle index 3bcc6d71..6e78c7d0 100644 --- a/session-jdbc/build.gradle +++ b/session-jdbc/build.gradle @@ -23,10 +23,3 @@ dependencies { aotSmokeTest { webApplication = true } - -tasks.named("processAot") { - // debugOptions { - // enabled = true - // suspend = true - // } -} diff --git a/session-redis-webflux/build.gradle b/session-redis-webflux/build.gradle index 04462095..d688536c 100644 --- a/session-redis-webflux/build.gradle +++ b/session-redis-webflux/build.gradle @@ -5,8 +5,6 @@ plugins { id 'org.graalvm.buildtools.native' } -apply plugin: "org.springframework.boot.aot" - dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-webflux") @@ -30,4 +28,4 @@ graalvmNative { buildArgs.add("META-INF/native-image/.*") } } -} \ No newline at end of file +} diff --git a/spring-kafka-avro/build.gradle b/spring-kafka-avro/build.gradle index 526e0e0a..ebc6c502 100644 --- a/spring-kafka-avro/build.gradle +++ b/spring-kafka-avro/build.gradle @@ -6,10 +6,6 @@ plugins { id "com.github.davidmc24.gradle.plugin.avro" version "1.3.0" } -tasks.named("checkFormatMain").configure { - exclude { it.file.absolutePath.contains("generated-main-avro-java") } -} - dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter") @@ -22,3 +18,7 @@ dependencies { aotSmokeTestImplementation(project(":aot-smoke-test-support")) aotSmokeTestImplementation("org.awaitility:awaitility:4.2.0") } + +tasks.named("checkFormatMain").configure { + exclude { it.file.absolutePath.contains("generated-main-avro-java") } +} diff --git a/tracing-brave-zipkin/build.gradle b/tracing-brave-zipkin/build.gradle index 7d5f0422..a76c8b2f 100644 --- a/tracing-brave-zipkin/build.gradle +++ b/tracing-brave-zipkin/build.gradle @@ -24,4 +24,4 @@ graalvmNative { buildArgs("--enable-http") } } -} \ No newline at end of file +} diff --git a/webclient/build.gradle b/webclient/build.gradle index a9c18c3b..dfae388e 100644 --- a/webclient/build.gradle +++ b/webclient/build.gradle @@ -24,4 +24,4 @@ graalvmNative { buildArgs.add("META-INF/native-image/.*") } } -} \ No newline at end of file +}