diff --git a/echo/client/saaj/pom.xml b/echo/client/saaj/pom.xml
index 81c1950..a045416 100644
--- a/echo/client/saaj/pom.xml
+++ b/echo/client/saaj/pom.xml
@@ -15,11 +15,6 @@
 	<name>Spring Web Services Samples - Echo - Client - SAAJ</name>
 	<description>Demo project for Spring Web Services</description>
 
-	<properties>
-		<java.version>1.8</java.version>
-		<log4j2.version>2.15.0</log4j2.version>
-	</properties>
-
 	<dependencies>
 
 		<dependency>
diff --git a/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java b/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java
index 2d77eb0..3b2ce01 100644
--- a/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java
+++ b/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java
@@ -16,19 +16,11 @@
 
 package org.springframework.ws.samples.echo.client.saaj;
 
+import jakarta.xml.soap.*;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/SaajEchoClient.java b/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/SaajEchoClient.java
index 96cdb99..b0d2277 100644
--- a/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/SaajEchoClient.java
+++ b/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/SaajEchoClient.java
@@ -1,8 +1,8 @@
 package org.springframework.ws.samples.echo.client.saaj;
 
-import java.net.MalformedURLException;
+import jakarta.xml.soap.SOAPException;
 
-import javax.xml.soap.SOAPException;
+import java.net.MalformedURLException;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/echo/server/pom.xml b/echo/server/pom.xml
index 679347d..c2bec90 100644
--- a/echo/server/pom.xml
+++ b/echo/server/pom.xml
@@ -10,16 +10,12 @@
 		<relativePath>../../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>org.springframework.ws</groupId>
 	<artifactId>echo-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Spring Web Services Samples - Echo - Server</name>
 	<description>Demo project for Spring Web Services</description>
 
 	<properties>
-		<java.version>1.8</java.version>
-		<joda-time.version>2.10.6</joda-time.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>
@@ -55,12 +51,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 	</dependencies>
@@ -77,7 +67,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jaxb2-maven-plugin</artifactId>
-				<version>2.5.0</version>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>xjc</id>
@@ -89,7 +79,7 @@
 				<configuration>
 					<sources>${project.basedir}/src/main/resources/echo.xsd</sources>
 					<packageName>org.springframework.ws.samples.airline.schema</packageName>
-					<target>2.1</target>
+					<target>3.0</target>
 				</configuration>
 			</plugin>