From e4ff6fc20c2b271a4e90b7b7a7b5d72cb181f5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 14 Jun 2024 18:29:28 +0200 Subject: [PATCH] Refactor the CR plugin to a Lifecycle one --- README.adoc | 2 +- boot/actuator-webflux/build.gradle | 8 ++-- .../ActuatorWebFluxApplicationAotTests.java | 2 +- boot/actuator-webmvc/build.gradle | 8 ++-- .../ActuatorWebMvcApplicationAotTests.java | 2 +- build.gradle | 2 +- cloud/context-refresh-hikari/build.gradle | 8 ++-- .../ContextRefreshHikariApplicationTests.java | 4 +- cloud/context-refresh-http/build.gradle | 8 ++-- .../ContextRefreshHttpApplicationTests.java | 2 +- cloud/context-refresh/build.gradle | 8 ++-- .../ContextRefreshApplicationTests.java | 2 +- cloud/loadbalancing/build.gradle | 8 ++-- .../LoadBalancerApplicationTests.java | 2 +- .../main/resources/META-INF/spring.factories | 2 - data/data-jdbc/build.gradle | 8 ++-- .../data/jdbc/DataJdbcApplicationTests.java | 4 +- data/data-jpa/build.gradle | 8 ++-- .../data/jpa/DataJpaApplicationTests.java | 4 +- data/data-redis/build.gradle | 8 ++-- .../data/redis/DataRedisApplicationTests.java | 4 +- framework/hibernate-mysql/build.gradle | 8 ++-- .../hibernate/HibernateApplicationTests.java | 4 +- framework/resttemplate-netty/build.gradle | 6 +-- .../RestTemplateApplicationTests.java | 4 +- framework/scheduled/build.gradle | 6 +-- .../ScheduledApplicationAotTests.java | 4 +- framework/webclient-netty/build.gradle | 6 +-- .../webclient/WebClientApplicationTests.java | 4 +- framework/webflux-netty/build.gradle | 8 ++-- .../webflux/WebfluxApplicationTests.java | 2 +- framework/webflux-undertow/build.gradle | 8 ++-- .../webflux/WebfluxApplicationTests.java | 2 +- framework/webmvc-jetty/build.gradle | 8 ++-- .../webmvc/WebMvcApplicationTests.java | 2 +- framework/webmvc-tomcat/build.gradle | 8 ++-- .../webmvc/WebMvcApplicationTests.java | 2 +- .../build.gradle | 12 +++--- .../config/checkstyle/checkstyle.xml | 0 .../settings.gradle | 2 +- .../LifecycleSmokeTestAggregatorPlugin.java} | 8 ++-- .../gradle/LifecycleSmokeTestPlugin.java} | 43 +++++++++---------- .../dsl/LifecycleSmokeTestExtension.java} | 8 ++-- .../lifecycle}/gradle/dsl/package-info.java | 2 +- .../lifecycle}/gradle/package-info.java | 2 +- .../gradle/tasks/AbstractSmokeTestsTask.java | 2 +- .../lifecycle}/gradle/tasks/AppTest.java | 2 +- .../gradle/tasks/DescribeSmokeTests.java | 2 +- .../gradle/tasks/RestoreJvmApplication.java | 2 +- .../lifecycle}/gradle/tasks/SmokeTest.java | 2 +- .../StartAndCheckpointJvmApplication.java | 4 +- .../gradle/tasks/StartApplication.java | 2 +- .../gradle/tasks/StartJvmApplication.java | 2 +- .../gradle/tasks/StopApplication.java | 2 +- .../gradle/tasks/UpdateConcoursePipeline.java | 2 +- .../gradle/tasks/UpdateStatusPage.java | 2 +- .../lifecycle}/gradle/tasks/package-info.java | 2 +- integration/integration-basic/build.gradle | 6 +-- ...eCopySpringIntegrationApplicationTest.java | 4 +- .../integration-webfux-data/build.gradle | 8 ++-- .../IntegrationApplicationTests.java | 4 +- integration/spring-amqp-rabbit/build.gradle | 6 +-- .../amqp/AmqpRabbitApplicationCrTests.java | 4 +- integration/spring-kafka-avro/build.gradle | 6 +-- .../kafka/KafkaAvroApplicationCrTests.java | 4 +- integration/spring-kafka-streams/build.gradle | 6 +-- .../kafka/KafkaStreamsApplicationCrTests.java | 4 +- integration/spring-kafka/build.gradle | 6 +-- .../example/kafka/KafkaApplicationTests.java | 4 +- .../spring-pulsar-reactive/build.gradle | 6 +-- .../SpringPulsarApplicationTests.java | 4 +- integration/spring-pulsar/build.gradle | 6 +-- .../pulsar/SpringPulsarApplicationTests.java | 4 +- .../build.gradle | 0 .../listener/CheckpointListener.java | 8 ++-- .../main/resources/META-INF/spring.factories | 2 + .../build.gradle | 0 .../lifecycle}/smoketest/support/Output.java | 8 ++-- .../support/assertj/AssertableOutput.java | 4 +- .../support/assertj/OutputAssert.java | 4 +- .../support/junit/ApplicationTest.java | 4 +- .../support/junit/ApplicationUnderTest.java | 4 +- .../support/junit/ApplicationUrl.java | 2 +- .../ApplicationUrlParameterResolver.java | 2 +- .../AssertableOutputParameterResolver.java | 4 +- .../support/junit/AwaitApplication.java | 4 +- .../support/junit/DockerComposeHost.java | 2 +- .../DockerComposeHostParameterResolver.java | 2 +- .../support/junit/DockerComposePort.java | 2 +- .../DockerComposePortParameterResolver.java | 2 +- .../junit/WebTestClientParameterResolver.java | 2 +- security/ldap-client/build.gradle | 8 ++-- ...ecurityLdapApplicationCheckpointTests.java | 2 +- .../example/security/ldap/MainController.java | 8 +++- .../example/security/ldap/SecurityConfig.java | 4 +- security/security-ldap/build.gradle | 8 ++-- ...ecurityLdapApplicationCheckpointTests.java | 2 +- .../build.gradle | 8 ++-- ...ationServerApplicationCheckpointTests.java | 2 +- .../build.gradle | 8 ++-- ...ourceServerApplicationCheckpointTests.java | 2 +- security/security-webflux/build.gradle | 8 ++-- ...rityWebFluxApplicationCheckpointTests.java | 2 +- security/security-webmvc/build.gradle | 8 ++-- ...urityWebMvcApplicationCheckpointTests.java | 2 +- session/session-jdbc/build.gradle | 8 ++-- .../jdbc/SessionJdbcApplicationTests.java | 2 +- session/session-redis-webflux/build.gradle | 8 ++-- .../SessionRedisWebfluxApplicationTests.java | 2 +- settings.gradle | 6 +-- 110 files changed, 264 insertions(+), 261 deletions(-) delete mode 100644 cr-listener/src/main/resources/META-INF/spring.factories rename gradle/plugins/{cr-smoke-test-plugin => lifecycle-smoke-test-plugin}/build.gradle (72%) rename gradle/plugins/{cr-smoke-test-plugin => lifecycle-smoke-test-plugin}/config/checkstyle/checkstyle.xml (100%) rename gradle/plugins/{cr-smoke-test-plugin => lifecycle-smoke-test-plugin}/settings.gradle (89%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestAggregatorPlugin.java => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestAggregatorPlugin.java} (86%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestPlugin.java => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestPlugin.java} (89%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/CrSmokeTestExtension.java => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/LifecycleSmokeTestExtension.java} (87%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/dsl/package-info.java (93%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/package-info.java (93%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/AbstractSmokeTestsTask.java (97%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/AppTest.java (95%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/DescribeSmokeTests.java (98%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/RestoreJvmApplication.java (92%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/SmokeTest.java (96%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/StartAndCheckpointJvmApplication.java (95%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/StartApplication.java (98%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/StartJvmApplication.java (96%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/StopApplication.java (97%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/UpdateConcoursePipeline.java (97%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/UpdateStatusPage.java (98%) rename gradle/plugins/{cr-smoke-test-plugin/src/main/java/org/springframework/cr => lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle}/gradle/tasks/package-info.java (93%) rename {cr-listener => lifecycle-listener}/build.gradle (100%) rename {cr-listener/src/main/java/org/springframework/cr => lifecycle-listener/src/main/java/org/springframework/lifecycle}/listener/CheckpointListener.java (90%) create mode 100644 lifecycle-listener/src/main/resources/META-INF/spring.factories rename {cr-smoke-test-support => lifecycle-smoke-test-support}/build.gradle (100%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/Output.java (87%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/assertj/AssertableOutput.java (89%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/assertj/OutputAssert.java (96%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/ApplicationTest.java (93%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/ApplicationUnderTest.java (95%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/ApplicationUrl.java (95%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/ApplicationUrlParameterResolver.java (96%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/AssertableOutputParameterResolver.java (90%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/AwaitApplication.java (95%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/DockerComposeHost.java (95%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/DockerComposeHostParameterResolver.java (96%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/DockerComposePort.java (95%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/DockerComposePortParameterResolver.java (97%) rename {cr-smoke-test-support/src/main/java/org/springframework/cr => lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle}/smoketest/support/junit/WebTestClientParameterResolver.java (97%) diff --git a/README.adoc b/README.adoc index d767517..0a7cd9a 100644 --- a/README.adoc +++ b/README.adoc @@ -150,7 +150,7 @@ configuration: [source,] ---- -crSmokeTest { +lifecycleSmokeTest { checkpointEvent = "com.example.MyCustomEvent" } ---- diff --git a/boot/actuator-webflux/build.gradle b/boot/actuator-webflux/build.gradle index d630ab3..7228e10 100644 --- a/boot/actuator-webflux/build.gradle +++ b/boot/actuator-webflux/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,15 +9,15 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) runtimeOnly("io.micrometer:micrometer-registry-prometheus") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/boot/actuator-webflux/src/appTest/java/com/example/actuator/webmvc/ActuatorWebFluxApplicationAotTests.java b/boot/actuator-webflux/src/appTest/java/com/example/actuator/webmvc/ActuatorWebFluxApplicationAotTests.java index 7fb9549..67a00ca 100644 --- a/boot/actuator-webflux/src/appTest/java/com/example/actuator/webmvc/ActuatorWebFluxApplicationAotTests.java +++ b/boot/actuator-webflux/src/appTest/java/com/example/actuator/webmvc/ActuatorWebFluxApplicationAotTests.java @@ -2,7 +2,7 @@ package com.example.actuator.webmvc; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/boot/actuator-webmvc/build.gradle b/boot/actuator-webmvc/build.gradle index 42cdb98..4a5a368 100644 --- a/boot/actuator-webmvc/build.gradle +++ b/boot/actuator-webmvc/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,15 +9,15 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) runtimeOnly("io.micrometer:micrometer-registry-prometheus") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/boot/actuator-webmvc/src/appTest/java/com/example/actuator/webmvc/ActuatorWebMvcApplicationAotTests.java b/boot/actuator-webmvc/src/appTest/java/com/example/actuator/webmvc/ActuatorWebMvcApplicationAotTests.java index 0efe24a..cf80000 100644 --- a/boot/actuator-webmvc/src/appTest/java/com/example/actuator/webmvc/ActuatorWebMvcApplicationAotTests.java +++ b/boot/actuator-webmvc/src/appTest/java/com/example/actuator/webmvc/ActuatorWebMvcApplicationAotTests.java @@ -2,7 +2,7 @@ package com.example.actuator.webmvc; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/build.gradle b/build.gradle index cb00ab9..bb02bbb 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { plugins { id "io.spring.javaformat" version "$javaFormatVersion" apply false id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false - id "org.springframework.cr.smoke-test-aggregator" + id "org.springframework.lifecycle.smoke-test-aggregator" } subprojects { diff --git a/cloud/context-refresh-hikari/build.gradle b/cloud/context-refresh-hikari/build.gradle index f8d5cfa..e151ac6 100644 --- a/cloud/context-refresh-hikari/build.gradle +++ b/cloud/context-refresh-hikari/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } // Not using Spring Cloud bom due to existing issues with dependency management @@ -14,16 +14,16 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) implementation("org.springframework.cloud:spring-cloud-starter:${springCloudStarterVersion}") runtimeOnly("org.postgresql:postgresql") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation(project(":cloud:context-refresh-hikari")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/cloud/context-refresh-hikari/src/appTest/java/com/example/contextrefreshhikari/ContextRefreshHikariApplicationTests.java b/cloud/context-refresh-hikari/src/appTest/java/com/example/contextrefreshhikari/ContextRefreshHikariApplicationTests.java index ec98a1c..545cf33 100644 --- a/cloud/context-refresh-hikari/src/appTest/java/com/example/contextrefreshhikari/ContextRefreshHikariApplicationTests.java +++ b/cloud/context-refresh-hikari/src/appTest/java/com/example/contextrefreshhikari/ContextRefreshHikariApplicationTests.java @@ -10,8 +10,8 @@ import com.example.contextrefreshhikari.entities.User; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; diff --git a/cloud/context-refresh-http/build.gradle b/cloud/context-refresh-http/build.gradle index 3fa0a20..723a7d5 100644 --- a/cloud/context-refresh-http/build.gradle +++ b/cloud/context-refresh-http/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } ext { @@ -12,15 +12,15 @@ dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) implementation("org.springframework.cloud:spring-cloud-starter:$springCloudStarterVersion") implementation("org.springframework.boot:spring-boot-starter-actuator") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/cloud/context-refresh-http/src/appTest/java/com/example/contextrefreshhttp/ContextRefreshHttpApplicationTests.java b/cloud/context-refresh-http/src/appTest/java/com/example/contextrefreshhttp/ContextRefreshHttpApplicationTests.java index 5dc1c83..ad0ceca 100644 --- a/cloud/context-refresh-http/src/appTest/java/com/example/contextrefreshhttp/ContextRefreshHttpApplicationTests.java +++ b/cloud/context-refresh-http/src/appTest/java/com/example/contextrefreshhttp/ContextRefreshHttpApplicationTests.java @@ -9,7 +9,7 @@ import java.nio.file.StandardOpenOption; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/cloud/context-refresh/build.gradle b/cloud/context-refresh/build.gradle index 2467fb2..1b311c2 100644 --- a/cloud/context-refresh/build.gradle +++ b/cloud/context-refresh/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } ext { @@ -13,15 +13,15 @@ dependencies { org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) implementation("org.springframework.cloud:spring-cloud-starter:$springCloudStarterVersion") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/cloud/context-refresh/src/appTest/java/com/example/contextrefresh/ContextRefreshApplicationTests.java b/cloud/context-refresh/src/appTest/java/com/example/contextrefresh/ContextRefreshApplicationTests.java index dd85343..df2ca01 100644 --- a/cloud/context-refresh/src/appTest/java/com/example/contextrefresh/ContextRefreshApplicationTests.java +++ b/cloud/context-refresh/src/appTest/java/com/example/contextrefresh/ContextRefreshApplicationTests.java @@ -9,7 +9,7 @@ import java.nio.file.StandardOpenOption; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/cloud/loadbalancing/build.gradle b/cloud/loadbalancing/build.gradle index f6415a3..2c440e0 100644 --- a/cloud/loadbalancing/build.gradle +++ b/cloud/loadbalancing/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } // Not using Spring Cloud bom due to existing issues with dependency management @@ -13,14 +13,14 @@ dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer:${springCloudCommonsVerions}") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/cloud/loadbalancing/src/appTest/java/com/example/loadbalancing/LoadBalancerApplicationTests.java b/cloud/loadbalancing/src/appTest/java/com/example/loadbalancing/LoadBalancerApplicationTests.java index f84abe2..ce448b9 100644 --- a/cloud/loadbalancing/src/appTest/java/com/example/loadbalancing/LoadBalancerApplicationTests.java +++ b/cloud/loadbalancing/src/appTest/java/com/example/loadbalancing/LoadBalancerApplicationTests.java @@ -2,7 +2,7 @@ package com.example.loadbalancing; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/cr-listener/src/main/resources/META-INF/spring.factories b/cr-listener/src/main/resources/META-INF/spring.factories deleted file mode 100644 index e1079a5..0000000 --- a/cr-listener/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.context.ApplicationListener=\ -org.springframework.cr.listener.CheckpointListener \ No newline at end of file diff --git a/data/data-jdbc/build.gradle b/data/data-jdbc/build.gradle index 4c79105..3f37f7a 100644 --- a/data/data-jdbc/build.gradle +++ b/data/data-jdbc/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,16 +9,16 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jdbc") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) runtimeOnly("org.postgresql:postgresql") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } -crSmokeTest { +lifecycleSmokeTest { webApplication = false } diff --git a/data/data-jdbc/src/appTest/java/com/example/data/jdbc/DataJdbcApplicationTests.java b/data/data-jdbc/src/appTest/java/com/example/data/jdbc/DataJdbcApplicationTests.java index b8f5d7d..c07fd90 100644 --- a/data/data-jdbc/src/appTest/java/com/example/data/jdbc/DataJdbcApplicationTests.java +++ b/data/data-jdbc/src/appTest/java/com/example/data/jdbc/DataJdbcApplicationTests.java @@ -21,8 +21,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; @ApplicationTest public class DataJdbcApplicationTests { diff --git a/data/data-jpa/build.gradle b/data/data-jpa/build.gradle index c4f712d..93fee60 100644 --- a/data/data-jpa/build.gradle +++ b/data/data-jpa/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,16 +9,16 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) runtimeOnly("com.mysql:mysql-connector-j") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } -crSmokeTest { +lifecycleSmokeTest { webApplication = false } diff --git a/data/data-jpa/src/appTest/java/com/example/data/jpa/DataJpaApplicationTests.java b/data/data-jpa/src/appTest/java/com/example/data/jpa/DataJpaApplicationTests.java index 1feba3d..0a7c263 100644 --- a/data/data-jpa/src/appTest/java/com/example/data/jpa/DataJpaApplicationTests.java +++ b/data/data-jpa/src/appTest/java/com/example/data/jpa/DataJpaApplicationTests.java @@ -21,8 +21,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; @ApplicationTest public class DataJpaApplicationTests { diff --git a/data/data-redis/build.gradle b/data/data-redis/build.gradle index a26e641..4ff89ca 100644 --- a/data/data-redis/build.gradle +++ b/data/data-redis/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,14 +9,14 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-redis") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } -crSmokeTest { +lifecycleSmokeTest { webApplication = false } diff --git a/data/data-redis/src/appTest/java/com/example/data/redis/DataRedisApplicationTests.java b/data/data-redis/src/appTest/java/com/example/data/redis/DataRedisApplicationTests.java index 9acfcb1..6ed7bde 100644 --- a/data/data-redis/src/appTest/java/com/example/data/redis/DataRedisApplicationTests.java +++ b/data/data-redis/src/appTest/java/com/example/data/redis/DataRedisApplicationTests.java @@ -21,8 +21,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; /** * @author Christoph Strobl diff --git a/framework/hibernate-mysql/build.gradle b/framework/hibernate-mysql/build.gradle index ab744d4..a590a43 100644 --- a/framework/hibernate-mysql/build.gradle +++ b/framework/hibernate-mysql/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -12,16 +12,16 @@ dependencies { implementation("org.hibernate.orm:hibernate-core") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) runtimeOnly("com.mysql:mysql-connector-j") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } -crSmokeTest { +lifecycleSmokeTest { webApplication = false } diff --git a/framework/hibernate-mysql/src/appTest/java/com/example/hibernate/HibernateApplicationTests.java b/framework/hibernate-mysql/src/appTest/java/com/example/hibernate/HibernateApplicationTests.java index a0b621a..1a5983d 100644 --- a/framework/hibernate-mysql/src/appTest/java/com/example/hibernate/HibernateApplicationTests.java +++ b/framework/hibernate-mysql/src/appTest/java/com/example/hibernate/HibernateApplicationTests.java @@ -21,8 +21,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; @ApplicationTest public class HibernateApplicationTests { diff --git a/framework/resttemplate-netty/build.gradle b/framework/resttemplate-netty/build.gradle index 3308017..cf40040 100644 --- a/framework/resttemplate-netty/build.gradle +++ b/framework/resttemplate-netty/build.gradle @@ -1,17 +1,17 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/framework/resttemplate-netty/src/appTest/java/com/example/resttemplate/RestTemplateApplicationTests.java b/framework/resttemplate-netty/src/appTest/java/com/example/resttemplate/RestTemplateApplicationTests.java index 5458a84..5c4143a 100644 --- a/framework/resttemplate-netty/src/appTest/java/com/example/resttemplate/RestTemplateApplicationTests.java +++ b/framework/resttemplate-netty/src/appTest/java/com/example/resttemplate/RestTemplateApplicationTests.java @@ -6,8 +6,8 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/framework/scheduled/build.gradle b/framework/scheduled/build.gradle index 6911314..7ed2a57 100644 --- a/framework/scheduled/build.gradle +++ b/framework/scheduled/build.gradle @@ -1,17 +1,17 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/framework/scheduled/src/appTest/java/com/example/scheduled/ScheduledApplicationAotTests.java b/framework/scheduled/src/appTest/java/com/example/scheduled/ScheduledApplicationAotTests.java index fc1d537..07d8c6b 100644 --- a/framework/scheduled/src/appTest/java/com/example/scheduled/ScheduledApplicationAotTests.java +++ b/framework/scheduled/src/appTest/java/com/example/scheduled/ScheduledApplicationAotTests.java @@ -5,8 +5,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/framework/webclient-netty/build.gradle b/framework/webclient-netty/build.gradle index 3308017..cf40040 100644 --- a/framework/webclient-netty/build.gradle +++ b/framework/webclient-netty/build.gradle @@ -1,17 +1,17 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/framework/webclient-netty/src/appTest/java/com/example/webclient/WebClientApplicationTests.java b/framework/webclient-netty/src/appTest/java/com/example/webclient/WebClientApplicationTests.java index 0a0e685..dca3fbd 100644 --- a/framework/webclient-netty/src/appTest/java/com/example/webclient/WebClientApplicationTests.java +++ b/framework/webclient-netty/src/appTest/java/com/example/webclient/WebClientApplicationTests.java @@ -7,8 +7,8 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/framework/webflux-netty/build.gradle b/framework/webflux-netty/build.gradle index 0e02416..e43bc28 100644 --- a/framework/webflux-netty/build.gradle +++ b/framework/webflux-netty/build.gradle @@ -1,20 +1,20 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/framework/webflux-netty/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java b/framework/webflux-netty/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java index d260907..2ebab93 100644 --- a/framework/webflux-netty/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java +++ b/framework/webflux-netty/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java @@ -2,7 +2,7 @@ package com.example.webflux; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/framework/webflux-undertow/build.gradle b/framework/webflux-undertow/build.gradle index 557da83..6242d1b 100644 --- a/framework/webflux-undertow/build.gradle +++ b/framework/webflux-undertow/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -14,13 +14,13 @@ dependencies { } } implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/framework/webflux-undertow/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java b/framework/webflux-undertow/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java index c36bdc7..f781086 100644 --- a/framework/webflux-undertow/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java +++ b/framework/webflux-undertow/src/appTest/java/com/example/webflux/WebfluxApplicationTests.java @@ -2,7 +2,7 @@ package com.example.webflux; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/framework/webmvc-jetty/build.gradle b/framework/webmvc-jetty/build.gradle index a01f597..520351a 100644 --- a/framework/webmvc-jetty/build.gradle +++ b/framework/webmvc-jetty/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -14,13 +14,13 @@ dependencies { } } implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/framework/webmvc-jetty/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java b/framework/webmvc-jetty/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java index 8b55331..8d774fb 100644 --- a/framework/webmvc-jetty/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java +++ b/framework/webmvc-jetty/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java @@ -18,7 +18,7 @@ package com.example.webmvc; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/framework/webmvc-tomcat/build.gradle b/framework/webmvc-tomcat/build.gradle index 9e0bfa9..1d94b5b 100644 --- a/framework/webmvc-tomcat/build.gradle +++ b/framework/webmvc-tomcat/build.gradle @@ -1,20 +1,20 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/framework/webmvc-tomcat/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java b/framework/webmvc-tomcat/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java index 22b8e38..51c4b5b 100644 --- a/framework/webmvc-tomcat/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java +++ b/framework/webmvc-tomcat/src/appTest/java/com/example/webmvc/WebMvcApplicationTests.java @@ -18,7 +18,7 @@ package com.example.webmvc; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; diff --git a/gradle/plugins/cr-smoke-test-plugin/build.gradle b/gradle/plugins/lifecycle-smoke-test-plugin/build.gradle similarity index 72% rename from gradle/plugins/cr-smoke-test-plugin/build.gradle rename to gradle/plugins/lifecycle-smoke-test-plugin/build.gradle index 7e81faf..cfdf147 100644 --- a/gradle/plugins/cr-smoke-test-plugin/build.gradle +++ b/gradle/plugins/lifecycle-smoke-test-plugin/build.gradle @@ -12,13 +12,13 @@ repositories { gradlePlugin { plugins { - crSmokeTestPlugin { - id = "org.springframework.cr.smoke-test" - implementationClass = "org.springframework.cr.gradle.CrSmokeTestPlugin" + lifecycleSmokeTestPlugin { + id = "org.springframework.lifecycle.smoke-test" + implementationClass = "org.springframework.lifecycle.gradle.LifecycleSmokeTestPlugin" } - crSmokeTestAggregatorPlugin { - id = "org.springframework.cr.smoke-test-aggregator" - implementationClass = "org.springframework.cr.gradle.CrSmokeTestAggregatorPlugin" + lifecycleSmokeTestAggregatorPlugin { + id = "org.springframework.lifecycle.smoke-test-aggregator" + implementationClass = "org.springframework.lifecycle.gradle.LifecycleSmokeTestAggregatorPlugin" } } } diff --git a/gradle/plugins/cr-smoke-test-plugin/config/checkstyle/checkstyle.xml b/gradle/plugins/lifecycle-smoke-test-plugin/config/checkstyle/checkstyle.xml similarity index 100% rename from gradle/plugins/cr-smoke-test-plugin/config/checkstyle/checkstyle.xml rename to gradle/plugins/lifecycle-smoke-test-plugin/config/checkstyle/checkstyle.xml diff --git a/gradle/plugins/cr-smoke-test-plugin/settings.gradle b/gradle/plugins/lifecycle-smoke-test-plugin/settings.gradle similarity index 89% rename from gradle/plugins/cr-smoke-test-plugin/settings.gradle rename to gradle/plugins/lifecycle-smoke-test-plugin/settings.gradle index 417c5d9..2387491 100644 --- a/gradle/plugins/cr-smoke-test-plugin/settings.gradle +++ b/gradle/plugins/lifecycle-smoke-test-plugin/settings.gradle @@ -13,4 +13,4 @@ pluginManagement { } } -rootProject.name="cr-smoke-test-plugin" +rootProject.name="lifecycle-smoke-test-plugin" diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestAggregatorPlugin.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestAggregatorPlugin.java similarity index 86% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestAggregatorPlugin.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestAggregatorPlugin.java index a30721b..6c1989e 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestAggregatorPlugin.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestAggregatorPlugin.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.cr.gradle; +package org.springframework.lifecycle.gradle; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.tasks.TaskProvider; -import org.springframework.cr.gradle.tasks.UpdateConcoursePipeline; -import org.springframework.cr.gradle.tasks.UpdateStatusPage; +import org.springframework.lifecycle.gradle.tasks.UpdateConcoursePipeline; +import org.springframework.lifecycle.gradle.tasks.UpdateStatusPage; /** * Plugin for a project that aggregates the smoke tests to provide status and a CI @@ -31,7 +31,7 @@ import org.springframework.cr.gradle.tasks.UpdateStatusPage; * @author Andy Wilkinson * @author Sebastien Deleuze */ -public class CrSmokeTestAggregatorPlugin implements Plugin { +public class LifecycleSmokeTestAggregatorPlugin implements Plugin { @Override public void apply(Project project) { diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestPlugin.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestPlugin.java similarity index 89% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestPlugin.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestPlugin.java index a115b85..c69eb9b 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/CrSmokeTestPlugin.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/LifecycleSmokeTestPlugin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle; +package org.springframework.lifecycle.gradle; import java.util.HashMap; import java.util.Locale; @@ -37,22 +37,21 @@ import org.gradle.api.provider.Provider; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.TaskProvider; import org.gradle.api.tasks.testing.Test; -import org.gradle.api.tasks.testing.logging.TestExceptionFormat; import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile; import org.springframework.boot.gradle.plugin.SpringBootPlugin; import org.springframework.boot.gradle.tasks.bundling.BootJar; -import org.springframework.cr.gradle.dsl.CrSmokeTestExtension; -import org.springframework.cr.gradle.tasks.AppTest; -import org.springframework.cr.gradle.tasks.DescribeSmokeTests; -import org.springframework.cr.gradle.tasks.RestoreJvmApplication; -import org.springframework.cr.gradle.tasks.StartAndCheckpointJvmApplication; -import org.springframework.cr.gradle.tasks.StartApplication; -import org.springframework.cr.gradle.tasks.StartJvmApplication; -import org.springframework.cr.gradle.tasks.StopApplication; +import org.springframework.lifecycle.gradle.dsl.LifecycleSmokeTestExtension; +import org.springframework.lifecycle.gradle.tasks.AppTest; +import org.springframework.lifecycle.gradle.tasks.DescribeSmokeTests; +import org.springframework.lifecycle.gradle.tasks.RestoreJvmApplication; +import org.springframework.lifecycle.gradle.tasks.StartAndCheckpointJvmApplication; +import org.springframework.lifecycle.gradle.tasks.StartApplication; +import org.springframework.lifecycle.gradle.tasks.StartJvmApplication; +import org.springframework.lifecycle.gradle.tasks.StopApplication; /** - * {@link Plugin} for a checkpoint/restore smoke test project. Configures an {@code appTest} source set + * {@link Plugin} for a lifecycle smoke test project. Configures an {@code appTest} source set * and tasks for running the contained tests against the application running on the JVM * and as a native image. * @@ -60,7 +59,7 @@ import org.springframework.cr.gradle.tasks.StopApplication; * @author Moritz Halbritter * @author Sebastien Deleuze */ -public class CrSmokeTestPlugin implements Plugin { +public class LifecycleSmokeTestPlugin implements Plugin { @Override public void apply(Project project) { @@ -70,8 +69,8 @@ public class CrSmokeTestPlugin implements Plugin { } private void configureBootJavaProject(Project project) { - CrSmokeTestExtension extension = project.getExtensions() - .create("crSmokeTest", CrSmokeTestExtension.class, project); + LifecycleSmokeTestExtension extension = project.getExtensions() + .create("lifecycleSmokeTest", LifecycleSmokeTestExtension.class, project); extension.getWebApplication().convention(false); extension.getCheckpointEvent().convention("org.springframework.boot.context.event.ApplicationReadyEvent"); JavaPluginExtension javaExtension = project.getExtensions().getByType(JavaPluginExtension.class); @@ -116,7 +115,7 @@ public class CrSmokeTestPlugin implements Plugin { dependencies.project(Map.of("path", project.getPath(), "configuration", smokeTests.getName()))); } - private void configureAppTests(Project project, CrSmokeTestExtension extension, SourceSet appTest) { + private void configureAppTests(Project project, LifecycleSmokeTestExtension extension, SourceSet appTest) { configureJvmAppTests(project, appTest, extension); configureJvmCrAppTests(project, appTest, extension); } @@ -134,14 +133,14 @@ public class CrSmokeTestPlugin implements Plugin { .setJvmTarget(javaExtension.getTargetCompatibility().toString())); } - private void configureJvmAppTests(Project project, SourceSet sourceSet, CrSmokeTestExtension extension) { + private void configureJvmAppTests(Project project, SourceSet sourceSet, LifecycleSmokeTestExtension extension) { Provider archiveFile = project.getTasks() .named(SpringBootPlugin.BOOT_JAR_TASK_NAME, BootJar.class) .flatMap(BootJar::getArchiveFile); configureTasks(project, sourceSet, ApplicationType.JVM, archiveFile, extension); } - private void configureJvmCrAppTests(Project project, SourceSet sourceSet, CrSmokeTestExtension extension) { + private void configureJvmCrAppTests(Project project, SourceSet sourceSet, LifecycleSmokeTestExtension extension) { Provider archiveFile = project.getTasks() .named(SpringBootPlugin.BOOT_JAR_TASK_NAME, BootJar.class) .flatMap(BootJar::getArchiveFile); @@ -149,7 +148,7 @@ public class CrSmokeTestPlugin implements Plugin { } private TaskProvider configureTasks(Project project, SourceSet appTest, ApplicationType type, - Provider applicationBinary, CrSmokeTestExtension extension) { + Provider applicationBinary, LifecycleSmokeTestExtension extension) { String dir = switch (type) { case JVM -> "jvmApp"; case JVM_CHECKPOINT_RESTORE -> "jvmCrApp"; @@ -214,7 +213,7 @@ public class CrSmokeTestPlugin implements Plugin { private TaskProvider createRestoreApplicationTask(Project project, Provider applicationBinary, Provider outputDirectory, - TaskProvider startTask, CrSmokeTestExtension extension) { + TaskProvider startTask, LifecycleSmokeTestExtension extension) { TaskProvider restoreTask = project.getTasks().register("restoreApp", RestoreJvmApplication.class, (restore) -> { restore.getApplicationBinary().set(applicationBinary); restore.getOutputDirectory().set(outputDirectory); @@ -253,7 +252,7 @@ public class CrSmokeTestPlugin implements Plugin { private TaskProvider createStartApplicationTask(Project project, ApplicationType type, Provider applicationBinary, Provider outputDirectory, - CrSmokeTestExtension extension) { + LifecycleSmokeTestExtension extension) { String taskName = switch (type) { case JVM -> "startApp"; case JVM_CHECKPOINT_RESTORE -> "startAndCheckpointApp"; @@ -285,10 +284,10 @@ public class CrSmokeTestPlugin implements Plugin { task.getInputs() .file(startTask.flatMap(StartApplication::getApplicationBinary)) .withPropertyName("applicationBinary"); - task.systemProperty("org.springframework.cr.smoketest.standard-output", + task.systemProperty("org.springframework.lifecycle.smoketest.standard-output", startTask.get().getOutputFile().get().getAsFile().getAbsolutePath()); if (checkpointTask != null && checkpointTask.isPresent()) { - task.systemProperty("org.springframework.cr.smoketest.standard-output-checkpoint", + task.systemProperty("org.springframework.lifecycle.smoketest.standard-output-checkpoint", checkpointTask.get().getOutputFile().get().getAsFile().getAbsolutePath()); } task.finalizedBy(stopTask); diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/CrSmokeTestExtension.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/LifecycleSmokeTestExtension.java similarity index 87% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/CrSmokeTestExtension.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/LifecycleSmokeTestExtension.java index ad01c01..0053963 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/CrSmokeTestExtension.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/LifecycleSmokeTestExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.dsl; +package org.springframework.lifecycle.gradle.dsl; import javax.inject.Inject; @@ -22,19 +22,19 @@ import org.gradle.api.Project; import org.gradle.api.provider.Property; /** - * DSL extension for configuring checkpoint/restore smoke tests. + * DSL extension for configuring lifecycle smoke tests. * * @author Andy Wilkinson * @author Sebastien Deleuze */ -public class CrSmokeTestExtension { +public class LifecycleSmokeTestExtension { private final Property webApplication; private final Property checkpointEvent; @Inject - public CrSmokeTestExtension(Project project) { + public LifecycleSmokeTestExtension(Project project) { this.webApplication = project.getObjects().property(Boolean.class); this.checkpointEvent = project.getObjects().property(String.class); } diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/package-info.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/package-info.java similarity index 93% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/package-info.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/package-info.java index b0bf4e0..40275e6 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/dsl/package-info.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/dsl/package-info.java @@ -17,4 +17,4 @@ /** * DSL for smoke testing of applications using checkpoint/restore. */ -package org.springframework.cr.gradle.dsl; +package org.springframework.lifecycle.gradle.dsl; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/package-info.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/package-info.java similarity index 93% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/package-info.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/package-info.java index 69b1060..47d90a8 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/package-info.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/package-info.java @@ -17,4 +17,4 @@ /** * Gradle plugin for smoke testing of applications using checkpoint/restore. */ -package org.springframework.cr.gradle; +package org.springframework.lifecycle.gradle; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/AbstractSmokeTestsTask.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/AbstractSmokeTestsTask.java similarity index 97% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/AbstractSmokeTestsTask.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/AbstractSmokeTestsTask.java index e229b1f..e2ae5d9 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/AbstractSmokeTestsTask.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/AbstractSmokeTestsTask.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.io.FileInputStream; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/AppTest.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/AppTest.java similarity index 95% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/AppTest.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/AppTest.java index 2529e87..ad7c43c 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/AppTest.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/AppTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import org.gradle.api.provider.MapProperty; import org.gradle.api.tasks.Internal; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/DescribeSmokeTests.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/DescribeSmokeTests.java similarity index 98% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/DescribeSmokeTests.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/DescribeSmokeTests.java index d5c76cd..a8c3537 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/DescribeSmokeTests.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/DescribeSmokeTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.io.IOException; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/RestoreJvmApplication.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/RestoreJvmApplication.java similarity index 92% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/RestoreJvmApplication.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/RestoreJvmApplication.java index 7b5df42..41ec9fc 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/RestoreJvmApplication.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/RestoreJvmApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.util.ArrayList; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/SmokeTest.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/SmokeTest.java similarity index 96% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/SmokeTest.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/SmokeTest.java index 31a60ae..b2d17c4 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/SmokeTest.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/SmokeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.util.Properties; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartAndCheckpointJvmApplication.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartAndCheckpointJvmApplication.java similarity index 95% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartAndCheckpointJvmApplication.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartAndCheckpointJvmApplication.java index b2e5a31..dc3a443 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartAndCheckpointJvmApplication.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartAndCheckpointJvmApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ public abstract class StartAndCheckpointJvmApplication extends StartApplication command.add("/bin/bash"); command.add("-c"); StringBuilder builder = new StringBuilder(executable.getAbsolutePath()); - builder.append(" -Dorg.springframework.cr.smoketest.checkpoint="); + builder.append(" -Dorg.springframework.lifecycle.smoketest.checkpoint="); builder.append(getCheckpointEvent().get()); builder.append(" -XX:CRaCCheckpointTo="); builder.append(outputDirectory); diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartApplication.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartApplication.java similarity index 98% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartApplication.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartApplication.java index f105d32..08be604 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartApplication.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.io.IOException; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartJvmApplication.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartJvmApplication.java similarity index 96% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartJvmApplication.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartJvmApplication.java index c457296..76c3f4b 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StartJvmApplication.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StartJvmApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.util.ArrayList; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StopApplication.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StopApplication.java similarity index 97% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StopApplication.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StopApplication.java index 824e94c..70ff20d 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/StopApplication.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/StopApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.IOException; import java.nio.file.Files; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/UpdateConcoursePipeline.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/UpdateConcoursePipeline.java similarity index 97% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/UpdateConcoursePipeline.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/UpdateConcoursePipeline.java index 3a364d0..7c5abd7 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/UpdateConcoursePipeline.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/UpdateConcoursePipeline.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.File; import java.io.FileWriter; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/UpdateStatusPage.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/UpdateStatusPage.java similarity index 98% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/UpdateStatusPage.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/UpdateStatusPage.java index 94d8edf..96d44f2 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/UpdateStatusPage.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/UpdateStatusPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; import java.io.IOException; import java.nio.file.Files; diff --git a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/package-info.java b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/package-info.java similarity index 93% rename from gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/package-info.java rename to gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/package-info.java index b5a811b..3a8a951 100644 --- a/gradle/plugins/cr-smoke-test-plugin/src/main/java/org/springframework/cr/gradle/tasks/package-info.java +++ b/gradle/plugins/lifecycle-smoke-test-plugin/src/main/java/org/springframework/lifecycle/gradle/tasks/package-info.java @@ -17,4 +17,4 @@ /** * Tasks for smoke testing of applications using checkpoint/restore. */ -package org.springframework.cr.gradle.tasks; +package org.springframework.lifecycle.gradle.tasks; diff --git a/integration/integration-basic/build.gradle b/integration/integration-basic/build.gradle index e9cc631..2e5d1aa 100644 --- a/integration/integration-basic/build.gradle +++ b/integration/integration-basic/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -10,11 +10,11 @@ dependencies { implementation("org.springframework.integration:spring-integration-file") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.integration:spring-integration-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/integration-basic/src/appTest/java/com/example/si/FileCopySpringIntegrationApplicationTest.java b/integration/integration-basic/src/appTest/java/com/example/si/FileCopySpringIntegrationApplicationTest.java index ceae197..5c83ff0 100644 --- a/integration/integration-basic/src/appTest/java/com/example/si/FileCopySpringIntegrationApplicationTest.java +++ b/integration/integration-basic/src/appTest/java/com/example/si/FileCopySpringIntegrationApplicationTest.java @@ -25,8 +25,8 @@ import java.util.UUID; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.util.StreamUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/integration-webfux-data/build.gradle b/integration/integration-webfux-data/build.gradle index 468399c..9f670de 100644 --- a/integration/integration-webfux-data/build.gradle +++ b/integration/integration-webfux-data/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -24,16 +24,16 @@ dependencies { implementation("com.jayway.jsonpath:json-path") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/integration/integration-webfux-data/src/appTest/java/com/example/integration/IntegrationApplicationTests.java b/integration/integration-webfux-data/src/appTest/java/com/example/integration/IntegrationApplicationTests.java index bd3ae95..f23286e 100644 --- a/integration/integration-webfux-data/src/appTest/java/com/example/integration/IntegrationApplicationTests.java +++ b/integration/integration-webfux-data/src/appTest/java/com/example/integration/IntegrationApplicationTests.java @@ -22,8 +22,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; diff --git a/integration/spring-amqp-rabbit/build.gradle b/integration/spring-amqp-rabbit/build.gradle index 692ad4e..e5734b7 100644 --- a/integration/spring-amqp-rabbit/build.gradle +++ b/integration/spring-amqp-rabbit/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -11,10 +11,10 @@ dependencies { implementation("org.springframework.amqp:spring-rabbit:3.0.8") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/spring-amqp-rabbit/src/appTest/java/com/example/amqp/AmqpRabbitApplicationCrTests.java b/integration/spring-amqp-rabbit/src/appTest/java/com/example/amqp/AmqpRabbitApplicationCrTests.java index bcc7031..27b2819 100644 --- a/integration/spring-amqp-rabbit/src/appTest/java/com/example/amqp/AmqpRabbitApplicationCrTests.java +++ b/integration/spring-amqp-rabbit/src/appTest/java/com/example/amqp/AmqpRabbitApplicationCrTests.java @@ -20,8 +20,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/spring-kafka-avro/build.gradle b/integration/spring-kafka-avro/build.gradle index c8663c6..af428e3 100644 --- a/integration/spring-kafka-avro/build.gradle +++ b/integration/spring-kafka-avro/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" id "com.github.davidmc24.gradle.plugin.avro" version "1.3.0" } @@ -17,11 +17,11 @@ dependencies { implementation("org.apache.avro:avro:1.11.0") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/spring-kafka-avro/src/appTest/java/com/example/kafka/KafkaAvroApplicationCrTests.java b/integration/spring-kafka-avro/src/appTest/java/com/example/kafka/KafkaAvroApplicationCrTests.java index 61c3f59..5f8497c 100644 --- a/integration/spring-kafka-avro/src/appTest/java/com/example/kafka/KafkaAvroApplicationCrTests.java +++ b/integration/spring-kafka-avro/src/appTest/java/com/example/kafka/KafkaAvroApplicationCrTests.java @@ -21,8 +21,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/spring-kafka-streams/build.gradle b/integration/spring-kafka-streams/build.gradle index b676a4e..cc278e9 100644 --- a/integration/spring-kafka-streams/build.gradle +++ b/integration/spring-kafka-streams/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -12,10 +12,10 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/spring-kafka-streams/src/appTest/java/com/example/kafka/KafkaStreamsApplicationCrTests.java b/integration/spring-kafka-streams/src/appTest/java/com/example/kafka/KafkaStreamsApplicationCrTests.java index 3414f5c..5b9e927 100644 --- a/integration/spring-kafka-streams/src/appTest/java/com/example/kafka/KafkaStreamsApplicationCrTests.java +++ b/integration/spring-kafka-streams/src/appTest/java/com/example/kafka/KafkaStreamsApplicationCrTests.java @@ -20,8 +20,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/spring-kafka/build.gradle b/integration/spring-kafka/build.gradle index 879b8b6..8f5b577 100644 --- a/integration/spring-kafka/build.gradle +++ b/integration/spring-kafka/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -15,10 +15,10 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/spring-kafka/src/appTest/java/com/example/kafka/KafkaApplicationTests.java b/integration/spring-kafka/src/appTest/java/com/example/kafka/KafkaApplicationTests.java index 1b4b385..34ede4d 100644 --- a/integration/spring-kafka/src/appTest/java/com/example/kafka/KafkaApplicationTests.java +++ b/integration/spring-kafka/src/appTest/java/com/example/kafka/KafkaApplicationTests.java @@ -21,8 +21,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/spring-pulsar-reactive/build.gradle b/integration/spring-pulsar-reactive/build.gradle index 4a76b8f..73ecb85 100644 --- a/integration/spring-pulsar-reactive/build.gradle +++ b/integration/spring-pulsar-reactive/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -14,10 +14,10 @@ dependencies { } implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/spring-pulsar-reactive/src/appTest/java/com/example/pulsar/reactive/SpringPulsarApplicationTests.java b/integration/spring-pulsar-reactive/src/appTest/java/com/example/pulsar/reactive/SpringPulsarApplicationTests.java index c1fcbe8..ddd5fe9 100644 --- a/integration/spring-pulsar-reactive/src/appTest/java/com/example/pulsar/reactive/SpringPulsarApplicationTests.java +++ b/integration/spring-pulsar-reactive/src/appTest/java/com/example/pulsar/reactive/SpringPulsarApplicationTests.java @@ -5,8 +5,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/spring-pulsar/build.gradle b/integration/spring-pulsar/build.gradle index fde1b9b..8c7bf75 100644 --- a/integration/spring-pulsar/build.gradle +++ b/integration/spring-pulsar/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -13,10 +13,10 @@ dependencies { } implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) appTestImplementation("org.awaitility:awaitility:4.2.0") } diff --git a/integration/spring-pulsar/src/appTest/java/com/example/pulsar/SpringPulsarApplicationTests.java b/integration/spring-pulsar/src/appTest/java/com/example/pulsar/SpringPulsarApplicationTests.java index 165e59e..68f99be 100644 --- a/integration/spring-pulsar/src/appTest/java/com/example/pulsar/SpringPulsarApplicationTests.java +++ b/integration/spring-pulsar/src/appTest/java/com/example/pulsar/SpringPulsarApplicationTests.java @@ -5,8 +5,8 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/cr-listener/build.gradle b/lifecycle-listener/build.gradle similarity index 100% rename from cr-listener/build.gradle rename to lifecycle-listener/build.gradle diff --git a/cr-listener/src/main/java/org/springframework/cr/listener/CheckpointListener.java b/lifecycle-listener/src/main/java/org/springframework/lifecycle/listener/CheckpointListener.java similarity index 90% rename from cr-listener/src/main/java/org/springframework/cr/listener/CheckpointListener.java rename to lifecycle-listener/src/main/java/org/springframework/lifecycle/listener/CheckpointListener.java index 67532a7..bbd22dc 100644 --- a/cr-listener/src/main/java/org/springframework/cr/listener/CheckpointListener.java +++ b/lifecycle-listener/src/main/java/org/springframework/lifecycle/listener/CheckpointListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.listener; +package org.springframework.lifecycle.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,12 +28,12 @@ import org.springframework.context.ApplicationListener; /** * {@link ApplicationListener} trigger a checkpoint when the application is fully started - * when the {@code org.springframework.cr.smoketest.checkpoint} JVM system property is set - * to {@code onApplicationReady}. + * when the {@code org.springframework.lifecycle.smoketest.checkpoint} JVM system property + * is set to {@code onApplicationReady}. */ class CheckpointListener implements ApplicationListener { - private static final String CHECKPOINT_EVENT_PROPERTY_NAME = "org.springframework.cr.smoketest.checkpoint"; + private static final String CHECKPOINT_EVENT_PROPERTY_NAME = "org.springframework.lifecycle.smoketest.checkpoint"; private final Log logger = LogFactory.getLog(getClass()); diff --git a/lifecycle-listener/src/main/resources/META-INF/spring.factories b/lifecycle-listener/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..6215931 --- /dev/null +++ b/lifecycle-listener/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.context.ApplicationListener=\ +org.springframework.lifecycle.listener.CheckpointListener \ No newline at end of file diff --git a/cr-smoke-test-support/build.gradle b/lifecycle-smoke-test-support/build.gradle similarity index 100% rename from cr-smoke-test-support/build.gradle rename to lifecycle-smoke-test-support/build.gradle diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/Output.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/Output.java similarity index 87% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/Output.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/Output.java index d140518..1064358 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/Output.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/Output.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support; +package org.springframework.lifecycle.smoketest.support; import java.io.File; import java.io.IOException; @@ -62,15 +62,15 @@ public class Output { } public static Output current() { - String outputProperty = System.getProperty("org.springframework.cr.smoketest.standard-output"); + String outputProperty = System.getProperty("org.springframework.lifecycle.smoketest.standard-output"); if (outputProperty == null) { throw new IllegalStateException( - "Standard output is not available as org.springframework.cr.smoketest.standard-output " + "Standard output is not available as org.springframework.lifecycle.smoketest.standard-output " + "system property has not been set"); } Path outputCheckpointPath = null; String outputCheckpointProperty = System - .getProperty("org.springframework.cr.smoketest.standard-output-checkpoint"); + .getProperty("org.springframework.lifecycle.smoketest.standard-output-checkpoint"); if (outputCheckpointProperty != null) { outputCheckpointPath = new File(outputCheckpointProperty).toPath(); } diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/assertj/AssertableOutput.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/assertj/AssertableOutput.java similarity index 89% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/assertj/AssertableOutput.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/assertj/AssertableOutput.java index cc294d2..2e9b72d 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/assertj/AssertableOutput.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/assertj/AssertableOutput.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.assertj; +package org.springframework.lifecycle.smoketest.support.assertj; import org.assertj.core.api.AssertProvider; -import org.springframework.cr.smoketest.support.Output; +import org.springframework.lifecycle.smoketest.support.Output; /** * An {@link AssertProvider} for {@link OutputAssert}. diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/assertj/OutputAssert.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/assertj/OutputAssert.java similarity index 96% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/assertj/OutputAssert.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/assertj/OutputAssert.java index 2e48902..3106a6a 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/assertj/OutputAssert.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/assertj/OutputAssert.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.assertj; +package org.springframework.lifecycle.smoketest.support.assertj; import java.util.List; import java.util.Optional; @@ -22,7 +22,7 @@ import java.util.Optional; import org.assertj.core.api.AbstractAssert; import org.assertj.core.error.BasicErrorMessageFactory; -import org.springframework.cr.smoketest.support.Output; +import org.springframework.lifecycle.smoketest.support.Output; /** * An {@link AbstractAssert} for {@link Output}. diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationTest.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationTest.java similarity index 93% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationTest.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationTest.java index b25e71a..84f133e 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationTest.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -23,7 +23,7 @@ import java.net.URI; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.Extensions; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; import org.springframework.test.web.reactive.server.WebTestClient; import static java.lang.annotation.ElementType.TYPE; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUnderTest.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUnderTest.java similarity index 95% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUnderTest.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUnderTest.java index 07048f0..8d0a678 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUnderTest.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUnderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.util.List; import java.util.regex.Matcher; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; import org.junit.jupiter.api.extension.ExtensionContext.Store; -import org.springframework.cr.smoketest.support.Output; +import org.springframework.lifecycle.smoketest.support.Output; /** * Provides access to data about the application which is being tested. diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUrl.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUrl.java similarity index 95% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUrl.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUrl.java index f8609a5..e4b0a12 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUrl.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUrl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUrlParameterResolver.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUrlParameterResolver.java similarity index 96% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUrlParameterResolver.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUrlParameterResolver.java index 01af99d..0e110b6 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/ApplicationUrlParameterResolver.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/ApplicationUrlParameterResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.net.URI; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/AssertableOutputParameterResolver.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/AssertableOutputParameterResolver.java similarity index 90% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/AssertableOutputParameterResolver.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/AssertableOutputParameterResolver.java index 4a750de..5c515bf 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/AssertableOutputParameterResolver.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/AssertableOutputParameterResolver.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolutionException; import org.junit.jupiter.api.extension.ParameterResolver; -import org.springframework.cr.smoketest.support.assertj.AssertableOutput; +import org.springframework.lifecycle.smoketest.support.assertj.AssertableOutput; /** * {@link ParameterResolver} for {@link AssertableOutput}. diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/AwaitApplication.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/AwaitApplication.java similarity index 95% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/AwaitApplication.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/AwaitApplication.java index 7632f0a..c57809a 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/AwaitApplication.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/AwaitApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.time.Duration; import java.time.Instant; @@ -24,7 +24,7 @@ import java.util.regex.Pattern; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import org.springframework.cr.smoketest.support.Output; +import org.springframework.lifecycle.smoketest.support.Output; /** * {@link BeforeAllCallback} that waits for the application to have started. diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposeHost.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposeHost.java similarity index 95% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposeHost.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposeHost.java index bc2971e..8dca24c 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposeHost.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposeHost.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposeHostParameterResolver.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposeHostParameterResolver.java similarity index 96% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposeHostParameterResolver.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposeHostParameterResolver.java index 28e74a7..fe59d98 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposeHostParameterResolver.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposeHostParameterResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.util.Locale; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposePort.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposePort.java similarity index 95% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposePort.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposePort.java index cb0b009..6d38697 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposePort.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposePort.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposePortParameterResolver.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposePortParameterResolver.java similarity index 97% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposePortParameterResolver.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposePortParameterResolver.java index 825fa80..6554272 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/DockerComposePortParameterResolver.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/DockerComposePortParameterResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import java.util.Locale; diff --git a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/WebTestClientParameterResolver.java b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/WebTestClientParameterResolver.java similarity index 97% rename from cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/WebTestClientParameterResolver.java rename to lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/WebTestClientParameterResolver.java index ff18773..d120b3f 100644 --- a/cr-smoke-test-support/src/main/java/org/springframework/cr/smoketest/support/junit/WebTestClientParameterResolver.java +++ b/lifecycle-smoke-test-support/src/main/java/org/springframework/lifecycle/smoketest/support/junit/WebTestClientParameterResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cr.smoketest.support.junit; +package org.springframework.lifecycle.smoketest.support.junit; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; diff --git a/security/ldap-client/build.gradle b/security/ldap-client/build.gradle index dc95ab7..a5ee903 100644 --- a/security/ldap-client/build.gradle +++ b/security/ldap-client/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -16,14 +16,14 @@ dependencies { implementation("com.unboundid:unboundid-ldapsdk") implementation("org.crac:crac") implementation("org.apache.commons:commons-pool2") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/security/ldap-client/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java b/security/ldap-client/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java index fb77cce..c8e9663 100644 --- a/security/ldap-client/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java +++ b/security/ldap-client/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java @@ -2,7 +2,7 @@ package com.example.security.ldap; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/security/ldap-client/src/main/java/com/example/security/ldap/MainController.java b/security/ldap-client/src/main/java/com/example/security/ldap/MainController.java index 713f123..e895c93 100644 --- a/security/ldap-client/src/main/java/com/example/security/ldap/MainController.java +++ b/security/ldap-client/src/main/java/com/example/security/ldap/MainController.java @@ -20,16 +20,20 @@ public class MainController { @GetMapping("/users") public List users() { - return this.ldap.search().query((query) -> query.where("objectclass").is("person")) - .toList(new PersonContextMapper()); + return this.ldap.search() + .query((query) -> query.where("objectclass").is("person")) + .toList(new PersonContextMapper()); } private static final class PersonContextMapper extends AbstractContextMapper { + @Override protected Person doMapFromContext(DirContextOperations ctx) { Person.Essence essense = new Person.Essence(ctx); essense.setUsername(ctx.getStringAttribute("uid")); return (Person) essense.createUserDetails(); } + } + } diff --git a/security/ldap-client/src/main/java/com/example/security/ldap/SecurityConfig.java b/security/ldap-client/src/main/java/com/example/security/ldap/SecurityConfig.java index 5fc2a67..40bb31d 100644 --- a/security/ldap-client/src/main/java/com/example/security/ldap/SecurityConfig.java +++ b/security/ldap-client/src/main/java/com/example/security/ldap/SecurityConfig.java @@ -46,8 +46,8 @@ public class SecurityConfig { @Bean UserDetailsService users() { - return new InMemoryUserDetailsManager(User.withUsername("user").password("{noop}password") - .authorities("app").build()); + return new InMemoryUserDetailsManager( + User.withUsername("user").password("{noop}password").authorities("app").build()); } } diff --git a/security/security-ldap/build.gradle b/security/security-ldap/build.gradle index 9b87f42..a70b433 100644 --- a/security/security-ldap/build.gradle +++ b/security/security-ldap/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -15,14 +15,14 @@ dependencies { implementation("org.springframework.security:spring-security-ldap") implementation("com.unboundid:unboundid-ldapsdk") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/security/security-ldap/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java b/security/security-ldap/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java index 4c2af3e..a8b884f 100644 --- a/security/security-ldap/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java +++ b/security/security-ldap/src/appTest/java/com/example/security/ldap/SecurityLdapApplicationCheckpointTests.java @@ -2,7 +2,7 @@ package com.example.security.ldap; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/security/security-oauth2-authorization-server/build.gradle b/security/security-oauth2-authorization-server/build.gradle index 54ae7f7..656e4b5 100644 --- a/security/security-oauth2-authorization-server/build.gradle +++ b/security/security-oauth2-authorization-server/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,16 +9,16 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.security:spring-security-oauth2-authorization-server:1.0.0-SNAPSHOT") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") appTestImplementation("com.fasterxml.jackson.core:jackson-databind") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/security/security-oauth2-authorization-server/src/appTest/java/com/example/security/oauth2authorizationserver/OAuth2AuthorizationServerApplicationCheckpointTests.java b/security/security-oauth2-authorization-server/src/appTest/java/com/example/security/oauth2authorizationserver/OAuth2AuthorizationServerApplicationCheckpointTests.java index 319a877..b0133f1 100644 --- a/security/security-oauth2-authorization-server/src/appTest/java/com/example/security/oauth2authorizationserver/OAuth2AuthorizationServerApplicationCheckpointTests.java +++ b/security/security-oauth2-authorization-server/src/appTest/java/com/example/security/oauth2authorizationserver/OAuth2AuthorizationServerApplicationCheckpointTests.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.http.HttpHeaders; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.util.LinkedMultiValueMap; diff --git a/security/security-oauth2-resource-server/build.gradle b/security/security-oauth2-resource-server/build.gradle index 375e0e8..6e4ecfd 100644 --- a/security/security-oauth2-resource-server/build.gradle +++ b/security/security-oauth2-resource-server/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -10,14 +10,14 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server") implementation("com.squareup.okhttp3:mockwebserver") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/security/security-oauth2-resource-server/src/appTest/java/com/example/security/oauth2resourceserver/OAuth2ResourceServerApplicationCheckpointTests.java b/security/security-oauth2-resource-server/src/appTest/java/com/example/security/oauth2resourceserver/OAuth2ResourceServerApplicationCheckpointTests.java index 38fcb55..a36a4f2 100644 --- a/security/security-oauth2-resource-server/src/appTest/java/com/example/security/oauth2resourceserver/OAuth2ResourceServerApplicationCheckpointTests.java +++ b/security/security-oauth2-resource-server/src/appTest/java/com/example/security/oauth2resourceserver/OAuth2ResourceServerApplicationCheckpointTests.java @@ -2,7 +2,7 @@ package com.example.security.oauth2resourceserver; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/security/security-webflux/build.gradle b/security/security-webflux/build.gradle index cb5c1f5..5098d18 100644 --- a/security/security-webflux/build.gradle +++ b/security/security-webflux/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,13 +9,13 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-webflux") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/security/security-webflux/src/appTest/java/com/example/security/webflux/SecurityWebFluxApplicationCheckpointTests.java b/security/security-webflux/src/appTest/java/com/example/security/webflux/SecurityWebFluxApplicationCheckpointTests.java index a14680c..f9eedde 100644 --- a/security/security-webflux/src/appTest/java/com/example/security/webflux/SecurityWebFluxApplicationCheckpointTests.java +++ b/security/security-webflux/src/appTest/java/com/example/security/webflux/SecurityWebFluxApplicationCheckpointTests.java @@ -18,7 +18,7 @@ package com.example.security.webflux; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/security/security-webmvc/build.gradle b/security/security-webmvc/build.gradle index abf1dad..885e356 100644 --- a/security/security-webmvc/build.gradle +++ b/security/security-webmvc/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -9,13 +9,13 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/security/security-webmvc/src/appTest/java/com/example/security/webmvc/SecurityWebMvcApplicationCheckpointTests.java b/security/security-webmvc/src/appTest/java/com/example/security/webmvc/SecurityWebMvcApplicationCheckpointTests.java index e594726..cd0859f 100644 --- a/security/security-webmvc/src/appTest/java/com/example/security/webmvc/SecurityWebMvcApplicationCheckpointTests.java +++ b/security/security-webmvc/src/appTest/java/com/example/security/webmvc/SecurityWebMvcApplicationCheckpointTests.java @@ -18,7 +18,7 @@ package com.example.security.webmvc; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/session/session-jdbc/build.gradle b/session/session-jdbc/build.gradle index b9d0175..7791ae3 100644 --- a/session/session-jdbc/build.gradle +++ b/session/session-jdbc/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -11,13 +11,13 @@ dependencies { implementation("org.springframework.session:spring-session-jdbc") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } \ No newline at end of file diff --git a/session/session-jdbc/src/appTest/java/com/example/session/jdbc/SessionJdbcApplicationTests.java b/session/session-jdbc/src/appTest/java/com/example/session/jdbc/SessionJdbcApplicationTests.java index 45dd09a..d5d99d0 100644 --- a/session/session-jdbc/src/appTest/java/com/example/session/jdbc/SessionJdbcApplicationTests.java +++ b/session/session-jdbc/src/appTest/java/com/example/session/jdbc/SessionJdbcApplicationTests.java @@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; @ApplicationTest diff --git a/session/session-redis-webflux/build.gradle b/session/session-redis-webflux/build.gradle index 7815e63..ea8aec0 100644 --- a/session/session-redis-webflux/build.gradle +++ b/session/session-redis-webflux/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot" - id "org.springframework.cr.smoke-test" + id "org.springframework.lifecycle.smoke-test" } dependencies { @@ -11,13 +11,13 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-redis") implementation("org.crac:crac") - implementation(project(":cr-listener")) + implementation(project(":lifecycle-listener")) testImplementation("org.springframework.boot:spring-boot-starter-test") - appTestImplementation(project(":cr-smoke-test-support")) + appTestImplementation(project(":lifecycle-smoke-test-support")) } -crSmokeTest { +lifecycleSmokeTest { webApplication = true } diff --git a/session/session-redis-webflux/src/appTest/java/com/example/session/redis/webflux/SessionRedisWebfluxApplicationTests.java b/session/session-redis-webflux/src/appTest/java/com/example/session/redis/webflux/SessionRedisWebfluxApplicationTests.java index a931efd..b25245c 100644 --- a/session/session-redis-webflux/src/appTest/java/com/example/session/redis/webflux/SessionRedisWebfluxApplicationTests.java +++ b/session/session-redis-webflux/src/appTest/java/com/example/session/redis/webflux/SessionRedisWebfluxApplicationTests.java @@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; -import org.springframework.cr.smoketest.support.junit.ApplicationTest; +import org.springframework.lifecycle.smoketest.support.junit.ApplicationTest; import org.springframework.test.web.reactive.server.WebTestClient; @ApplicationTest diff --git a/settings.gradle b/settings.gradle index af12b12..1e3ed14 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ pluginManagement { - includeBuild "gradle/plugins/cr-smoke-test-plugin" + includeBuild "gradle/plugins/lifecycle-smoke-test-plugin" repositories { gradlePluginPortal() maven { @@ -24,8 +24,8 @@ plugins { rootProject.name="spring-lifecycle-smoke-tests" -include "cr-smoke-test-support" -include "cr-listener" +include "lifecycle-smoke-test-support" +include "lifecycle-listener" ["boot", "cloud", "data", "framework", "integration", "security", "session"].each { group -> file(group).eachDirMatch(~/[a-z].*/) { smokeTest ->