From 089da70fb0c376f2cf7e4eff60f01ce137ad2db0 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 29 Mar 2021 15:22:10 +0200 Subject: [PATCH 1/6] JAVA-4931: Cleanup surefire config --- core-java-modules/pom.xml | 12 ------------ ddd-modules/pom.xml | 2 -- google-web-toolkit/pom.xml | 2 -- jee-7/pom.xml | 1 - performance-tests/pom.xml | 5 ----- spring-5-reactive-client/pom.xml | 15 --------------- spring-boot-modules/pom.xml | 11 +---------- spring-core-5/pom.xml | 11 ----------- testing-modules/junit-5-advanced/pom.xml | 10 ---------- testing-modules/junit-5-basics/pom.xml | 1 - testing-modules/junit-5/pom.xml | 4 ---- testing-modules/junit5-migration/pom.xml | 17 +++-------------- testing-modules/spring-testing-2/pom.xml | 1 - testing-modules/test-containers/pom.xml | 13 +------------ testing-modules/testing-assertions/pom.xml | 10 ---------- xml/pom.xml | 1 - 16 files changed, 5 insertions(+), 111 deletions(-) diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 7dc54bd907..4cfe7fe34c 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -148,18 +148,6 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - 2.22.2 5.6.2 diff --git a/ddd-modules/pom.xml b/ddd-modules/pom.xml index 4072d93f90..376dad89e5 100644 --- a/ddd-modules/pom.xml +++ b/ddd-modules/pom.xml @@ -66,7 +66,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} 0 @@ -79,7 +78,6 @@ 9 3.8.1 - 2.22.2 1.0 diff --git a/google-web-toolkit/pom.xml b/google-web-toolkit/pom.xml index cad15c8037..1ff5081343 100644 --- a/google-web-toolkit/pom.xml +++ b/google-web-toolkit/pom.xml @@ -97,7 +97,6 @@ maven-surefire-plugin - ${surefire.plugin.version} true @@ -115,7 +114,6 @@ 2.8.2 1.0-rc-8 - 2.17 diff --git a/jee-7/pom.xml b/jee-7/pom.xml index b0e10c1580..48814e6d2f 100644 --- a/jee-7/pom.xml +++ b/jee-7/pom.xml @@ -523,7 +523,6 @@ 2.25 1.0.0.Final 4.2.3.RELEASE - 2.21.0 1.1.2 2.2.14 4.5 diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml index e9d724aab0..c203f0a923 100644 --- a/performance-tests/pom.xml +++ b/performance-tests/pom.xml @@ -147,10 +147,6 @@ maven-source-plugin ${source.plugin.version} - - maven-surefire-plugin - ${surefire.plugin.version} - @@ -181,7 +177,6 @@ 3.1.0 3.9.1 3.2.1 - 2.17 diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml index 66861a3bb6..28f692a735 100644 --- a/spring-5-reactive-client/pom.xml +++ b/spring-5-reactive-client/pom.xml @@ -150,21 +150,6 @@ 1.8 - - maven-surefire-plugin - 2.22.0 - - - maven-surefire-plugin - 2.19.1 - - - org.junit.platform - junit-platform-surefire-provider - 1.0.1 - - - diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 4902368d7e..0288b03928 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -106,17 +106,8 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - - 5.6.2 + 2.22.2 diff --git a/spring-core-5/pom.xml b/spring-core-5/pom.xml index 743002c137..0ce6463181 100644 --- a/spring-core-5/pom.xml +++ b/spring-core-5/pom.xml @@ -27,20 +27,9 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - - - 5.3.3 2.4.2 - 2.22.1 diff --git a/testing-modules/junit-5-advanced/pom.xml b/testing-modules/junit-5-advanced/pom.xml index 4756223c3d..f53af9347f 100644 --- a/testing-modules/junit-5-advanced/pom.xml +++ b/testing-modules/junit-5-advanced/pom.xml @@ -35,18 +35,8 @@ - - - - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - 5.4.2 - 2.21.0 5.4.2 diff --git a/testing-modules/junit-5-basics/pom.xml b/testing-modules/junit-5-basics/pom.xml index b9c9635dc4..cdb0c367ce 100644 --- a/testing-modules/junit-5-basics/pom.xml +++ b/testing-modules/junit-5-basics/pom.xml @@ -152,7 +152,6 @@ 1.2.0 5.4.2 5.0.6.RELEASE - 2.21.0 diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml index 831fa97e12..ded3e9e26d 100644 --- a/testing-modules/junit-5/pom.xml +++ b/testing-modules/junit-5/pom.xml @@ -105,10 +105,6 @@ - - maven-surefire-plugin - ${maven-surefire-plugin.version} - org.codehaus.mojo exec-maven-plugin diff --git a/testing-modules/junit5-migration/pom.xml b/testing-modules/junit5-migration/pom.xml index 3b2663d81d..e3ef21f506 100644 --- a/testing-modules/junit5-migration/pom.xml +++ b/testing-modules/junit5-migration/pom.xml @@ -18,12 +18,12 @@ org.junit.platform junit-platform-engine - ${junit.platform.version} + ${junit-platform.version} org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -48,17 +48,6 @@ - - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.codehaus.mojo exec-maven-plugin @@ -79,7 +68,7 @@ 5.2.0 - 1.2.0 + 1.2.0 5.2.0 2.21.0 1.6.0 diff --git a/testing-modules/spring-testing-2/pom.xml b/testing-modules/spring-testing-2/pom.xml index 4686a20202..40b556732a 100644 --- a/testing-modules/spring-testing-2/pom.xml +++ b/testing-modules/spring-testing-2/pom.xml @@ -73,6 +73,5 @@ 1.12.2 - 2.21.0 \ No newline at end of file diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml index e83d3aff32..1946b7306f 100644 --- a/testing-modules/test-containers/pom.xml +++ b/testing-modules/test-containers/pom.xml @@ -80,17 +80,6 @@ - - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit-platform-surefire-provider.version} - - - org.codehaus.mojo exec-maven-plugin @@ -117,7 +106,7 @@ 42.2.6 3.141.59 2.22.2 - 1.3.2 + 1.3.2 diff --git a/testing-modules/testing-assertions/pom.xml b/testing-modules/testing-assertions/pom.xml index 4f0209a484..8b8536462d 100644 --- a/testing-modules/testing-assertions/pom.xml +++ b/testing-modules/testing-assertions/pom.xml @@ -50,16 +50,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.1 - - - - 3.16.1 4.4 diff --git a/xml/pom.xml b/xml/pom.xml index 49538bebca..d2fa5c0727 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -382,7 +382,6 @@ 1.3.1 3.8.0 - 2.22.2 From 0ae1bfedde54a50b2f6820a6a0ee63d1890e2f03 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 29 Mar 2021 18:57:35 +0200 Subject: [PATCH 2/6] JAVA-4931: Cleanup surefire config. Part 2. --- core-groovy-2/pom.xml | 2 -- core-groovy-collections/pom.xml | 2 -- core-java-modules/core-java-streams-3/pom.xml | 2 -- ddd-modules/mainapp/pom.xml | 1 - ddd/pom.xml | 9 --------- guava-modules/guava-collections-list/pom.xml | 8 -------- guava-modules/guava-collections-map/pom.xml | 8 -------- guava-modules/guava-collections-set/pom.xml | 8 -------- guava-modules/guava-collections/pom.xml | 8 -------- guava-modules/guava-io/pom.xml | 8 -------- guava-modules/guava-utilities/pom.xml | 8 -------- guava-modules/pom.xml | 11 +---------- jackson-modules/pom.xml | 10 ---------- jackson-simple/pom.xml | 8 -------- logging-modules/log-mdc/pom.xml | 8 -------- logging-modules/pom.xml | 10 ---------- persistence-modules/hibernate-libraries/pom.xml | 1 - quarkus/pom.xml | 3 --- spring-5/pom.xml | 1 - spring-core-3/pom.xml | 11 ----------- spring-core-4/pom.xml | 11 ----------- spring-web-modules/spring-mvc-basics-2/pom.xml | 9 --------- 22 files changed, 1 insertion(+), 146 deletions(-) diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml index b1bfa19771..207c090615 100644 --- a/core-groovy-2/pom.xml +++ b/core-groovy-2/pom.xml @@ -115,7 +115,6 @@ maven-surefire-plugin - ${surefire.plugin.version} false @@ -186,7 +185,6 @@ 1.2.3 2.5.7 3.1.0 - 2.20.1 3.8.0 3.3.0-01 diff --git a/core-groovy-collections/pom.xml b/core-groovy-collections/pom.xml index 125dfca4c1..770bcc57d6 100644 --- a/core-groovy-collections/pom.xml +++ b/core-groovy-collections/pom.xml @@ -101,7 +101,6 @@ maven-surefire-plugin - ${surefire.plugin.version} false @@ -128,7 +127,6 @@ 2.4.0 1.1-groovy-2.4 1.6 - 2.20.1 diff --git a/core-java-modules/core-java-streams-3/pom.xml b/core-java-modules/core-java-streams-3/pom.xml index cbb7366a7d..6597c999d8 100644 --- a/core-java-modules/core-java-streams-3/pom.xml +++ b/core-java-modules/core-java-streams-3/pom.xml @@ -49,8 +49,6 @@ 3.6.1 - - 2.22.1 diff --git a/ddd-modules/mainapp/pom.xml b/ddd-modules/mainapp/pom.xml index 59d2ad7d3a..6b913df979 100644 --- a/ddd-modules/mainapp/pom.xml +++ b/ddd-modules/mainapp/pom.xml @@ -29,7 +29,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 true diff --git a/ddd/pom.xml b/ddd/pom.xml index 7d03208802..41fccc7d5f 100644 --- a/ddd/pom.xml +++ b/ddd/pom.xml @@ -99,15 +99,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - 1.0.1 diff --git a/guava-modules/guava-collections-list/pom.xml b/guava-modules/guava-collections-list/pom.xml index cc52a5d48b..78a4aeb8ea 100644 --- a/guava-modules/guava-collections-list/pom.xml +++ b/guava-modules/guava-collections-list/pom.xml @@ -66,14 +66,6 @@ true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/guava-modules/guava-collections-map/pom.xml b/guava-modules/guava-collections-map/pom.xml index 82d634265b..f3f829f25f 100644 --- a/guava-modules/guava-collections-map/pom.xml +++ b/guava-modules/guava-collections-map/pom.xml @@ -38,14 +38,6 @@ true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/guava-modules/guava-collections-set/pom.xml b/guava-modules/guava-collections-set/pom.xml index 8f58148e41..0e53527aef 100644 --- a/guava-modules/guava-collections-set/pom.xml +++ b/guava-modules/guava-collections-set/pom.xml @@ -37,14 +37,6 @@ guava-collections-set - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml index 53c55dc655..90ed99bab7 100644 --- a/guava-modules/guava-collections/pom.xml +++ b/guava-modules/guava-collections/pom.xml @@ -71,14 +71,6 @@ true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/guava-modules/guava-io/pom.xml b/guava-modules/guava-io/pom.xml index 6b3280755c..b77bad575d 100644 --- a/guava-modules/guava-io/pom.xml +++ b/guava-modules/guava-io/pom.xml @@ -40,14 +40,6 @@ true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - \ No newline at end of file diff --git a/guava-modules/guava-utilities/pom.xml b/guava-modules/guava-utilities/pom.xml index 0496f5b2e8..fd9523c224 100644 --- a/guava-modules/guava-utilities/pom.xml +++ b/guava-modules/guava-utilities/pom.xml @@ -52,14 +52,6 @@ true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/guava-modules/pom.xml b/guava-modules/pom.xml index b625f9fd0f..4b84f616f3 100644 --- a/guava-modules/pom.xml +++ b/guava-modules/pom.xml @@ -46,17 +46,8 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - - + 2.22.2 5.6.2 29.0-jre diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml index 70b10e9554..819f11c110 100644 --- a/jackson-modules/pom.xml +++ b/jackson-modules/pom.xml @@ -50,16 +50,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - - 5.6.2 diff --git a/jackson-simple/pom.xml b/jackson-simple/pom.xml index 761dca6afa..8dfd949166 100644 --- a/jackson-simple/pom.xml +++ b/jackson-simple/pom.xml @@ -51,14 +51,6 @@ true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml index 5e2155fde9..a7cfd3faa8 100644 --- a/logging-modules/log-mdc/pom.xml +++ b/logging-modules/log-mdc/pom.xml @@ -95,14 +95,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - diff --git a/logging-modules/pom.xml b/logging-modules/pom.xml index b5354c7c23..85d5c18219 100644 --- a/logging-modules/pom.xml +++ b/logging-modules/pom.xml @@ -21,16 +21,6 @@ flogger - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - - 5.6.2 diff --git a/persistence-modules/hibernate-libraries/pom.xml b/persistence-modules/hibernate-libraries/pom.xml index f67309cf43..053ad05167 100644 --- a/persistence-modules/hibernate-libraries/pom.xml +++ b/persistence-modules/hibernate-libraries/pom.xml @@ -175,7 +175,6 @@ 2.0.0 1.2.3 3.0.2 - 2.22.2 3.8.1 3.8.1 8.0.19 diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 9c14afca3c..9826fd1034 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -97,7 +97,6 @@ maven-surefire-plugin - ${surefire-plugin.version} 1 true @@ -136,7 +135,6 @@ maven-failsafe-plugin - ${surefire-plugin.version} @@ -157,7 +155,6 @@ - 2.22.0 1.7.0.Final 5.6.0 diff --git a/spring-5/pom.xml b/spring-5/pom.xml index e368bcacba..082b1f8a87 100644 --- a/spring-5/pom.xml +++ b/spring-5/pom.xml @@ -142,7 +142,6 @@ 1.5.6 4.1 ${project.build.directory}/generated-snippets - 2.21.0 diff --git a/spring-core-3/pom.xml b/spring-core-3/pom.xml index 205259e8e4..618800529c 100644 --- a/spring-core-3/pom.xml +++ b/spring-core-3/pom.xml @@ -69,18 +69,7 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - - - - 2.22.1 1.3.2 2.2.2.RELEASE diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml index df0b90fef2..d2e948c475 100644 --- a/spring-core-4/pom.xml +++ b/spring-core-4/pom.xml @@ -87,18 +87,7 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - - - - 2.22.1 1.3.2 2.2.2.RELEASE 28.2-jre diff --git a/spring-web-modules/spring-mvc-basics-2/pom.xml b/spring-web-modules/spring-mvc-basics-2/pom.xml index 0b4515994b..adc42d8db8 100644 --- a/spring-web-modules/spring-mvc-basics-2/pom.xml +++ b/spring-web-modules/spring-mvc-basics-2/pom.xml @@ -131,14 +131,6 @@ json ${json.version} - - org.apache.maven.surefire - surefire-logger-api - ${maven-surefire-plugin.version} - - test - true - @@ -163,7 +155,6 @@ 1.8 1.8 - 2.21.0 2.3.2-b02 4.0.0 6.0.10.Final From f93bb51d5c1f05c05b24b573933f2fd3870d2b5c Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 29 Mar 2021 22:23:40 +0200 Subject: [PATCH 3/6] JAVA-3593: Upgrade byte-buddy to 1.10.22 in the main pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c66adb9d50..d17ac5163e 100644 --- a/pom.xml +++ b/pom.xml @@ -1357,7 +1357,7 @@ 2.2 1.3 3.3.0 - 1.10.5 + 1.10.22 1.7.30 From f17aec83953d628c1ff56b612239b628a1bd7a41 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 29 Mar 2021 23:11:42 +0200 Subject: [PATCH 4/6] JAVA-3593: Use byte-buddy version inherited from the main pom.xml --- libraries-5/pom.xml | 5 ++--- persistence-modules/spring-jpa-2/pom.xml | 6 ------ spring-caching/pom.xml | 5 ----- spring-cloud/spring-cloud-connectors-heroku/pom.xml | 7 ------- .../spring-cloud-task/springcloudtaskbatch/pom.xml | 8 -------- spring-ejb/ejb-beans/pom.xml | 1 - 6 files changed, 2 insertions(+), 30 deletions(-) diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml index 80b39b590e..c0de1af822 100644 --- a/libraries-5/pom.xml +++ b/libraries-5/pom.xml @@ -55,12 +55,12 @@ net.bytebuddy byte-buddy - ${bytebuddy.version} + ${byte-buddy.version} net.bytebuddy byte-buddy-agent - ${bytebuddy.version} + ${byte-buddy.version} @@ -127,7 +127,6 @@ 2.11 2.5.11 0.6.5 - 1.7.1 3.0.14 2.5.5 3.0.2 diff --git a/persistence-modules/spring-jpa-2/pom.xml b/persistence-modules/spring-jpa-2/pom.xml index 7770c0e045..52067f3e5e 100644 --- a/persistence-modules/spring-jpa-2/pom.xml +++ b/persistence-modules/spring-jpa-2/pom.xml @@ -66,11 +66,6 @@ guava ${guava.version} - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - @@ -97,7 +92,6 @@ 21.0 - 1.10.16 \ No newline at end of file diff --git a/spring-caching/pom.xml b/spring-caching/pom.xml index 9fa9ba0333..c620072604 100644 --- a/spring-caching/pom.xml +++ b/spring-caching/pom.xml @@ -71,11 +71,6 @@ org.springframework.boot spring-boot-starter-data-jpa - - net.bytebuddy - byte-buddy - 1.10.11 - org.springframework.data spring-data-commons diff --git a/spring-cloud/spring-cloud-connectors-heroku/pom.xml b/spring-cloud/spring-cloud-connectors-heroku/pom.xml index e71e1350a2..d318aa3c64 100644 --- a/spring-cloud/spring-cloud-connectors-heroku/pom.xml +++ b/spring-cloud/spring-cloud-connectors-heroku/pom.xml @@ -35,11 +35,6 @@ org.postgresql postgresql - - net.bytebuddy - byte-buddy-dep - ${bytebuddy.version} - com.h2database h2 @@ -63,8 +58,6 @@ 2.2.6.RELEASE Hoxton.SR4 42.2.10 - 1.10.10 - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml b/spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml index 4e6b8b8b6c..fd10322efb 100644 --- a/spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml +++ b/spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml @@ -45,13 +45,6 @@ org.springframework.cloud spring-cloud-task-batch - - - net.bytebuddy - byte-buddy-dep - ${bytebuddy.version} - - com.h2database h2 @@ -70,7 +63,6 @@ com.baeldung.TaskDemo - 1.10.10 diff --git a/spring-ejb/ejb-beans/pom.xml b/spring-ejb/ejb-beans/pom.xml index d7f875acd0..8f2bf31ee4 100644 --- a/spring-ejb/ejb-beans/pom.xml +++ b/spring-ejb/ejb-beans/pom.xml @@ -184,7 +184,6 @@ 5.10.2 5.13.1 2.21.0 - 1.8.5 2.8 8.2.1.Final From 023fec286b92523b13bb82d85d31afc528c0c73a Mon Sep 17 00:00:00 2001 From: mikr Date: Tue, 30 Mar 2021 09:42:54 +0200 Subject: [PATCH 5/6] JAVA-4770 Fix Invalid Dependency in the quarkus-app Module --- pom.xml | 4 ++-- quarkus-extension/quarkus-app/pom.xml | 3 ++- quarkus-extension/quarkus-liquibase/deployment/pom.xml | 3 ++- quarkus-extension/quarkus-liquibase/runtime/pom.xml | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f202430ccf..4029543ab3 100644 --- a/pom.xml +++ b/pom.xml @@ -531,7 +531,7 @@ protobuffer quarkus - + quarkus-extension rabbitmq @@ -992,7 +992,7 @@ protobuffer quarkus - + quarkus-extension rabbitmq diff --git a/quarkus-extension/quarkus-app/pom.xml b/quarkus-extension/quarkus-app/pom.xml index 6d3f4c7c28..4c9e9c3cc7 100644 --- a/quarkus-extension/quarkus-app/pom.xml +++ b/quarkus-extension/quarkus-app/pom.xml @@ -27,9 +27,10 @@ com.baeldung.quarkus.liquibase - quarkus-liquibase-runtime + runtime ${project.version} + io.quarkus quarkus-jdbc-h2 diff --git a/quarkus-extension/quarkus-liquibase/deployment/pom.xml b/quarkus-extension/quarkus-liquibase/deployment/pom.xml index d7f1f995ff..42d3ca2810 100644 --- a/quarkus-extension/quarkus-liquibase/deployment/pom.xml +++ b/quarkus-extension/quarkus-liquibase/deployment/pom.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.quarkus.liquibase deployment deployment @@ -30,7 +31,7 @@ com.baeldung.quarkus.liquibase - quarkus-liquibase-runtime + runtime ${project.version} diff --git a/quarkus-extension/quarkus-liquibase/runtime/pom.xml b/quarkus-extension/quarkus-liquibase/runtime/pom.xml index 5d3b05ef92..0250d34711 100644 --- a/quarkus-extension/quarkus-liquibase/runtime/pom.xml +++ b/quarkus-extension/quarkus-liquibase/runtime/pom.xml @@ -2,6 +2,7 @@ 4.0.0 + com.baeldung.quarkus.liquibase runtime runtime @@ -41,7 +42,7 @@ extension-descriptor - ${project.groupId}:quarkus-liquibase-deployment:${project.version} + ${project.groupId}:deployment:${project.version} From ac33d1d43819b1f899a3900a4268279e2734d951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20G=C5=82=C3=B3wka?= Date: Tue, 30 Mar 2021 17:53:35 +0200 Subject: [PATCH 6/6] =?UTF-8?q?BAEL-4290:=20tracking=20down=20cause=20of?= =?UTF-8?q?=20Spring's=20=E2=80=9Cnot=20eligible=20for=20auto-proxying?= =?UTF-8?q?=E2=80=9D=20(#10593)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spring-core-5/pom.xml | 5 ++ .../component/autoproxying/DataCache.java | 12 +++++ ...ligibleForAutoProxyRandomIntProcessor.java | 33 +++++++++++++ ...ligibleForAutoProxyRandomIntProcessor.java | 31 ++++++++++++ .../component/autoproxying/RandomInt.java | 11 +++++ .../autoproxying/RandomIntGenerator.java | 21 ++++++++ ...ligibleForAutoProxyingIntegrationTest.java | 49 +++++++++++++++++++ .../autoproxying/MemoryLogAppender.java | 48 ++++++++++++++++++ ...ligibleForAutoProxyingIntegrationTest.java | 48 ++++++++++++++++++ 9 files changed, 258 insertions(+) create mode 100644 spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java create mode 100644 spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java create mode 100644 spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java create mode 100644 spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java create mode 100644 spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java create mode 100644 spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java create mode 100644 spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java create mode 100644 spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java diff --git a/spring-core-5/pom.xml b/spring-core-5/pom.xml index 743002c137..c404a5cfdb 100644 --- a/spring-core-5/pom.xml +++ b/spring-core-5/pom.xml @@ -25,6 +25,11 @@ ${spring-boot-starter.version} test + + org.projectlombok + lombok + ${lombok.version} + diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java new file mode 100644 index 0000000000..bc92d0a1d9 --- /dev/null +++ b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java @@ -0,0 +1,12 @@ +package com.baeldung.component.autoproxying; + +import lombok.Getter; +import org.springframework.stereotype.Component; + +@Getter +@Component +public class DataCache { + @RandomInt(min = 2, max = 10) + private int group; + private String name; +} diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java new file mode 100644 index 0000000000..1fa9aa376f --- /dev/null +++ b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java @@ -0,0 +1,33 @@ +package com.baeldung.component.autoproxying; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.context.annotation.Lazy; +import org.springframework.util.ReflectionUtils; + +import java.lang.reflect.Field; + +public class EligibleForAutoProxyRandomIntProcessor implements BeanPostProcessor { + private final RandomIntGenerator randomIntGenerator; + + @Lazy + public EligibleForAutoProxyRandomIntProcessor(RandomIntGenerator randomIntGenerator) { + this.randomIntGenerator = randomIntGenerator; + } + + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + Field[] fields = bean.getClass().getDeclaredFields(); + for (Field field : fields) { + RandomInt injectRandomInt = field.getAnnotation(RandomInt.class); + if (injectRandomInt != null) { + int min = injectRandomInt.min(); + int max = injectRandomInt.max(); + int randomValue = randomIntGenerator.generate(min, max); + field.setAccessible(true); + ReflectionUtils.setField(field, bean, randomValue); + } + } + return bean; + } +} diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java new file mode 100644 index 0000000000..d02780011c --- /dev/null +++ b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java @@ -0,0 +1,31 @@ +package com.baeldung.component.autoproxying; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.util.ReflectionUtils; + +import java.lang.reflect.Field; + +public class NotEligibleForAutoProxyRandomIntProcessor implements BeanPostProcessor { + private final RandomIntGenerator randomIntGenerator; + + public NotEligibleForAutoProxyRandomIntProcessor(RandomIntGenerator randomIntGenerator) { + this.randomIntGenerator = randomIntGenerator; + } + + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + Field[] fields = bean.getClass().getDeclaredFields(); + for (Field field : fields) { + RandomInt injectRandomInt = field.getAnnotation(RandomInt.class); + if (injectRandomInt != null) { + int min = injectRandomInt.min(); + int max = injectRandomInt.max(); + int randomValue = randomIntGenerator.generate(min, max); + field.setAccessible(true); + ReflectionUtils.setField(field, bean, randomValue); + } + } + return bean; + } +} diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java new file mode 100644 index 0000000000..c7881af4af --- /dev/null +++ b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java @@ -0,0 +1,11 @@ +package com.baeldung.component.autoproxying; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface RandomInt { + int min(); + + int max(); +} diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java new file mode 100644 index 0000000000..d0d44c3333 --- /dev/null +++ b/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java @@ -0,0 +1,21 @@ +package com.baeldung.component.autoproxying; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.Random; + +@Slf4j +@Component +public class RandomIntGenerator { + private final Random random = new Random(); + private final DataCache dataCache; + + public RandomIntGenerator(DataCache dataCache) { + this.dataCache = dataCache; + } + + public int generate(int min, int max) { + return random.nextInt(max - min) + min; + } +} diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java b/spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java new file mode 100644 index 0000000000..4af700813a --- /dev/null +++ b/spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java @@ -0,0 +1,49 @@ +package com.baeldung.component.autoproxying; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.ILoggingEvent; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {EligibleForAutoProxyRandomIntProcessor.class, DataCache.class, RandomIntGenerator.class}) +public class EligibleForAutoProxyingIntegrationTest { + private static MemoryLogAppender memoryAppender; + + private EligibleForAutoProxyRandomIntProcessor randomIntProcessor; + + @Autowired + private DataCache dataCache; + + @BeforeClass + public static void setup() { + memoryAppender = new MemoryLogAppender(); + memoryAppender.setContext((LoggerContext) LoggerFactory.getILoggerFactory()); + + Logger logger = (Logger) LoggerFactory.getLogger("org.springframework.context"); + logger.setLevel(Level.INFO); + logger.addAppender(memoryAppender); + memoryAppender.start(); + } + + @Test + public void givenAutowireInBeanPostProcessor_whenSpringContextInitialize_thenNotEligibleLogShouldShowAndGroupFieldPopulated() { + List notEligibleEvents = memoryAppender.search("Bean 'randomIntGenerator' of type [com.baeldung.autoproxying.RandomIntGenerator] " + + "is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)"); + + assertEquals(0, notEligibleEvents.size()); + assertNotEquals(0, dataCache.getGroup()); + } +} diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java b/spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java new file mode 100644 index 0000000000..fad35a7c2b --- /dev/null +++ b/spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java @@ -0,0 +1,48 @@ +package com.baeldung.component.autoproxying; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +public class MemoryLogAppender extends ListAppender { + public void reset() { + this.list.clear(); + } + + public boolean contains(String string, Level level) { + return this.list.stream() + .anyMatch(event -> event.getMessage().toString().contains(string) + && event.getLevel().equals(level)); + } + + public int countEventsForLogger(String loggerName) { + return (int) this.list.stream() + .filter(event -> event.getLoggerName().contains(loggerName)) + .count(); + } + + public List search(String string) { + return this.list.stream() + .filter(event -> event.getMessage().toString().contains(string)) + .collect(Collectors.toList()); + } + + public List search(String string, Level level) { + return this.list.stream() + .filter(event -> event.getMessage().toString().contains(string) + && event.getLevel().equals(level)) + .collect(Collectors.toList()); + } + + public int getSize() { + return this.list.size(); + } + + public List getLoggedEvents() { + return Collections.unmodifiableList(this.list); + } +} diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java b/spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java new file mode 100644 index 0000000000..9434f77a30 --- /dev/null +++ b/spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java @@ -0,0 +1,48 @@ +package com.baeldung.component.autoproxying; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.ILoggingEvent; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {NotEligibleForAutoProxyRandomIntProcessor.class, DataCache.class, RandomIntGenerator.class}) +public class NotEligibleForAutoProxyingIntegrationTest { + private static MemoryLogAppender memoryAppender; + + private NotEligibleForAutoProxyRandomIntProcessor proxyRandomIntProcessor; + + @Autowired + private DataCache dataCache; + + @BeforeClass + public static void setup() { + memoryAppender = new MemoryLogAppender(); + memoryAppender.setContext((LoggerContext) LoggerFactory.getILoggerFactory()); + + Logger logger = (Logger) LoggerFactory.getLogger("org.springframework.context"); + logger.setLevel(Level.INFO); + logger.addAppender(memoryAppender); + memoryAppender.start(); + } + + @Test + public void givenAutowireInBeanPostProcessor_whenSpringContextInitialize_thenNotEligibleLogShouldShowAndGroupFieldNotPopulated() { + List notEligibleEvents = memoryAppender.search("Bean 'randomIntGenerator' of type [com.baeldung.autoproxying.RandomIntGenerator] " + + "is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)"); + + assertEquals(1, notEligibleEvents.size()); + assertEquals(0, dataCache.getGroup()); + } +}