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 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.plugin.version}</version>
                 <configuration>
                     <useFile>false</useFile>
                     <includes>
@@ -186,7 +185,6 @@
         <logback.version>1.2.3</logback.version>
         <groovy.version>2.5.7</groovy.version>
         <assembly.plugin.version>3.1.0</assembly.plugin.version>
-        <surefire.plugin.version>2.20.1</surefire.plugin.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <groovy.compiler.version>3.3.0-01</groovy.compiler.version>
     </properties>
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 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.plugin.version}</version>
                 <configuration>
                     <useFile>false</useFile>
                     <includes>
@@ -128,7 +127,6 @@
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
-        <surefire.plugin.version>2.20.1</surefire.plugin.version>
     </properties>
 
 </project>
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 @@
     <properties>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     </properties>
 
 </project>
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 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <enableAssertions>true</enableAssertions>
                 </configuration>
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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <forkCount>0</forkCount>
                 </configuration>
@@ -79,7 +78,6 @@
         <target.version>9</target.version>
 
         <compiler.plugin.version>3.8.1</compiler.plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 
         <appmodules.version>1.0</appmodules.version>
 
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <joda-money.version>1.0.1</joda-money.version>
 
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 @@
             <!-- Skip normal test execution, we use gwt:test instead -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.plugin.version}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -115,7 +114,6 @@
 
         <gwt.version>2.8.2</gwt.version>
         <gwt.plugin.version>1.0-rc-8</gwt.plugin.version>
-        <surefire.plugin.version>2.17</surefire.plugin.version>
     </properties>
 
 </project>
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 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
 
     <build>
         <finalName>guava-collections-set</finalName>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
\ 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 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
         <guava.version>29.0-jre</guava.version>
     </properties>
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
     </properties>
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 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
         <jersey.version>2.25</jersey.version>
         <arquillian-glassfish.version>1.0.0.Final</arquillian-glassfish.version>
         <org.springframework.security.version>4.2.3.RELEASE</org.springframework.security.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <taglibs.standard.version>1.1.2</taglibs.standard.version>
         <com.sun.faces.jsf.version>2.2.14</com.sun.faces.jsf.version>
         <httpclient.version>4.5</httpclient.version>
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 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>${bytebuddy.version}</version>
+            <version>${byte-buddy.version}</version>
         </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
-            <version>${bytebuddy.version}</version>
+            <version>${byte-buddy.version}</version>
         </dependency>
 
         <!--Java Docker API Client -->
@@ -127,7 +127,6 @@
         <scala.version>2.11</scala.version>
         <typesafe-akka.version>2.5.11</typesafe-akka.version>
         <streamex.version>0.6.5</streamex.version>
-        <bytebuddy.version>1.7.1</bytebuddy.version>
         <docker.version>3.0.14</docker.version>
         <caffeine.version>2.5.5</caffeine.version>
         <findbugs.version>3.0.2</findbugs.version>
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 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
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 @@
         <module>flogger</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
     </properties>
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 @@
                     <artifactId>maven-source-plugin</artifactId>
                     <version>${source.plugin.version}</version>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire.plugin.version}</version>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -181,7 +177,6 @@
         <resources.plugin.version>3.1.0</resources.plugin.version>
         <site.plugin.version>3.9.1</site.plugin.version>
         <source.plugin.version>3.2.1</source.plugin.version>
-        <surefire.plugin.version>2.17</surefire.plugin.version>
     </properties>
 
 </project>
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 @@
         <log4jdbc.version>2.0.0</log4jdbc.version>
         <logback.version>1.2.3</logback.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <maven.surefire.version>2.22.2</maven.surefire.version>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <maven.version>3.8.1</maven.version>
         <mysql.version>8.0.19</mysql.version>
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 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>${byte-buddy.version}</version>
-        </dependency>
 
         <!-- test scoped -->
         <dependency>
@@ -97,7 +92,6 @@
 
         <!-- utilities -->
         <guava.version>21.0</guava.version>
-        <byte-buddy.version>1.10.16</byte-buddy.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c66adb9d50..78a6d8d329 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
                 <module>protobuffer</module>
 
                 <module>quarkus</module>
-                <!-- <module>quarkus-extension</module> --> <!-- Module broken, fixing in http://team.baeldung.com/browse/JAVA-4770 -->
+                <module>quarkus-extension</module>
 
                 <module>rabbitmq</module>
                 <!-- <module>raml</module> --> <!-- Not a maven project -->
@@ -992,7 +992,7 @@
                 <module>protobuffer</module>
 
                 <module>quarkus</module>
-                <!-- <module>quarkus-extension</module> --> <!-- Module broken, fixing in http://team.baeldung.com/browse/JAVA-4770 -->
+                <module>quarkus-extension</module>
 
                 <module>rabbitmq</module>
                 <!-- <module>raml</module> --> <!-- Not a maven project -->
@@ -1357,7 +1357,7 @@
         <hamcrest.version>2.2</hamcrest.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
         <mockito.version>3.3.0</mockito.version>
-        <byte-buddy.version>1.10.5</byte-buddy.version>
+        <byte-buddy.version>1.10.22</byte-buddy.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.30</org.slf4j.version>
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 @@
     <dependencies>
         <dependency>
             <groupId>com.baeldung.quarkus.liquibase</groupId>
-            <artifactId>quarkus-liquibase-runtime</artifactId>
+            <artifactId>runtime</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2</artifactId>
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">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.quarkus.liquibase</groupId>
     <artifactId>deployment</artifactId>
     <name>deployment</name>
 
@@ -30,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung.quarkus.liquibase</groupId>
-            <artifactId>quarkus-liquibase-runtime</artifactId>
+            <artifactId>runtime</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.quarkus.liquibase</groupId>
     <artifactId>runtime</artifactId>
     <name>runtime</name>
 
@@ -41,7 +42,7 @@
                             <goal>extension-descriptor</goal>
                         </goals>
                         <configuration>
-                            <deployment>${project.groupId}:quarkus-liquibase-deployment:${project.version}
+                            <deployment>${project.groupId}:deployment:${project.version}
                             </deployment>
                         </configuration>
                     </execution>
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 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
@@ -136,7 +135,6 @@
                     </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -157,7 +155,6 @@
     </profiles>
 
     <properties>
-        <surefire-plugin.version>2.22.0</surefire-plugin.version>
         <quarkus.version>1.7.0.Final</quarkus.version>
         <junit-jupiter.version>5.6.0</junit-jupiter.version>
     </properties>
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 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>1.0.1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
     </build>
 
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 @@
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 
 </project>
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 </project>
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 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>1.10.11</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
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 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy-dep</artifactId>
-            <version>${bytebuddy.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -63,8 +58,6 @@
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
         <postgresql.version>42.2.10</postgresql.version>
-        <bytebuddy.version>1.10.10</bytebuddy.version>
-
     </properties>
     
 </project>
\ 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 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-task-batch</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy-dep</artifactId>
-            <version>${bytebuddy.version}</version>
-        </dependency>
-        
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -70,7 +63,6 @@
 
     <properties>
         <start-class>com.baeldung.TaskDemo</start-class>
-        <bytebuddy.version>1.10.10</bytebuddy.version>
     </properties>
 
 </project>
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
-        <maven.surefire.version>2.22.1</maven.surefire.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
     </properties>
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 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
-        <maven.surefire.version>2.22.1</maven.surefire.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
         <guava.version>28.2-jre</guava.version>
diff --git a/spring-core-5/pom.xml b/spring-core-5/pom.xml
index 743002c137..05ee1c5f5d 100644
--- a/spring-core-5/pom.xml
+++ b/spring-core-5/pom.xml
@@ -25,22 +25,16 @@
             <version>${spring-boot-starter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <spring.version>5.3.3</spring.version>
         <spring-boot-starter.version>2.4.2</spring-boot-starter.version>
-        <maven.surefire.version>2.22.1</maven.surefire.version>
     </properties>
 
 </project>
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<ILoggingEvent> 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<ILoggingEvent> {
+    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<ILoggingEvent> search(String string) {
+        return this.list.stream()
+          .filter(event -> event.getMessage().toString().contains(string))
+          .collect(Collectors.toList());
+    }
+
+    public List<ILoggingEvent> 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<ILoggingEvent> 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<ILoggingEvent> 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());
+    }
+}
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 @@
         <activemq.broker.version>5.10.2</activemq.broker.version>
         <activemq.junit.version>5.13.1</activemq.junit.version>
         <mockito.version>2.21.0</mockito.version>
-        <byte-buddy.version>1.8.5</byte-buddy.version>
         <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
         <wildfly-ejb.version>8.2.1.Final</wildfly-ejb.version>
     </properties>
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 @@
             <artifactId>json</artifactId>
             <version>${json.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-logger-api</artifactId>
-            <version>${maven-surefire-plugin.version}</version>
-            <!-- to get around bug https://github.com/junit-team/junit5/issues/1367 -->
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -163,7 +155,6 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit-jupiter.version>5.4.2</junit-jupiter.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <junit.vintage.version>5.4.2</junit.vintage.version>
     </properties>
 
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 @@
         <junit-platform.version>1.2.0</junit-platform.version>
         <junit-jupiter.version>5.4.2</junit-jupiter.version>
         <spring.version>5.0.6.RELEASE</spring.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 
 </project>
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 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
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 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-engine</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -48,17 +48,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -79,7 +68,7 @@
 
     <properties>
         <junit.jupiter.version>5.2.0</junit.jupiter.version>
-        <junit.platform.version>1.2.0</junit.platform.version>
+        <junit-platform.version>1.2.0</junit-platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
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 @@
 
     <properties>
         <testcontainers.version>1.12.2</testcontainers.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 </project>
\ 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 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit-platform-surefire-provider.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -117,7 +106,7 @@
         <postgresql.version>42.2.6</postgresql.version>
         <selenium-remote-driver.version>3.141.59</selenium-remote-driver.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
+        <junit-platform.version>1.3.2</junit-platform.version>
     </properties>
 
 </project>
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 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <assertj-core.version>3.16.1</assertj-core.version>
         <commons-collections4.version>4.4</commons-collections4.version>
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 @@
         <!-- maven plugins -->
         <maven-jibx-plugin.version>1.3.1</maven-jibx-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
 </project>