diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 8fce52355..f27eed01c 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -472,7 +472,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M6</version>
                 <configuration>
+                    <argLine>--enable-preview</argLine>
+
                     <!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
                     <excludes>
                         <exclude>**/*Integrated*Test*.java</exclude>
@@ -490,6 +493,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M6</version>
                 <executions>
                     <execution>
                         <id>run-tests</id>
@@ -501,6 +505,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <argLine>--enable-preview</argLine>
                     <!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
@@ -522,6 +527,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.3.1</version>
                 <configuration>
+                    <release>17</release>
                     <doctitle>${javadoc.name}</doctitle>
                     <windowtitle>${javadoc.name}</windowtitle>
                     <isOffline>false</isOffline>
@@ -529,8 +535,11 @@
                     <detectLinks>false</detectLinks>
                     <detectOfflineLinks>false</detectOfflineLinks>
                     <!--                    <additionalparam>-Xdoclint:none</additionalparam>-->
-                    <additionalOptions>-Xdoclint:none</additionalOptions>
-                    <additionalJOption>-Xdoclint:none</additionalJOption>
+                    <additionalOptions>
+                        <additionalOption>-Xdoclint:none</additionalOption>
+                        <additionalOption>--enable-preview</additionalOption>
+                    </additionalOptions>
+<!--                    <additionalJOption>-Xdoclint:none &#45;&#45;enable-preview</additionalJOption>-->
                     <doclint>none</doclint>
                 </configuration>
                 <executions>
@@ -548,6 +557,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -563,6 +573,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -574,6 +585,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
+                <version>3.0.1</version>
             </plugin>
 
             <plugin>