From dc6dbaf3018cc24dbd4d3ddbc5165c157d96413c Mon Sep 17 00:00:00 2001 From: hantsy Date: Sat, 29 Jun 2024 16:37:12 +0800 Subject: [PATCH] chore: bump to spring-boot 3.3.1 --- boot-data-cassandra/pom.xml | 2 +- boot-data-couchbase/pom.xml | 2 +- boot-data-elasticsearch/pom.xml | 2 +- boot-data-mongo-gridfs/pom.xml | 2 +- boot-data-mongo-querydsl/pom.xml | 2 +- boot-data-mongo-tailable/pom.xml | 2 +- boot-data-mongo/pom.xml | 2 +- boot-data-neo4j/pom.xml | 2 +- boot-data-redis/pom.xml | 2 +- boot-exception-handler/pom.xml | 2 +- boot-groovy/pom.xml | 2 +- boot-kotlin-co-dsl/pom.xml | 2 +- boot-kotlin-co/pom.xml | 2 +- boot-kotlin-dsl/pom.xml | 2 +- boot-kotlin/pom.xml | 2 +- boot-mongo/pom.xml | 2 +- boot-mvc-freemarker/pom.xml | 2 +- boot-mvc-mustache/pom.xml | 2 +- boot-mvc-thymeleaf/pom.xml | 2 +- boot-neo4j-cypher/pom.xml | 2 +- boot-neo4j/pom.xml | 2 +- .../com/example/demo/DemoApplication.java | 19 ++++- .../com/example/demo/PostRepositoryTest.java | 3 +- boot-pulsar/pom.xml | 2 +- boot-reactor-kafka/receiver/pom.xml | 2 +- boot-reactor-kafka/sender/pom.xml | 2 +- boot-reactor-rabbitmq/receiver/pom.xml | 2 +- boot-reactor-rabbitmq/sender/pom.xml | 2 +- boot-redis/pom.xml | 2 +- boot-start-routes/pom.xml | 2 +- boot-start/pom.xml | 2 +- cache-caffeine/pom.xml | 2 +- cache-redis/pom.xml | 2 +- cache/pom.xml | 2 +- client-apache-httpclient5/pom.xml | 2 +- client-jdk11-httpclient/pom.xml | 2 +- client-jetty/pom.xml | 2 +- client-reactor-netty2/pom.xml | 2 +- client/pom.xml | 2 +- data-cassandra/pom.xml | 2 +- data-couchbase/pom.xml | 2 +- data-elasticsearch/pom.xml | 2 +- data-mongo-pageable/pom.xml | 2 +- data-mongo-transaction/pom.xml | 2 +- data-mongo/pom.xml | 2 +- data-neo4j/pom.xml | 2 +- data-redis-message/pom.xml | 2 +- data-redis/pom.xml | 2 +- event/pom.xml | 2 +- exception-handler/pom.xml | 2 +- groovy-dsl/pom.xml | 4 +- groovy/pom.xml | 2 +- integration-dsl/pom.xml | 2 +- integration/pom.xml | 2 +- java8/pom.xml | 2 +- java9/pom.xml | 2 +- kotlin-co/pom.xml | 69 +++++++++++++++++-- .../{demo => test}/it/ApplicationTests.kt | 2 +- .../repository/MongoContextInitializer.kt | 2 +- .../repository/PostRepositoryTest.kt | 6 +- .../{demo => test}/web/PostControllerTest.kt | 6 +- kotlin-dsl/pom.xml | 2 +- kotlin-routes/pom.xml | 2 +- kotlin/pom.xml | 2 +- multipart-data-mongo/pom.xml | 2 +- multipart/pom.xml | 2 +- mvc-freemarker/pom.xml | 2 +- mvc-mustache/pom.xml | 2 +- mvc-thymeleaf/pom.xml | 2 +- register-bean/pom.xml | 2 +- restdocs/pom.xml | 2 +- routes/pom.xml | 2 +- rxjava3/pom.xml | 2 +- schedule/pom.xml | 2 +- security-data-mongo/pom.xml | 2 +- security-form/pom.xml | 2 +- security-method/pom.xml | 2 +- security-user-properties/pom.xml | 2 +- security/pom.xml | 2 +- session-data-mongo/pom.xml | 2 +- session-data-redis/pom.xml | 2 +- session-header/pom.xml | 2 +- session/pom.xml | 2 +- smallrye-mutiny/pom.xml | 2 +- sse/pom.xml | 2 +- vanilla-jetty/pom.xml | 2 +- vanilla-reactor-netty2/pom.xml | 2 +- vanilla-tomcat/pom.xml | 2 +- vanilla-undertow/pom.xml | 2 +- vanilla/pom.xml | 2 +- war/pom.xml | 2 +- web-filter/pom.xml | 2 +- websocket-reactor-netty2/pom.xml | 4 +- websocket/pom.xml | 4 +- 94 files changed, 180 insertions(+), 107 deletions(-) rename kotlin-co/src/test/kotlin/com/example/{demo => test}/it/ApplicationTests.kt (97%) rename kotlin-co/src/test/kotlin/com/example/{demo => test}/repository/MongoContextInitializer.kt (97%) rename kotlin-co/src/test/kotlin/com/example/{demo => test}/repository/PostRepositoryTest.kt (89%) rename kotlin-co/src/test/kotlin/com/example/{demo => test}/web/PostControllerTest.kt (92%) diff --git a/boot-data-cassandra/pom.xml b/boot-data-cassandra/pom.xml index 30ab4fab7..cc7426a1c 100644 --- a/boot-data-cassandra/pom.xml +++ b/boot-data-cassandra/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-data-couchbase/pom.xml b/boot-data-couchbase/pom.xml index 3b41e2dcb..bf95e0f9e 100644 --- a/boot-data-couchbase/pom.xml +++ b/boot-data-couchbase/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-data-elasticsearch/pom.xml b/boot-data-elasticsearch/pom.xml index b190d7448..d6a36a0f5 100644 --- a/boot-data-elasticsearch/pom.xml +++ b/boot-data-elasticsearch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-data-mongo-gridfs/pom.xml b/boot-data-mongo-gridfs/pom.xml index 4efcb4310..0e5505c85 100644 --- a/boot-data-mongo-gridfs/pom.xml +++ b/boot-data-mongo-gridfs/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-data-mongo-querydsl/pom.xml b/boot-data-mongo-querydsl/pom.xml index 9fe38af92..bb75fce08 100644 --- a/boot-data-mongo-querydsl/pom.xml +++ b/boot-data-mongo-querydsl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-data-mongo-tailable/pom.xml b/boot-data-mongo-tailable/pom.xml index 3e7271d3c..f71636580 100644 --- a/boot-data-mongo-tailable/pom.xml +++ b/boot-data-mongo-tailable/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-data-mongo/pom.xml b/boot-data-mongo/pom.xml index 0af46f11e..e13bf9a19 100644 --- a/boot-data-mongo/pom.xml +++ b/boot-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-data-neo4j/pom.xml b/boot-data-neo4j/pom.xml index 49f51f224..d186abc50 100644 --- a/boot-data-neo4j/pom.xml +++ b/boot-data-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-data-redis/pom.xml b/boot-data-redis/pom.xml index 1db547a66..edefed27d 100644 --- a/boot-data-redis/pom.xml +++ b/boot-data-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-exception-handler/pom.xml b/boot-exception-handler/pom.xml index e091a1c7d..8c67e7900 100644 --- a/boot-exception-handler/pom.xml +++ b/boot-exception-handler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-groovy/pom.xml b/boot-groovy/pom.xml index 3b90f7d37..fca2dbe08 100644 --- a/boot-groovy/pom.xml +++ b/boot-groovy/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-kotlin-co-dsl/pom.xml b/boot-kotlin-co-dsl/pom.xml index d0506546e..999d95932 100644 --- a/boot-kotlin-co-dsl/pom.xml +++ b/boot-kotlin-co-dsl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-kotlin-co/pom.xml b/boot-kotlin-co/pom.xml index a3f699c14..0cf74e1ef 100644 --- a/boot-kotlin-co/pom.xml +++ b/boot-kotlin-co/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-kotlin-dsl/pom.xml b/boot-kotlin-dsl/pom.xml index cc70bf3d6..c8400f738 100644 --- a/boot-kotlin-dsl/pom.xml +++ b/boot-kotlin-dsl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-kotlin/pom.xml b/boot-kotlin/pom.xml index 50051de5b..b38ab4ad5 100644 --- a/boot-kotlin/pom.xml +++ b/boot-kotlin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-mongo/pom.xml b/boot-mongo/pom.xml index 9872ddecb..cf8e2a326 100644 --- a/boot-mongo/pom.xml +++ b/boot-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-mvc-freemarker/pom.xml b/boot-mvc-freemarker/pom.xml index a8fce28e2..be1d24cfa 100644 --- a/boot-mvc-freemarker/pom.xml +++ b/boot-mvc-freemarker/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-mvc-mustache/pom.xml b/boot-mvc-mustache/pom.xml index e040bf824..26ca129fb 100644 --- a/boot-mvc-mustache/pom.xml +++ b/boot-mvc-mustache/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-mvc-thymeleaf/pom.xml b/boot-mvc-thymeleaf/pom.xml index 82db9952a..a05938dc1 100644 --- a/boot-mvc-thymeleaf/pom.xml +++ b/boot-mvc-thymeleaf/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-neo4j-cypher/pom.xml b/boot-neo4j-cypher/pom.xml index 73cd9d851..e5da3b3e9 100644 --- a/boot-neo4j-cypher/pom.xml +++ b/boot-neo4j-cypher/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-neo4j/pom.xml b/boot-neo4j/pom.xml index 2ab2162e3..2b0a06a32 100644 --- a/boot-neo4j/pom.xml +++ b/boot-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-neo4j/src/main/java/com/example/demo/DemoApplication.java b/boot-neo4j/src/main/java/com/example/demo/DemoApplication.java index a67a1209d..c528a7e9d 100644 --- a/boot-neo4j/src/main/java/com/example/demo/DemoApplication.java +++ b/boot-neo4j/src/main/java/com/example/demo/DemoApplication.java @@ -2,19 +2,24 @@ import lombok.*; import lombok.extern.slf4j.Slf4j; +import org.neo4j.driver.Driver; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.Id; import org.springframework.data.neo4j.config.EnableNeo4jAuditing; +import org.springframework.data.neo4j.core.ReactiveDatabaseSelectionProvider; import org.springframework.data.neo4j.core.ReactiveNeo4jOperations; import org.springframework.data.neo4j.core.schema.GeneratedValue; import org.springframework.data.neo4j.core.schema.Node; +import org.springframework.data.neo4j.core.transaction.ReactiveNeo4jTransactionManager; +import org.springframework.data.neo4j.repository.config.ReactiveNeo4jRepositoryConfigurationExtension; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -26,7 +31,6 @@ @SpringBootApplication @EnableNeo4jAuditing -@EnableTransactionManagement public class DemoApplication { public static void main(String[] args) { @@ -35,6 +39,15 @@ public static void main(String[] args) { } +@Configuration +class Neo4jTxConfiguration { + @Bean(ReactiveNeo4jRepositoryConfigurationExtension.DEFAULT_TRANSACTION_MANAGER_BEAN_NAME) + ReactiveNeo4jTransactionManager rectiveNeo4jTransactionManager(Driver driver, + ReactiveDatabaseSelectionProvider databaseNameProvider) { + return new ReactiveNeo4jTransactionManager(driver, databaseNameProvider); + } +} + @Component @Slf4j @RequiredArgsConstructor @@ -60,7 +73,7 @@ public void run(String[] args) { this.posts.findAll() ) //.blockLast(); - .subscribe(post -> log.info("saved post: {}", post));//this will fail test. + .subscribe(post -> log.info("saved post: {}", post));//this will fail test. } diff --git a/boot-neo4j/src/test/java/com/example/demo/PostRepositoryTest.java b/boot-neo4j/src/test/java/com/example/demo/PostRepositoryTest.java index 7b56a9200..1536d6cce 100644 --- a/boot-neo4j/src/test/java/com/example/demo/PostRepositoryTest.java +++ b/boot-neo4j/src/test/java/com/example/demo/PostRepositoryTest.java @@ -37,10 +37,11 @@ @Slf4j @TestInstance(TestInstance.Lifecycle.PER_METHOD) @ActiveProfiles("test") +@Import(Neo4jTxConfiguration.class) public class PostRepositoryTest { @Container - static Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:5") + static Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:latest") .withStartupTimeout(Duration.ofMinutes(5)); @DynamicPropertySource diff --git a/boot-pulsar/pom.xml b/boot-pulsar/pom.xml index fea36a270..9cb59f11b 100644 --- a/boot-pulsar/pom.xml +++ b/boot-pulsar/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-reactor-kafka/receiver/pom.xml b/boot-reactor-kafka/receiver/pom.xml index dcab8852a..21dcd1ada 100644 --- a/boot-reactor-kafka/receiver/pom.xml +++ b/boot-reactor-kafka/receiver/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-reactor-kafka/sender/pom.xml b/boot-reactor-kafka/sender/pom.xml index bf57244b4..bbbcb06d4 100644 --- a/boot-reactor-kafka/sender/pom.xml +++ b/boot-reactor-kafka/sender/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-reactor-rabbitmq/receiver/pom.xml b/boot-reactor-rabbitmq/receiver/pom.xml index acdd1132e..9b76d5359 100644 --- a/boot-reactor-rabbitmq/receiver/pom.xml +++ b/boot-reactor-rabbitmq/receiver/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-reactor-rabbitmq/sender/pom.xml b/boot-reactor-rabbitmq/sender/pom.xml index f36dc948b..3e9775a7f 100644 --- a/boot-reactor-rabbitmq/sender/pom.xml +++ b/boot-reactor-rabbitmq/sender/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/boot-redis/pom.xml b/boot-redis/pom.xml index 0812972ca..a932da098 100644 --- a/boot-redis/pom.xml +++ b/boot-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-start-routes/pom.xml b/boot-start-routes/pom.xml index bc3433138..3da9c4705 100644 --- a/boot-start-routes/pom.xml +++ b/boot-start-routes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/boot-start/pom.xml b/boot-start/pom.xml index 499e76a6e..4b5a39ed1 100644 --- a/boot-start/pom.xml +++ b/boot-start/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/cache-caffeine/pom.xml b/cache-caffeine/pom.xml index 8830a93da..9bdfdb882 100644 --- a/cache-caffeine/pom.xml +++ b/cache-caffeine/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/cache-redis/pom.xml b/cache-redis/pom.xml index ff4f1d91a..7143f4004 100644 --- a/cache-redis/pom.xml +++ b/cache-redis/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/cache/pom.xml b/cache/pom.xml index a92285c3f..ece15c261 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/client-apache-httpclient5/pom.xml b/client-apache-httpclient5/pom.xml index 0b3f6a18e..2e8a25cb3 100644 --- a/client-apache-httpclient5/pom.xml +++ b/client-apache-httpclient5/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/client-jdk11-httpclient/pom.xml b/client-jdk11-httpclient/pom.xml index a6481698f..90b961238 100644 --- a/client-jdk11-httpclient/pom.xml +++ b/client-jdk11-httpclient/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/client-jetty/pom.xml b/client-jetty/pom.xml index 5cfb358af..337bd3f07 100644 --- a/client-jetty/pom.xml +++ b/client-jetty/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/client-reactor-netty2/pom.xml b/client-reactor-netty2/pom.xml index afb542c5b..91bc1e530 100644 --- a/client-reactor-netty2/pom.xml +++ b/client-reactor-netty2/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/client/pom.xml b/client/pom.xml index 8ad596845..0cfe6d4b3 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-cassandra/pom.xml b/data-cassandra/pom.xml index 1ab5a4c8d..5d18cccf9 100644 --- a/data-cassandra/pom.xml +++ b/data-cassandra/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-couchbase/pom.xml b/data-couchbase/pom.xml index 583593d85..193bfe2eb 100644 --- a/data-couchbase/pom.xml +++ b/data-couchbase/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-elasticsearch/pom.xml b/data-elasticsearch/pom.xml index 53bc3ea9b..66e361c99 100644 --- a/data-elasticsearch/pom.xml +++ b/data-elasticsearch/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-mongo-pageable/pom.xml b/data-mongo-pageable/pom.xml index a34e9c9d3..504318084 100644 --- a/data-mongo-pageable/pom.xml +++ b/data-mongo-pageable/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-mongo-transaction/pom.xml b/data-mongo-transaction/pom.xml index a51c1dc4c..b1b8362e1 100644 --- a/data-mongo-transaction/pom.xml +++ b/data-mongo-transaction/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-mongo/pom.xml b/data-mongo/pom.xml index bf4871503..9acddcbe0 100644 --- a/data-mongo/pom.xml +++ b/data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-neo4j/pom.xml b/data-neo4j/pom.xml index 77987049f..4a0c89df0 100644 --- a/data-neo4j/pom.xml +++ b/data-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 com.example diff --git a/data-redis-message/pom.xml b/data-redis-message/pom.xml index 4dcb82244..35a837674 100644 --- a/data-redis-message/pom.xml +++ b/data-redis-message/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/data-redis/pom.xml b/data-redis/pom.xml index eec0e4926..ea109cb6d 100644 --- a/data-redis/pom.xml +++ b/data-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/event/pom.xml b/event/pom.xml index af160f243..cb7e405fa 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/exception-handler/pom.xml b/exception-handler/pom.xml index ac2b00dd5..b8ca7187f 100644 --- a/exception-handler/pom.xml +++ b/exception-handler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/groovy-dsl/pom.xml b/groovy-dsl/pom.xml index 6d69a8239..242aadfa1 100644 --- a/groovy-dsl/pom.xml +++ b/groovy-dsl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 @@ -137,7 +137,7 @@ diff --git a/integration-dsl/pom.xml b/integration-dsl/pom.xml index 6656a40ec..2408053f4 100644 --- a/integration-dsl/pom.xml +++ b/integration-dsl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/integration/pom.xml b/integration/pom.xml index 1574ddcab..adae38d03 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/java8/pom.xml b/java8/pom.xml index 1d000f89b..494113e51 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/java9/pom.xml b/java9/pom.xml index abeadc119..64944f310 100644 --- a/java9/pom.xml +++ b/java9/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/kotlin-co/pom.xml b/kotlin-co/pom.xml index 134929370..65f5deeca 100644 --- a/kotlin-co/pom.xml +++ b/kotlin-co/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 @@ -23,7 +23,7 @@ UTF-8 UTF-8 21 - 1.9.23 + 2.0.0 3.2.5 5.6.2 1.13.8 @@ -132,6 +132,12 @@ reactor-test test + + com.jayway.jsonpath + json-path + 2.9.0 + test + org.jetbrains.kotlinx kotlinx-coroutines-test @@ -159,6 +165,17 @@ junit-jupiter test + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + @@ -166,11 +183,6 @@ ${project.basedir}/src/main/kotlin ${project.basedir}/src/test/kotlin - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - org.apache.maven.plugins maven-surefire-plugin @@ -215,15 +227,29 @@ compile + compile compile + + + src/main/kotlin + target/generated-sources/annotations + + test-compile + test-compile test-compile + + + src/test/kotlin + target/generated-test-sources/test-annotations + + @@ -234,6 +260,35 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + default-compile + none + + + default-testCompile + none + + + compile + compile + + compile + + + + testCompile + test-compile + + testCompile + + + + diff --git a/kotlin-co/src/test/kotlin/com/example/demo/it/ApplicationTests.kt b/kotlin-co/src/test/kotlin/com/example/test/it/ApplicationTests.kt similarity index 97% rename from kotlin-co/src/test/kotlin/com/example/demo/it/ApplicationTests.kt rename to kotlin-co/src/test/kotlin/com/example/test/it/ApplicationTests.kt index 0df0f432a..faaf03aea 100644 --- a/kotlin-co/src/test/kotlin/com/example/demo/it/ApplicationTests.kt +++ b/kotlin-co/src/test/kotlin/com/example/test/it/ApplicationTests.kt @@ -1,4 +1,4 @@ -package com.example.demo.it +package com.example.test.it import com.example.demo.Application import com.example.demo.domain.Post diff --git a/kotlin-co/src/test/kotlin/com/example/demo/repository/MongoContextInitializer.kt b/kotlin-co/src/test/kotlin/com/example/test/repository/MongoContextInitializer.kt similarity index 97% rename from kotlin-co/src/test/kotlin/com/example/demo/repository/MongoContextInitializer.kt rename to kotlin-co/src/test/kotlin/com/example/test/repository/MongoContextInitializer.kt index 967e292f4..85fb4a017 100644 --- a/kotlin-co/src/test/kotlin/com/example/demo/repository/MongoContextInitializer.kt +++ b/kotlin-co/src/test/kotlin/com/example/test/repository/MongoContextInitializer.kt @@ -1,4 +1,4 @@ -package com.example.demo.repository +package com.example.test.repository import org.slf4j.LoggerFactory import org.springframework.context.ApplicationContextInitializer diff --git a/kotlin-co/src/test/kotlin/com/example/demo/repository/PostRepositoryTest.kt b/kotlin-co/src/test/kotlin/com/example/test/repository/PostRepositoryTest.kt similarity index 89% rename from kotlin-co/src/test/kotlin/com/example/demo/repository/PostRepositoryTest.kt rename to kotlin-co/src/test/kotlin/com/example/test/repository/PostRepositoryTest.kt index 1044f9481..fa16dc8c4 100644 --- a/kotlin-co/src/test/kotlin/com/example/demo/repository/PostRepositoryTest.kt +++ b/kotlin-co/src/test/kotlin/com/example/test/repository/PostRepositoryTest.kt @@ -1,6 +1,8 @@ -package com.example.demo.repository +package com.example.test.repository import com.example.demo.domain.Post +import com.example.demo.repository.PostRepository +import com.example.test.repository.PostRepositoryTest.TestConfig import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import kotlinx.coroutines.reactor.awaitSingle @@ -15,7 +17,7 @@ import org.springframework.data.mongodb.core.ReactiveMongoTemplate import org.springframework.test.context.ContextConfiguration import org.springframework.test.context.junit.jupiter.SpringJUnitConfig -@SpringJUnitConfig(classes = [PostRepositoryTest.TestConfig::class]) +@SpringJUnitConfig(classes = [TestConfig::class]) @ContextConfiguration(initializers = [MongoContextInitializer::class]) class PostRepositoryTest { companion object { diff --git a/kotlin-co/src/test/kotlin/com/example/demo/web/PostControllerTest.kt b/kotlin-co/src/test/kotlin/com/example/test/web/PostControllerTest.kt similarity index 92% rename from kotlin-co/src/test/kotlin/com/example/demo/web/PostControllerTest.kt rename to kotlin-co/src/test/kotlin/com/example/test/web/PostControllerTest.kt index 0bb3669f8..488490bb2 100644 --- a/kotlin-co/src/test/kotlin/com/example/demo/web/PostControllerTest.kt +++ b/kotlin-co/src/test/kotlin/com/example/test/web/PostControllerTest.kt @@ -1,7 +1,9 @@ -package com.example.demo.web +package com.example.test.web import com.example.demo.domain.Post import com.example.demo.repository.PostRepository +import com.example.test.web.PostControllerTest.TestConfig +import com.example.demo.web.PostController import io.mockk.clearAllMocks import io.mockk.coEvery import io.mockk.coVerify @@ -19,7 +21,7 @@ import org.springframework.context.annotation.Primary import org.springframework.test.context.junit.jupiter.SpringJUnitConfig import org.springframework.test.web.reactive.server.WebTestClient import java.util.* -@SpringJUnitConfig(classes = [PostControllerTest.TestConfig::class]) +@SpringJUnitConfig(classes = [TestConfig::class]) class PostControllerTest { companion object { private val log = LoggerFactory.getLogger(PostControllerTest::class.java) diff --git a/kotlin-dsl/pom.xml b/kotlin-dsl/pom.xml index a711b3385..7a4827a1c 100644 --- a/kotlin-dsl/pom.xml +++ b/kotlin-dsl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/kotlin-routes/pom.xml b/kotlin-routes/pom.xml index 9bbefcbfc..eeb82be1d 100644 --- a/kotlin-routes/pom.xml +++ b/kotlin-routes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/kotlin/pom.xml b/kotlin/pom.xml index aea9c388c..0437754f6 100644 --- a/kotlin/pom.xml +++ b/kotlin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/multipart-data-mongo/pom.xml b/multipart-data-mongo/pom.xml index 3acb81890..dbf01e0f5 100644 --- a/multipart-data-mongo/pom.xml +++ b/multipart-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/multipart/pom.xml b/multipart/pom.xml index 0a3677980..289b0bf09 100644 --- a/multipart/pom.xml +++ b/multipart/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/mvc-freemarker/pom.xml b/mvc-freemarker/pom.xml index fe43a7543..30997e1c8 100644 --- a/mvc-freemarker/pom.xml +++ b/mvc-freemarker/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/mvc-mustache/pom.xml b/mvc-mustache/pom.xml index 8cabaea22..224f01524 100644 --- a/mvc-mustache/pom.xml +++ b/mvc-mustache/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/mvc-thymeleaf/pom.xml b/mvc-thymeleaf/pom.xml index ab8916c7e..c7f32f60c 100644 --- a/mvc-thymeleaf/pom.xml +++ b/mvc-thymeleaf/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/register-bean/pom.xml b/register-bean/pom.xml index 6c7a82543..b55b742f2 100644 --- a/register-bean/pom.xml +++ b/register-bean/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/restdocs/pom.xml b/restdocs/pom.xml index 5e0b05a63..fcfab4db1 100644 --- a/restdocs/pom.xml +++ b/restdocs/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/routes/pom.xml b/routes/pom.xml index b6d99440e..fbde259ef 100644 --- a/routes/pom.xml +++ b/routes/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/rxjava3/pom.xml b/rxjava3/pom.xml index c88651ce0..88139037e 100644 --- a/rxjava3/pom.xml +++ b/rxjava3/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/schedule/pom.xml b/schedule/pom.xml index 7efb44a7f..7ba81c2e0 100644 --- a/schedule/pom.xml +++ b/schedule/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/security-data-mongo/pom.xml b/security-data-mongo/pom.xml index 7b7ca862f..08360df77 100644 --- a/security-data-mongo/pom.xml +++ b/security-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/security-form/pom.xml b/security-form/pom.xml index cbacd4791..8d1e9fa5f 100644 --- a/security-form/pom.xml +++ b/security-form/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/security-method/pom.xml b/security-method/pom.xml index 9bf4788bb..4ccab5fc6 100644 --- a/security-method/pom.xml +++ b/security-method/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/security-user-properties/pom.xml b/security-user-properties/pom.xml index b10161f92..cd8d70214 100644 --- a/security-user-properties/pom.xml +++ b/security-user-properties/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/security/pom.xml b/security/pom.xml index 865486d5a..a65b9701c 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/session-data-mongo/pom.xml b/session-data-mongo/pom.xml index 3652c7dc0..59a26e093 100644 --- a/session-data-mongo/pom.xml +++ b/session-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/session-data-redis/pom.xml b/session-data-redis/pom.xml index a511d79bf..09a8fed21 100644 --- a/session-data-redis/pom.xml +++ b/session-data-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/session-header/pom.xml b/session-header/pom.xml index b2fe8fab4..ab1e73c2a 100644 --- a/session-header/pom.xml +++ b/session-header/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/session/pom.xml b/session/pom.xml index f303213de..b7ad43692 100644 --- a/session/pom.xml +++ b/session/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/smallrye-mutiny/pom.xml b/smallrye-mutiny/pom.xml index 389af46c6..d1f991ab2 100644 --- a/smallrye-mutiny/pom.xml +++ b/smallrye-mutiny/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/sse/pom.xml b/sse/pom.xml index 04d838e79..70a10229b 100644 --- a/sse/pom.xml +++ b/sse/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/vanilla-jetty/pom.xml b/vanilla-jetty/pom.xml index a2b973fa1..efc9c5654 100644 --- a/vanilla-jetty/pom.xml +++ b/vanilla-jetty/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/vanilla-reactor-netty2/pom.xml b/vanilla-reactor-netty2/pom.xml index 159c4fa65..b73803c88 100644 --- a/vanilla-reactor-netty2/pom.xml +++ b/vanilla-reactor-netty2/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/vanilla-tomcat/pom.xml b/vanilla-tomcat/pom.xml index a40031c97..b855bedd5 100644 --- a/vanilla-tomcat/pom.xml +++ b/vanilla-tomcat/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/vanilla-undertow/pom.xml b/vanilla-undertow/pom.xml index 9afe76b4a..61503dd7d 100644 --- a/vanilla-undertow/pom.xml +++ b/vanilla-undertow/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/vanilla/pom.xml b/vanilla/pom.xml index be18c65bb..9479ebf1f 100644 --- a/vanilla/pom.xml +++ b/vanilla/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/war/pom.xml b/war/pom.xml index 7643ba63c..9d9945daf 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/web-filter/pom.xml b/web-filter/pom.xml index 4a2b330ca..0f9dfccee 100644 --- a/web-filter/pom.xml +++ b/web-filter/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 diff --git a/websocket-reactor-netty2/pom.xml b/websocket-reactor-netty2/pom.xml index da2eb928a..416439ce0 100644 --- a/websocket-reactor-netty2/pom.xml +++ b/websocket-reactor-netty2/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 @@ -135,7 +135,7 @@ org.codehaus.mojo exec-maven-plugin - 3.3.0 + 3.3.1 com.example.demo.Application diff --git a/websocket/pom.xml b/websocket/pom.xml index 1d4872992..2e8ed816b 100644 --- a/websocket/pom.xml +++ b/websocket/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.1 @@ -137,7 +137,7 @@ org.codehaus.mojo exec-maven-plugin - 3.3.0 + 3.3.1 com.example.demo.Application