diff --git a/airline/client/axis1/pom.xml b/airline/client/axis1/pom.xml
index 9a4df3f..39a322b 100644
--- a/airline/client/axis1/pom.xml
+++ b/airline/client/axis1/pom.xml
@@ -19,7 +19,8 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<axis.version>1.4</axis.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
+
 		<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -39,13 +40,6 @@
 			<version>${axis.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/airline/client/jax-ws/pom.xml b/airline/client/jax-ws/pom.xml
index 23ee83a..d7f8e31 100644
--- a/airline/client/jax-ws/pom.xml
+++ b/airline/client/jax-ws/pom.xml
@@ -19,7 +19,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<jax-ws.version>2.1.7</jax-ws.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<spring-ws.version>2.1.4.RELEASE</spring-ws.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
@@ -34,13 +34,6 @@
 			<version>${spring-ws.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/airline/client/jms/pom.xml b/airline/client/jms/pom.xml
index 985c24e..28d0ccf 100644
--- a/airline/client/jms/pom.xml
+++ b/airline/client/jms/pom.xml
@@ -20,7 +20,7 @@
 		<activemq.version>4.1.2</activemq.version>
 		<java.version>1.8</java.version>
 		<jms.version>1.1</jms.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -44,13 +44,6 @@
 			<version>${jms.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-core</artifactId>
diff --git a/airline/client/saaj/pom.xml b/airline/client/saaj/pom.xml
index eb56b3a..b2b34a5 100644
--- a/airline/client/saaj/pom.xml
+++ b/airline/client/saaj/pom.xml
@@ -18,6 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<xws.version>3.0</xws.version>
 	</properties>
 
diff --git a/airline/client/spring-ws/pom.xml b/airline/client/spring-ws/pom.xml
index eaeef37..7e3ac10 100644
--- a/airline/client/spring-ws/pom.xml
+++ b/airline/client/spring-ws/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+		 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>
 
 	<parent>
@@ -19,7 +19,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<jax-ws.version>2.1.7</jax-ws.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<xmlbeans.version>2.4.0</xmlbeans.version>
 		<xws.version>3.0</xws.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
@@ -67,13 +67,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-test</artifactId>
diff --git a/airline/server/pom.xml b/airline/server/pom.xml
index 3e85dc1..d73bfa3 100644
--- a/airline/server/pom.xml
+++ b/airline/server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.5.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,7 +19,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<joda-time.version>2.10.6</joda-time.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -141,13 +141,6 @@
 			<version>${joda-time.version}</version>
 		</dependency>
 
-		<!--		<dependency>-->
-		<!--			<groupId>log4j</groupId>-->
-		<!--			<artifactId>log4j</artifactId>-->
-		<!--			<version>${log4j.version}</version>-->
-		<!--			<scope>runtime</scope>-->
-		<!--		</dependency>-->
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
diff --git a/echo/client/saaj/pom.xml b/echo/client/saaj/pom.xml
index 7a4fcea..271a256 100644
--- a/echo/client/saaj/pom.xml
+++ b/echo/client/saaj/pom.xml
@@ -17,6 +17,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<log4j2.version>2.15.0</log4j2.version>
 	</properties>
 
 	<dependencies>
@@ -32,6 +33,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/echo/client/spring-ws/pom.xml b/echo/client/spring-ws/pom.xml
index 4d56172..7c96db0 100644
--- a/echo/client/spring-ws/pom.xml
+++ b/echo/client/spring-ws/pom.xml
@@ -18,6 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<log4j2.version>2.15.0</log4j2.version>
 	</properties>
 
 	<dependencies>
@@ -33,6 +34,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/echo/server/pom.xml b/echo/server/pom.xml
index e35301b..26d5b16 100644
--- a/echo/server/pom.xml
+++ b/echo/server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.5.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,7 +19,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<joda-time.version>2.10.6</joda-time.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
diff --git a/mtom/client/spring-ws/pom.xml b/mtom/client/spring-ws/pom.xml
index 0f38c57..1c513c5 100644
--- a/mtom/client/spring-ws/pom.xml
+++ b/mtom/client/spring-ws/pom.xml
@@ -18,6 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<log4j2.version>2.15.0</log4j2.version>
 	</properties>
 
 	<dependencies>
@@ -33,6 +34,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/mtom/server/pom.xml b/mtom/server/pom.xml
index 7298b3a..6dac636 100644
--- a/mtom/server/pom.xml
+++ b/mtom/server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.5.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,7 +19,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<joda-time.version>2.10.6</joda-time.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<xmlschema.version>2.0.2</xmlschema.version>
 	</properties>
 
diff --git a/pom.xml b/pom.xml
index 8872957..294da23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.5.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -69,15 +69,13 @@
 					<groupId>org.junit.vintage</groupId>
 					<artifactId>junit-vintage-engine</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/tutorial/pom.xml b/tutorial/pom.xml
index 6c051da..713792f 100644
--- a/tutorial/pom.xml
+++ b/tutorial/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.5.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -21,7 +21,7 @@
 		<jaxen.version>1.1.4</jaxen.version>
 		<jdom.version>2.0.1</jdom.version>
 		<joda-time.version>2.10.6</joda-time.version>
-		<log4j.version>1.2.16</log4j.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
diff --git a/weather/pom.xml b/weather/pom.xml
index c6368a4..6edb9a5 100644
--- a/weather/pom.xml
+++ b/weather/pom.xml
@@ -18,6 +18,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<log4j2.version>2.15.0</log4j2.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<schema>${project.basedir}/../../server/src/main/resources</schema>