diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0a61aab..6c728e6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -8,16 +8,19 @@ on:
     branches: [ '**' ]
 
 jobs:
-  build-with-maven-jdk-17:
+  build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 17, 21]
+    name: Java ${{ matrix.java }} build
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: 17
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: liberica
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
 
diff --git a/README.md b/README.md
index e920652..5d3a206 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ The project is based on [Maven] and is available form central Maven repository.
 Add
  
 ```xml
-<mockito-soap-cxf.version>2.0.0</mockito-soap-cxf.version>
+<mockito-soap-cxf.version>2.0.1</mockito-soap-cxf.version>
 ```
 
 and
@@ -51,7 +51,7 @@ For
 
 ```groovy
 ext {
-  mockitoSoapCxfVersion = '2.0.0'
+  mockitoSoapCxfVersion = '2.0.1'
 }
 ```
 
@@ -249,8 +249,13 @@ If you see exception cause by
 
 then you're mixing CXF version 2 and 3 - see above about excluding `cxf-core` artifact.
 
+# See also
+
+ * [mockito-rest-spring](https://github.com/skjolber/mockito-rest-spring) for REST / GraphQL mocking.
+
 # History
 
+ - 2.0.1: Maintenance release (bump dependencies). Thank you @RufManuel for help.
  - 2.0.0: Move to JDK 17 and Spring 6.x and Mockito 5.x.
  - 1.2.1: Maintainence release. JDK 8 (with CXF 3.x and Spring 5.3.x now live at jdk8 branch, on version 1.2.x).
  - 1.2.0: JUnit 5 support.
diff --git a/pom.xml b/pom.xml
index 49c0259..ee5119a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,29 +14,29 @@
 		<maven.compiler.target>17</maven.compiler.target>
 
 		<junit.version>4.13.2</junit.version>
-		<junit5.version>5.9.2</junit5.version>
+		<junit5.version>5.12.0</junit5.version>
 
-		<mockito.version>5.1.1</mockito.version>
+		<mockito.version>5.16.0</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
-		<commons-io.version>2.14.0</commons-io.version>
+		<commons-io.version>2.18.0</commons-io.version>
 
-		<cxf.version>4.1.0</cxf.version>
-		<spring.version>6.1.14</spring.version>
+		<cxf.version>4.1.1</cxf.version>
+		<spring.version>6.2.3</spring.version>
     
-		<logback.version>1.2.13</logback.version>
-		<slf4j.version>1.7.32</slf4j.version>
-		
+		<logback.version>1.5.17</logback.version>
+		<slf4j.version>2.0.17</slf4j.version>
+
 		<!-- plugins -->
 		<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
-		<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
-		<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-		<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
-		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-		<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
-		<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-		<owasp-dependency-check.version>8.1.0</owasp-dependency-check.version>		
+		<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+		<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
+		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+		<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+		<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
+		<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+		<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
+		<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+		<owasp-dependency-check.version>12.1.0</owasp-dependency-check.version>
 	</properties>
 
 	<licenses>
@@ -84,7 +84,7 @@
 			<version>${junit.version}</version>
 			<scope>compile</scope>
 			<optional>true</optional>
-		</dependency>        
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
@@ -220,7 +220,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.cxf</groupId>
@@ -398,6 +398,27 @@
 				<artifactId>dependency-check-maven</artifactId>
 				<version>${owasp-dependency-check.version}</version>
 			</plugin>
+			<plugin>
+				<groupId>org.moditect</groupId>
+				<artifactId>moditect-maven-plugin</artifactId>
+				<version>1.2.2.Final</version>
+				<executions>
+					<execution>
+						<id>add-module-infos</id>
+						<phase>package</phase>
+						<goals>
+							<goal>add-module-info</goal>
+						</goals>
+						<configuration>
+							<jvmVersion>${java.module.version}</jvmVersion>
+							<overwriteExistingFiles>true</overwriteExistingFiles>
+							<module>
+								<moduleInfoFile>src/main/java9/module-info.java</moduleInfoFile>
+							</module>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/src/main/java/com/github/skjolber/mockito/soap/module-info.java b/src/main/java/com/github/skjolber/mockito/soap/module-info.java
deleted file mode 100644
index 1e9b3ff..0000000
--- a/src/main/java/com/github/skjolber/mockito/soap/module-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-module com.github.skjolber.mockito.soap {
-	
-	requires junit;
-	requires org.junit.jupiter.api;
-	requires org.mockito;
-
-	requires jakarta.xml.bind;
-	requires jakarta.activation;
-	requires jakarta.xml.ws;
-	
-	requires java.net.http;
-	requires java.base;
-	
-	requires org.apache.cxf.core;
-	requires org.apache.cxf.binding.soap;
-	requires org.apache.cxf.frontend.jaxws;
-	requires org.apache.cxf.transport.http;
-	requires org.apache.cxf.frontend.jaxrs;
-	requires org.apache.cxf.frontend.simple;
-	
-	exports com.github.skjolber.mockito.soap;
-	
-}
\ No newline at end of file
diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
new file mode 100644
index 0000000..18d37b1
--- /dev/null
+++ b/src/main/java9/module-info.java
@@ -0,0 +1,23 @@
+module com.github.skjolber.mockito.soap {
+
+    requires junit;
+    requires org.junit.jupiter.api;
+    requires org.mockito;
+
+    requires jakarta.xml.bind;
+    requires jakarta.activation;
+    requires jakarta.xml.ws;
+
+    requires java.net.http;
+    requires java.base;
+
+    requires org.apache.cxf.core;
+    requires org.apache.cxf.binding.soap;
+    requires org.apache.cxf.frontend.jaxws;
+    requires org.apache.cxf.transport.http;
+    requires org.apache.cxf.frontend.jaxrs;
+    requires org.apache.cxf.frontend.simple;
+
+    exports com.github.skjolber.mockito.soap;
+
+}
\ No newline at end of file