diff --git a/airline/client/spring-ws/pom.xml b/airline/client/spring-ws/pom.xml
index efdc900..44ebbc8 100644
--- a/airline/client/spring-ws/pom.xml
+++ b/airline/client/spring-ws/pom.xml
@@ -80,9 +80,9 @@
 		<plugins>
 
 			<plugin>
-				<groupId>org.jvnet.jaxb2.maven2</groupId>
-				<artifactId>maven-jaxb2-plugin</artifactId>
-				<version>0.14.0</version>
+				<groupId>com.evolvedbinary.maven.jvnet</groupId>
+				<artifactId>jaxb30-maven-plugin</artifactId>
+				<version>0.15.0</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java b/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
index e542e28..75229a0 100644
--- a/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
+++ b/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
@@ -16,19 +16,14 @@
 
 package org.springframework.ws.samples.airline.client.sws;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
+
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.springframework.springWs.samples.airline.schemas.BookFlightRequest;
-import org.springframework.springWs.samples.airline.schemas.Flight;
-import org.springframework.springWs.samples.airline.schemas.GetFlightsRequest;
-import org.springframework.springWs.samples.airline.schemas.GetFlightsResponse;
-import org.springframework.springWs.samples.airline.schemas.Name;
-import org.springframework.springWs.samples.airline.schemas.Ticket;
-import org.springframework.stereotype.Service;
+import org.springframework.springWs.samples.airline.schemas.*;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.client.core.support.WebServiceGatewaySupport;