From 19811fdef9036a2a56d9ccb92112432efdcd63aa Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sat, 19 Oct 2019 15:52:22 +0200 Subject: [PATCH 01/24] #BAEL-10229 Remove the spring-boot-dependencies --- ethereum/pom.xml | 31 ++------------ parent-boot-2/pom.xml | 2 +- parent-kotlin/pom.xml | 16 +------- spring-5-webflux/pom.xml | 16 -------- spring-batch/pom.xml | 27 +----------- spring-boot-admin/pom.xml | 22 ++-------- .../greeter-spring-boot-sample-app/pom.xml | 17 +------- spring-boot-kotlin/pom.xml | 14 ------- .../spring-boot-with-custom-parent/pom.xml | 17 +------- spring-ejb/pom.xml | 4 +- spring-ejb/spring-ejb-client/pom.xml | 12 ------ spring-jinq/pom.xml | 17 +------- .../load-testing-comparison/pom.xml | 41 ++----------------- 13 files changed, 23 insertions(+), 213 deletions(-) diff --git a/ethereum/pom.xml b/ethereum/pom.xml index 80e1c04676..1086b09833 100644 --- a/ethereum/pom.xml +++ b/ethereum/pom.xml @@ -7,37 +7,18 @@ ethereum - parent-spring-5 + parent-boot-1 com.baeldung 0.0.1-SNAPSHOT - ../parent-spring-5 + ../parent-boot-1 - - - org.springframework.boot - spring-boot-starter - ${spring.boot.version} - - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-tomcat - ${spring.boot.version} - - org.springframework spring-core - ${spring.version} org.springframework @@ -114,12 +95,6 @@ - - org.springframework.boot - spring-boot-starter-test - test - ${spring.boot.version} - org.springframework spring-context @@ -211,7 +186,7 @@ 8.5.4 1.5.0-RELEASE 3.3.1 - 1.5.6.RELEASE + 5.1.9.RELEASE 2.21.0 2.4.0 1.2.3 diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml index edc115d186..3d727a7467 100644 --- a/parent-boot-2/pom.xml +++ b/parent-boot-2/pom.xml @@ -78,6 +78,6 @@ 3.3.0 1.0.22.RELEASE - 2.1.7.RELEASE + 2.2.0.RELEASE diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml index bda5fb70e7..910f97c4d4 100644 --- a/parent-kotlin/pom.xml +++ b/parent-kotlin/pom.xml @@ -9,8 +9,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + parent-boot-2 + 0.0.1-SNAPSHOT @@ -40,18 +40,6 @@ - - - - org.springframework.boot - spring-boot-dependencies - 2.2.0.M4 - pom - import - - - - org.jetbrains.kotlin diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml index 6887f01753..485fd8f3bf 100644 --- a/spring-5-webflux/pom.xml +++ b/spring-5-webflux/pom.xml @@ -16,18 +16,6 @@ ../parent-boot-2 - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.springframework.boot @@ -97,8 +85,4 @@ https://repo.spring.io/milestone - - - 2.2.0.M3 - diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml index 48d3baeae3..c28d7d6c89 100644 --- a/spring-batch/pom.xml +++ b/spring-batch/pom.xml @@ -10,8 +10,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + parent-boot-2 + 0.0.1-SNAPSHOT @@ -75,43 +75,20 @@ ${opencsv.version} - - org.springframework.boot - spring-boot-starter-batch - ${spring.boot.version} - - org.hsqldb hsqldb - 2.5.0 runtime - - org.awaitility - awaitility - ${awaitility.version} - test - - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - test - - 5.2.0.RELEASE 4.2.0.RELEASE - 2.1.9.RELEASE 3.15.1 4.1 2.3.1 - 3.1.1 diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml index 1c933723e7..c553790359 100644 --- a/spring-boot-admin/pom.xml +++ b/spring-boot-admin/pom.xml @@ -8,8 +8,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + parent-boot-2 + 0.0.1-SNAPSHOT @@ -17,20 +17,4 @@ spring-boot-admin-client - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - - 2.1.8.RELEASE - - - \ No newline at end of file + diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml index 91cc41d669..1528853b0c 100644 --- a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml +++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml @@ -7,24 +7,12 @@ greeter-spring-boot-sample-app - spring-boot-custom-starter + parent-boot-1 com.baeldung 0.0.1-SNAPSHOT ../../spring-boot-custom-starter - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - com.baeldung @@ -51,8 +39,7 @@ - 1.5.15.RELEASE 0.0.1-SNAPSHOT - \ No newline at end of file + diff --git a/spring-boot-kotlin/pom.xml b/spring-boot-kotlin/pom.xml index 25508c52b9..c024f3fda1 100644 --- a/spring-boot-kotlin/pom.xml +++ b/spring-boot-kotlin/pom.xml @@ -30,19 +30,6 @@ - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - spring-snapshots @@ -160,7 +147,6 @@ 1.0.0.M7 1.0.0.BUILD-SNAPSHOT 1.2.1 - 2.2.0.M2 diff --git a/spring-boot-parent/spring-boot-with-custom-parent/pom.xml b/spring-boot-parent/spring-boot-with-custom-parent/pom.xml index de2946fbb2..a64ebc246a 100644 --- a/spring-boot-parent/spring-boot-with-custom-parent/pom.xml +++ b/spring-boot-parent/spring-boot-with-custom-parent/pom.xml @@ -10,22 +10,10 @@ com.baeldung - spring-boot-parent - 1.0.0-SNAPSHOT + parent-boot-2 + 0.0.1-SNAPSHOT - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.springframework.boot @@ -35,7 +23,6 @@ 1.8 - 2.1.5.RELEASE diff --git a/spring-ejb/pom.xml b/spring-ejb/pom.xml index 712bfc66ab..126bace9bd 100755 --- a/spring-ejb/pom.xml +++ b/spring-ejb/pom.xml @@ -10,8 +10,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + parent-boot-2 + 0.0.1-SNAPSHOT diff --git a/spring-ejb/spring-ejb-client/pom.xml b/spring-ejb/spring-ejb-client/pom.xml index e0348d5ae3..8d4cdd37e8 100644 --- a/spring-ejb/spring-ejb-client/pom.xml +++ b/spring-ejb/spring-ejb-client/pom.xml @@ -13,18 +13,6 @@ 1.0.0-SNAPSHOT - - - - org.springframework.boot - spring-boot-dependencies - 2.0.4.RELEASE - pom - import - - - - org.springframework.boot diff --git a/spring-jinq/pom.xml b/spring-jinq/pom.xml index f142b3ee2f..1661614fa0 100644 --- a/spring-jinq/pom.xml +++ b/spring-jinq/pom.xml @@ -9,8 +9,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + parent-boot-1 + 0.0.1-SNAPSHOT @@ -59,20 +59,7 @@ - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - 1.5.9.RELEASE 1.8.22 diff --git a/testing-modules/load-testing-comparison/pom.xml b/testing-modules/load-testing-comparison/pom.xml index 2c53657481..6e307a24ca 100644 --- a/testing-modules/load-testing-comparison/pom.xml +++ b/testing-modules/load-testing-comparison/pom.xml @@ -7,10 +7,10 @@ load-testing-comparison - parent-modules + parent-boot-2 com.baeldung - 1.0.0-SNAPSHOT - ../../pom.xml + 0.0.1-SNAPSHOT + ../../parent-boot-2 @@ -44,38 +44,6 @@ jackson-databind ${jackson.version} - - org.springframework.boot - spring-boot-starter - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - test - - - com.h2database - h2 - ${h2.version} - - - org.projectlombok - lombok - ${lombok.version} - compile - @@ -144,7 +112,6 @@ 2.2.1 5.0 3.11 - 2.0.5.RELEASE - \ No newline at end of file + From 1df0f4add5056424fb759a872b9da5d1fe9be160 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 16:50:07 +0200 Subject: [PATCH 02/24] #BAEL-10229 fix relativePath of parent-kotlin --- parent-kotlin/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml index 910f97c4d4..1ca786c32f 100644 --- a/parent-kotlin/pom.xml +++ b/parent-kotlin/pom.xml @@ -11,6 +11,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT + ../parent-boot-2 From 3b5e2bca6996b3a2674dfb3c8a4b3e7f03a2305d Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 16:54:07 +0200 Subject: [PATCH 03/24] #BAEL-10229 fix version of parent-kotlin --- parent-kotlin/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml index 1ca786c32f..1cacd31e13 100644 --- a/parent-kotlin/pom.xml +++ b/parent-kotlin/pom.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 parent-kotlin + 1.0.0-SNAPSHOT parent-kotlin pom Parent for all kotlin modules From e7af68c1165e2421cad90c80579253422424345d Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 17:06:07 +0200 Subject: [PATCH 04/24] #BAEL-10229 try to fix the build (mostly, missing relativePath) --- jta/pom.xml | 6 ------ libraries-testing/pom.xml | 13 ------------- .../spring-boot-persistence-h2/pom.xml | 5 ----- spring-boot-properties/pom.xml | 5 ----- spring-ejb/pom.xml | 1 + 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/jta/pom.xml b/jta/pom.xml index b7e39c66e1..1e86a0144c 100644 --- a/jta/pom.xml +++ b/jta/pom.xml @@ -30,12 +30,6 @@ spring-boot-starter - - org.springframework.boot - spring-boot-starter-test - test - - org.hsqldb hsqldb diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml index a2fbed31b2..86c9bd52e1 100644 --- a/libraries-testing/pom.xml +++ b/libraries-testing/pom.xml @@ -125,19 +125,6 @@ ${java-hamcrest.version} test - - - net.serenity-bdd - serenity-core - ${serenity.version} - test - - - org.asciidoctor - asciidoctorj - - - org.asciidoctor asciidoctor-maven-plugin diff --git a/persistence-modules/spring-boot-persistence-h2/pom.xml b/persistence-modules/spring-boot-persistence-h2/pom.xml index bd36a46144..30c727bfc8 100644 --- a/persistence-modules/spring-boot-persistence-h2/pom.xml +++ b/persistence-modules/spring-boot-persistence-h2/pom.xml @@ -26,11 +26,6 @@ com.h2database h2 - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/spring-boot-properties/pom.xml b/spring-boot-properties/pom.xml index ccb9204d96..5e65aadc28 100644 --- a/spring-boot-properties/pom.xml +++ b/spring-boot-properties/pom.xml @@ -32,11 +32,6 @@ org.springframework.cloud spring-cloud-starter - - org.springframework.boot - spring-boot-starter-test - test - com.google.guava guava diff --git a/spring-ejb/pom.xml b/spring-ejb/pom.xml index 126bace9bd..587d626cac 100755 --- a/spring-ejb/pom.xml +++ b/spring-ejb/pom.xml @@ -12,6 +12,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT + ../parent-boot-2 From 10c9a89f5e3767602bfc149b35911dccfcd5c6dd Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 17:14:35 +0200 Subject: [PATCH 05/24] #BAEL-10229 try and fix the build (Kotlin dependencies) --- spring-5-mvc/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml index be21db481a..86397f650d 100644 --- a/spring-5-mvc/pom.xml +++ b/spring-5-mvc/pom.xml @@ -46,14 +46,17 @@ org.jetbrains.kotlin kotlin-stdlib-jre8 + ${kotlin.version} org.jetbrains.kotlin kotlin-reflect + ${kotlin.version} com.fasterxml.jackson.module jackson-module-kotlin + ${jackson.version @@ -170,7 +173,8 @@ 2.9.0 - 1.1.2 + 2.9.9 + 1.2.71 com.baeldung.Spring5Application 4.5.8 From 1e92058f408ffb1a4ee525c3d3c0a6eed49f00e3 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 17:18:23 +0200 Subject: [PATCH 06/24] #BAEL-10229 try and fix the build (misspelled Jackson version) --- spring-5-mvc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml index 86397f650d..7417f39c21 100644 --- a/spring-5-mvc/pom.xml +++ b/spring-5-mvc/pom.xml @@ -56,7 +56,7 @@ com.fasterxml.jackson.module jackson-module-kotlin - ${jackson.version + ${jackson.version} From 8c643f007f2cb26b958dfc13f2742306e75185e8 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 17:37:56 +0200 Subject: [PATCH 07/24] #BAEL-10229 try and fix the build (spring-ejb version) --- spring-ejb/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-ejb/pom.xml b/spring-ejb/pom.xml index 587d626cac..12c1d029ff 100755 --- a/spring-ejb/pom.xml +++ b/spring-ejb/pom.xml @@ -4,6 +4,7 @@ 4.0.0 com.baeldung.spring.ejb spring-ejb + 1.0.0-SNAPSHOT spring-ejb pom Spring EJB Tutorial From 0ec65d7bb83f856ed4009c053f8bc1ca1a4e71c3 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 17:50:12 +0200 Subject: [PATCH 08/24] #BAEL-10229 try and fix the build (xml-apis version) --- spring-rest-full/pom.xml | 4 +++- spring-rest-query-language/pom.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-rest-full/pom.xml b/spring-rest-full/pom.xml index 5bc3a70ed5..a2736ba03c 100644 --- a/spring-rest-full/pom.xml +++ b/spring-rest-full/pom.xml @@ -125,6 +125,7 @@ xml-apis xml-apis + ${xml-apis.version} org.javassist @@ -284,6 +285,7 @@ 1.4.9 + 1.4.01 19.0 @@ -294,4 +296,4 @@ 1.1.3 - \ No newline at end of file + diff --git a/spring-rest-query-language/pom.xml b/spring-rest-query-language/pom.xml index 7ee658d8ba..293bac9479 100644 --- a/spring-rest-query-language/pom.xml +++ b/spring-rest-query-language/pom.xml @@ -144,6 +144,7 @@ xml-apis xml-apis + ${xml-apis.version} org.javassist @@ -350,6 +351,7 @@ 1.4.9 3.21.0-GA + 1.4.01 19.0 @@ -359,4 +361,4 @@ 1.1.3 - \ No newline at end of file + From 11ddb0d216f7ad5b182f7b2f942d52cf6a9e6c72 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 17:57:56 +0200 Subject: [PATCH 09/24] #BAEL-10229 Restore parent-kotlin's parent (parent-modules) instead of parent-boot-2 --- parent-kotlin/pom.xml | 92 ++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml index 1cacd31e13..84844dbb8b 100644 --- a/parent-kotlin/pom.xml +++ b/parent-kotlin/pom.xml @@ -1,60 +1,70 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 parent-kotlin - 1.0.0-SNAPSHOT parent-kotlin pom Parent for all kotlin modules com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + parent-modules + 1.0.0-SNAPSHOT - - - jcenter - http://jcenter.bintray.com - - - kotlin-ktor - https://dl.bintray.com/kotlin/ktor/ - - - kotlin-eap - http://dl.bintray.com/kotlin/kotlin-eap - - - spring-milestone - Spring Milestone Repository - http://repo.spring.io/milestone - - - - - - kotlin-eap - http://dl.bintray.com/kotlin/kotlin-eap - - - + + + jcenter + http://jcenter.bintray.com + + + kotlin-ktor + https://dl.bintray.com/kotlin/ktor/ + + + kotlin-eap + http://dl.bintray.com/kotlin/kotlin-eap + + + spring-milestone + Spring Milestone Repository + http://repo.spring.io/milestone + + + + + + kotlin-eap + http://dl.bintray.com/kotlin/kotlin-eap + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.2.0.M4 + pom + import + + + + org.jetbrains.kotlin kotlin-stdlib-jdk8 - - - org.jetbrains.kotlin - kotlin-stdlib - + + + org.jetbrains.kotlin + kotlin-stdlib + org.jetbrains.kotlin kotlin-reflect - + org.jetbrains.kotlinx @@ -103,9 +113,9 @@ ${project.basedir}/src/main/java ${java.version} - - -Xjvm-default=enable - + + -Xjvm-default=enable + From 3fb88700d5c24af5f6cd796a0f8e98cc112b2c80 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 18:06:17 +0200 Subject: [PATCH 10/24] #BAEL-10229 Restore parent-kotlin's parent (parent-modules) instead of parent-boot-2 --- spring-boot-kotlin/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-boot-kotlin/pom.xml b/spring-boot-kotlin/pom.xml index c024f3fda1..ccb1585a75 100644 --- a/spring-boot-kotlin/pom.xml +++ b/spring-boot-kotlin/pom.xml @@ -68,7 +68,6 @@ org.springframework.boot spring-boot-starter-webflux - ${spring-boot.version} com.fasterxml.jackson.module From 98e139531374da7d755aa90b9db3484605b8fca6 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Fri, 25 Oct 2019 18:17:49 +0200 Subject: [PATCH 11/24] #BAEL-10229 Fix the build (restore spring-boot-* dependencies of ethereum module) --- ethereum/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ethereum/pom.xml b/ethereum/pom.xml index d9712e53e0..e0666e49d8 100644 --- a/ethereum/pom.xml +++ b/ethereum/pom.xml @@ -13,6 +13,20 @@ + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + From f22fddfdb38300388b89f974658ed0f36205d3eb Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 09:59:48 +0100 Subject: [PATCH 12/24] #BAEL-10229 Fix the build (specify the Spring version in the ethereum module and restore Spring Boot version 2.1.7 in the spring-boot-persistence module) --- ethereum/pom.xml | 1 + persistence-modules/spring-boot-persistence/pom.xml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ethereum/pom.xml b/ethereum/pom.xml index e0666e49d8..f340c311a8 100644 --- a/ethereum/pom.xml +++ b/ethereum/pom.xml @@ -32,6 +32,7 @@ org.springframework spring-core + ${spring.version} org.springframework diff --git a/persistence-modules/spring-boot-persistence/pom.xml b/persistence-modules/spring-boot-persistence/pom.xml index c7cda07a1a..3ad925f16b 100644 --- a/persistence-modules/spring-boot-persistence/pom.xml +++ b/persistence-modules/spring-boot-persistence/pom.xml @@ -17,14 +17,17 @@ org.springframework.boot spring-boot-starter-web + ${spring-boot.version} org.springframework.boot spring-boot-starter-thymeleaf + ${spring-boot.version} org.springframework.boot spring-boot-starter-data-jpa + ${spring-boot.version} com.zaxxer @@ -35,6 +38,7 @@ org.springframework.boot spring-boot-starter-test + ${spring-boot.version} org.mockito @@ -99,6 +103,7 @@ 2.0.1.Final 10.13.1.1 2.3.4 + 2.1.7.RELEASE From 72a602c9d86af0f43ae4d9c28c05889a549c42d0 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 10:08:55 +0100 Subject: [PATCH 13/24] #BAEL-10229 Fix the build (restore the Ethereum module as it was because it's mixing different Spring and Spring Boot versions) --- parent-boot-1/pom.xml | 233 +++++++++++++++++++++++++++++++++++------- 1 file changed, 195 insertions(+), 38 deletions(-) diff --git a/parent-boot-1/pom.xml b/parent-boot-1/pom.xml index 8f1af24466..df4703f1db 100644 --- a/parent-boot-1/pom.xml +++ b/parent-boot-1/pom.xml @@ -1,61 +1,218 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - parent-boot-1 - 0.0.1-SNAPSHOT - parent-boot-1 - pom - Parent for all Spring Boot 1.x modules + com.baeldung.ethereum + ethereum + ethereum + parent-spring-5 com.baeldung - parent-modules - 1.0.0-SNAPSHOT + 0.0.1-SNAPSHOT + ../parent-spring-5 - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - + + - io.rest-assured - rest-assured - ${rest-assured.version} + org.springframework.boot + spring-boot-starter + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-tomcat + ${spring.boot.version} + + + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + + + org.ethereum + ethereumj-core + ${ethereumj-core.version} + + + org.web3j + core + ${web3j.core.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + + javax.servlet + jstl + ${jstl.version} + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + javax.servlet.jsp.jstl + jstl-api + ${jstl.version} + + + javax.servlet.jsp + javax.servlet.jsp-api + ${javax.servlet.jsp-api.version} + + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.springframework.boot spring-boot-starter-test test + ${spring.boot.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + test + + + + + org.mockito + mockito-core + ${mockito.version} + + + org.hamcrest + hamcrest-core + + + test + + + junit + junit + ${junit.version} + test + + + org.hamcrest + hamcrest-core + + + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + + + com.jayway.jsonpath + json-path + ${jsonpath.version} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - ${start-class} - - - - - + ethereum + + + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + + + org.apache.maven.plugins + maven-war-plugin + 3.0.0 + + src/main/webapp + false + + + + + + Ethereum + Ethereum + https://dl.bintray.com/ethereum/maven/ + + + - 3.1.0 - 1.5.22.RELEASE + 1.5.0-RELEASE + 3.3.1 + 1.5.6.RELEASE + 2.21.0 + 2.4.0 + 1.2.3 + 1.7.25 + 2.0.4.RELEASE - From 5d45197cbaab6fe64734e4050bcf78e525d019d1 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 10:17:16 +0100 Subject: [PATCH 14/24] Revert "#BAEL-10229 Fix the build (restore the Ethereum module as it was because it's mixing different Spring and Spring Boot versions)" This reverts commit 72a602c9 --- parent-boot-1/pom.xml | 233 +++++++----------------------------------- 1 file changed, 38 insertions(+), 195 deletions(-) diff --git a/parent-boot-1/pom.xml b/parent-boot-1/pom.xml index df4703f1db..8f1af24466 100644 --- a/parent-boot-1/pom.xml +++ b/parent-boot-1/pom.xml @@ -1,218 +1,61 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung.ethereum - ethereum - ethereum + parent-boot-1 + 0.0.1-SNAPSHOT + parent-boot-1 + pom + Parent for all Spring Boot 1.x modules - parent-spring-5 com.baeldung - 0.0.1-SNAPSHOT - ../parent-spring-5 + parent-modules + 1.0.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + - - - org.springframework.boot - spring-boot-starter - ${spring.boot.version} + io.rest-assured + rest-assured + ${rest-assured.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-tomcat - ${spring.boot.version} - - - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - - - org.ethereum - ethereumj-core - ${ethereumj-core.version} - - - org.web3j - core - ${web3j.core.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - - javax.servlet - jstl - ${jstl.version} - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - - - javax.servlet.jsp.jstl - jstl-api - ${jstl.version} - - - javax.servlet.jsp - javax.servlet.jsp-api - ${javax.servlet.jsp-api.version} - - - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.springframework.boot spring-boot-starter-test test - ${spring.boot.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - test - - - - - org.mockito - mockito-core - ${mockito.version} - - - org.hamcrest - hamcrest-core - - - test - - - junit - junit - ${junit.version} - test - - - org.hamcrest - hamcrest-core - - - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - com.jayway.jsonpath - json-path - ${jsonpath.version} - ethereum - - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - - - org.apache.maven.plugins - maven-war-plugin - 3.0.0 - - src/main/webapp - false - - - + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + ${start-class} + + + + + - - - Ethereum - Ethereum - https://dl.bintray.com/ethereum/maven/ - - - - 1.5.0-RELEASE - 3.3.1 - 1.5.6.RELEASE - 2.21.0 - 2.4.0 - 1.2.3 - 1.7.25 - 2.0.4.RELEASE + 3.1.0 + 1.5.22.RELEASE + From 5227348692bfef0ea6eef2223a80e343e583aea4 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 10:17:53 +0100 Subject: [PATCH 15/24] #BAEL-10229 Fix the build (restore the Ethereum module as it was because it's mixing different Spring and Spring Boot versions) --- ethereum/pom.xml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ethereum/pom.xml b/ethereum/pom.xml index f340c311a8..148909e787 100644 --- a/ethereum/pom.xml +++ b/ethereum/pom.xml @@ -1,31 +1,35 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.ethereum ethereum ethereum - parent-boot-1 + parent-spring-5 com.baeldung 0.0.1-SNAPSHOT - ../parent-boot-1 + ../parent-spring-5 + org.springframework.boot spring-boot-starter + ${spring.boot.version} org.springframework.boot spring-boot-starter-web + ${spring.boot.version} org.springframework.boot spring-boot-starter-tomcat + ${spring.boot.version} @@ -109,6 +113,12 @@ + + org.springframework.boot + spring-boot-starter-test + test + ${spring.boot.version} + org.springframework spring-context @@ -198,12 +208,11 @@ 1.5.0-RELEASE 3.3.1 - 5.1.9.RELEASE + 1.5.6.RELEASE 2.21.0 2.4.0 1.2.3 1.7.25 2.0.4.RELEASE - From 34ec8097350b8edd3f77be5465aedb00c426f1ac Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 22:12:26 +0100 Subject: [PATCH 16/24] #BAEL-10229 Restore Spring Boot version to 2.1.x in parent-boot-2 --- parent-boot-2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml index 3d727a7467..fe272b56a3 100644 --- a/parent-boot-2/pom.xml +++ b/parent-boot-2/pom.xml @@ -78,6 +78,6 @@ 3.3.0 1.0.22.RELEASE - 2.2.0.RELEASE + 2.1.9.RELEASE From 55a5731992f7bdbf03c13ae09f036081b8e306a9 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 22:38:49 +0100 Subject: [PATCH 17/24] #BAEL-10229 Fix Boot version of spring-5-webflux --- spring-5-webflux/pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml index 485fd8f3bf..91272593d3 100644 --- a/spring-5-webflux/pom.xml +++ b/spring-5-webflux/pom.xml @@ -16,6 +16,18 @@ ../parent-boot-2 + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.springframework.boot @@ -85,4 +97,8 @@ https://repo.spring.io/milestone + + + 2.2.0.RELEASE + From 961cc0e02bab203acaf674a6cc817c60a7ad51e5 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 22:57:15 +0100 Subject: [PATCH 18/24] #BAEL-10229 Fix spring-5-webflux usage of RSocketRequester --- .../com/baeldung/spring/rsocket/client/ClientConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-5-webflux/src/main/java/com/baeldung/spring/rsocket/client/ClientConfiguration.java b/spring-5-webflux/src/main/java/com/baeldung/spring/rsocket/client/ClientConfiguration.java index 7dd3591cd6..abfe2e7807 100644 --- a/spring-5-webflux/src/main/java/com/baeldung/spring/rsocket/client/ClientConfiguration.java +++ b/spring-5-webflux/src/main/java/com/baeldung/spring/rsocket/client/ClientConfiguration.java @@ -25,6 +25,6 @@ public class ClientConfiguration { @Bean RSocketRequester rSocketRequester(RSocketStrategies rSocketStrategies) { - return RSocketRequester.wrap(rSocket(), MimeTypeUtils.APPLICATION_JSON, rSocketStrategies); + return RSocketRequester.wrap(rSocket(), MimeTypeUtils.APPLICATION_JSON, MimeTypeUtils.APPLICATION_JSON, rSocketStrategies); } } From 6b8f82198997c270c3f2ddedf5f05595d7354790 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 23:22:42 +0100 Subject: [PATCH 19/24] #BAEL-10229 Fix spring-5-webflux usage of RSocketRequester --- ...MarketDataRestControllerIntegrationTest.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java index ff00d5ec24..538d74dc92 100644 --- a/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java +++ b/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java @@ -34,15 +34,12 @@ public class MarketDataRestControllerIntegrationTest { @Mock private RequestSpec requestSpec; - @Mock - private ResponseSpec responseSpec; - @Test public void whenInitiatesRequest_ThenGetsResponse() throws Exception { when(rSocketRequester.route("currentMarketData")).thenReturn(requestSpec); - when(requestSpec.data(any())).thenReturn(responseSpec); + when(requestSpec.data(any())).thenReturn(requestSpec); MarketData marketData = new MarketData("X", 1); - when(responseSpec.retrieveMono(MarketData.class)).thenReturn(Mono.just(marketData)); + when(requestSpec.retrieveMono(MarketData.class)).thenReturn(Mono.just(marketData)); testClient.get() .uri("/current/{stock}", "X") @@ -56,8 +53,8 @@ public class MarketDataRestControllerIntegrationTest { @Test public void whenInitiatesFireAndForget_ThenGetsNoResponse() throws Exception { when(rSocketRequester.route("collectMarketData")).thenReturn(requestSpec); - when(requestSpec.data(any())).thenReturn(responseSpec); - when(responseSpec.send()).thenReturn(Mono.empty()); + when(requestSpec.data(any())).thenReturn(requestSpec); + when(requestSpec.send()).thenReturn(Mono.empty()); testClient.get() .uri("/collect") @@ -70,10 +67,10 @@ public class MarketDataRestControllerIntegrationTest { @Test public void whenInitiatesRequest_ThenGetsStream() throws Exception { when(rSocketRequester.route("feedMarketData")).thenReturn(requestSpec); - when(requestSpec.data(any())).thenReturn(responseSpec); + when(requestSpec.data(any())).thenReturn(requestSpec); MarketData firstMarketData = new MarketData("X", 1); MarketData secondMarketData = new MarketData("X", 2); - when(responseSpec.retrieveFlux(MarketData.class)).thenReturn(Flux.just(firstMarketData, secondMarketData)); + when(requestSpec.retrieveFlux(MarketData.class)).thenReturn(Flux.just(firstMarketData, secondMarketData)); FluxExchangeResult result = testClient.get() .uri("/feed/{stock}", "X") @@ -89,4 +86,4 @@ public class MarketDataRestControllerIntegrationTest { .thenCancel() .verify(); } -} \ No newline at end of file +} From c65ae953066cc4afa23381173d6c45f6280c55f8 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 23:23:05 +0100 Subject: [PATCH 20/24] #BAEL-10229 Fix spring-5-webflux usage of RSocketRequester --- .../rsocket/client/MarketDataRestControllerIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java index 538d74dc92..d22832b0fb 100644 --- a/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java +++ b/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/client/MarketDataRestControllerIntegrationTest.java @@ -13,7 +13,6 @@ import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.messaging.rsocket.RSocketRequester; import org.springframework.messaging.rsocket.RSocketRequester.RequestSpec; -import org.springframework.messaging.rsocket.RSocketRequester.ResponseSpec; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.FluxExchangeResult; import org.springframework.test.web.reactive.server.WebTestClient; From 995d208d7389692d84c41f79d8ceed74f4cbb46a Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Sun, 27 Oct 2019 23:30:05 +0100 Subject: [PATCH 21/24] #BAEL-10229 Fix spring-5-webflux usage of RSocketRequester --- .../rsocket/server/MarketDataRSocketControllerLiveTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/server/MarketDataRSocketControllerLiveTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/server/MarketDataRSocketControllerLiveTest.java index dcf3b82730..40ddc732ac 100644 --- a/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/server/MarketDataRSocketControllerLiveTest.java +++ b/spring-5-webflux/src/test/java/com/baeldung/spring/rsocket/server/MarketDataRSocketControllerLiveTest.java @@ -92,7 +92,7 @@ public class MarketDataRSocketControllerLiveTest { @Bean @Lazy RSocketRequester rSocketRequester(RSocketStrategies rSocketStrategies) { - return RSocketRequester.wrap(rSocket(), MimeTypeUtils.APPLICATION_JSON, rSocketStrategies); + return RSocketRequester.wrap(rSocket(), MimeTypeUtils.APPLICATION_JSON, MimeTypeUtils.APPLICATION_JSON, rSocketStrategies); } } -} \ No newline at end of file +} From e6a3c4c631f18161eddb3cb83843eabd16d10c3d Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Mon, 28 Oct 2019 00:01:49 +0100 Subject: [PATCH 22/24] #BAEL-10229 Fix the build (spring-batch) --- spring-batch/pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml index c28d7d6c89..e6d7cee6f2 100644 --- a/spring-batch/pom.xml +++ b/spring-batch/pom.xml @@ -12,6 +12,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT + ../parent-boot-2 @@ -75,12 +76,23 @@ ${opencsv.version} + + org.springframework.boot + spring-boot-starter-batch + + org.hsqldb hsqldb runtime - + + + org.awaitility + awaitility + ${awaitility.version} + test + @@ -89,6 +101,7 @@ 3.15.1 4.1 2.3.1 + 3.1.1 From 98d4f930a533a32a22a7901617a6a31402cba8ba Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Mon, 28 Oct 2019 11:00:25 +0100 Subject: [PATCH 23/24] #BAEL-10229 Restore the spring-ejb pom as it's using a version of Spring Boot that is too different from the one in parent-boot-2. --- spring-ejb/pom.xml | 6 +++--- spring-ejb/spring-ejb-client/pom.xml | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/spring-ejb/pom.xml b/spring-ejb/pom.xml index 12c1d029ff..4422223c6f 100755 --- a/spring-ejb/pom.xml +++ b/spring-ejb/pom.xml @@ -11,9 +11,9 @@ com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + parent-modules + 1.0.0-SNAPSHOT + ../ diff --git a/spring-ejb/spring-ejb-client/pom.xml b/spring-ejb/spring-ejb-client/pom.xml index 8d4cdd37e8..2dd3120532 100644 --- a/spring-ejb/spring-ejb-client/pom.xml +++ b/spring-ejb/spring-ejb-client/pom.xml @@ -12,7 +12,19 @@ spring-ejb 1.0.0-SNAPSHOT - + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.springframework.boot @@ -49,9 +61,13 @@ org.springframework.boot spring-boot-maven-plugin - 2.0.4.RELEASE + ${spring-boot.version} + + 2.0.4.RELEASE + + From 096ce9d045e8179d4d44319e392ad7804e094de2 Mon Sep 17 00:00:00 2001 From: Alessio Stalla Date: Tue, 29 Oct 2019 00:02:53 +0100 Subject: [PATCH 24/24] #BAEL-10229 Restore removed dependencies from load-testing-comparison module. --- .../load-testing-comparison/pom.xml | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/testing-modules/load-testing-comparison/pom.xml b/testing-modules/load-testing-comparison/pom.xml index 6e307a24ca..8441eb3db7 100644 --- a/testing-modules/load-testing-comparison/pom.xml +++ b/testing-modules/load-testing-comparison/pom.xml @@ -34,16 +34,32 @@ scala-library ${scala.version} - - - - - com.fasterxml.jackson.core jackson-databind ${jackson.version} + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + + + org.projectlombok + lombok + compile + @@ -111,7 +127,6 @@ 3.2.2 2.2.1 5.0 - 3.11