diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index f777c7c1af..e14a1f7b54 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index a036ac3303..b48ca56fd5 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>maven-surefire-common</artifactId>
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 570d81af09..e9e4bea347 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 53b0dca0e3..d99c3a9c90 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index ab43bbdef5..c261bf3c24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.maven.surefire</groupId>
   <artifactId>surefire</artifactId>
-  <version>3.0.0-M6-SNAPSHOT</version>
+  <version>3.0.0-M6</version>
   <packaging>pom</packaging>
 
   <name>Apache Maven Surefire</name>
@@ -69,7 +69,7 @@
     <connection>${maven.surefire.scm.devConnection}</connection>
     <developerConnection>${maven.surefire.scm.devConnection}</developerConnection>
     <url>https://github.com/apache/maven-surefire/tree/${project.scm.tag}</url>
-    <tag>HEAD</tag>
+    <tag>surefire-3.0.0-M6</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -102,9 +102,9 @@
     <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
     <maven.compiler.testSource>1.${javaVersion}</maven.compiler.testSource>
     <maven.compiler.testTarget>1.${javaVersion}</maven.compiler.testTarget>
-    <jvm9ArgsTests/>
+    <jvm9ArgsTests />
     <jvm.args.tests>${jvm9ArgsTests} -Xms32m -Xmx144m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</jvm.args.tests>
-    <project.build.outputTimestamp>2020-06-10T18:16:37Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-03-30T21:49:36Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 4452a22d39..21513983d0 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-api</artifactId>
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index acdb656ce5..8416af8325 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-booter</artifactId>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index d16347fddb..cc4ef64eeb 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-extensions-api</artifactId>
diff --git a/surefire-extensions-spi/pom.xml b/surefire-extensions-spi/pom.xml
index 43d0123cf0..32a2fc7007 100644
--- a/surefire-extensions-spi/pom.xml
+++ b/surefire-extensions-spi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-extensions-spi</artifactId>
diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
index cd7bb8c056..cef1684155 100644
--- a/surefire-grouper/pom.xml
+++ b/surefire-grouper/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-grouper</artifactId>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 11471de7ad..2f87dfcc72 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-its</artifactId>
diff --git a/surefire-logger-api/pom.xml b/surefire-logger-api/pom.xml
index 3bb3e8405a..1ece43ef89 100644
--- a/surefire-logger-api/pom.xml
+++ b/surefire-logger-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-logger-api</artifactId>
diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
index 90626116b6..9aa26b6883 100644
--- a/surefire-providers/common-java5/pom.xml
+++ b/surefire-providers/common-java5/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>common-java5</artifactId>
@@ -71,4 +71,8 @@
       </plugin>
     </plugins>
   </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/common-junit3/pom.xml b/surefire-providers/common-junit3/pom.xml
index 265910d474..5820e81992 100644
--- a/surefire-providers/common-junit3/pom.xml
+++ b/surefire-providers/common-junit3/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>common-junit3</artifactId>
@@ -73,4 +73,8 @@
     </plugins>
   </build>
 
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/common-junit4/pom.xml b/surefire-providers/common-junit4/pom.xml
index 54806b4770..84f138608b 100644
--- a/surefire-providers/common-junit4/pom.xml
+++ b/surefire-providers/common-junit4/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>common-junit4</artifactId>
@@ -82,4 +82,8 @@
       </plugin>
     </plugins>
   </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/common-junit48/pom.xml b/surefire-providers/common-junit48/pom.xml
index 610e04b357..87116fedca 100644
--- a/surefire-providers/common-junit48/pom.xml
+++ b/surefire-providers/common-junit48/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-providers</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>common-junit48</artifactId>
@@ -172,4 +172,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index 6c072d38ab..2147c8bf66 100644
--- a/surefire-providers/pom.xml
+++ b/surefire-providers/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-providers</artifactId>
diff --git a/surefire-providers/surefire-junit-platform/pom.xml b/surefire-providers/surefire-junit-platform/pom.xml
index 264e9a3417..88333c3845 100644
--- a/surefire-providers/surefire-junit-platform/pom.xml
+++ b/surefire-providers/surefire-junit-platform/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-providers</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-junit-platform</artifactId>
@@ -138,4 +138,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/surefire-junit3/pom.xml b/surefire-providers/surefire-junit3/pom.xml
index 9b4876a064..f7be4b82a9 100644
--- a/surefire-providers/surefire-junit3/pom.xml
+++ b/surefire-providers/surefire-junit3/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-junit3</artifactId>
@@ -82,4 +82,8 @@
       </plugin>
     </plugins>
   </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml
index 9670023e87..c778587c2a 100644
--- a/surefire-providers/surefire-junit4/pom.xml
+++ b/surefire-providers/surefire-junit4/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-junit4</artifactId>
@@ -80,4 +80,8 @@
       </plugin>
     </plugins>
   </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml
index 6e9a2bf15a..f3f5952419 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-providers</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-junit47</artifactId>
@@ -98,4 +98,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml
index cd8f0027ae..d5eb47643e 100644
--- a/surefire-providers/surefire-testng-utils/pom.xml
+++ b/surefire-providers/surefire-testng-utils/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire-providers</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-testng-utils</artifactId>
@@ -84,4 +84,8 @@
       </plugin>
     </plugins>
   </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index b638cc87e0..ece647d6a7 100644
--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire-providers</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-testng</artifactId>
@@ -100,4 +100,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>surefire-3.0.0-M6</tag>
+  </scm>
 </project>
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index 920e3e991f..c60438ecbe 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -18,14 +18,13 @@
   ~ under the License.
   -->
 
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-report-parser</artifactId>
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index ea261e2eaa..b07b5785d5 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>surefire</artifactId>
-    <version>3.0.0-M6-SNAPSHOT</version>
+    <version>3.0.0-M6</version>
   </parent>
 
   <artifactId>surefire-shadefire</artifactId>
@@ -107,8 +107,8 @@
                   <resource>META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider</resource>
                   <file>src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider</file>
                 </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/DEPENDENCIES</resource>
                 </transformer>
diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml
index b28d3c25fd..ec4fc0d5c3 100644
--- a/surefire-shared-utils/pom.xml
+++ b/surefire-shared-utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.maven.surefire</groupId>
         <artifactId>surefire</artifactId>
-        <version>3.0.0-M6-SNAPSHOT</version>
+        <version>3.0.0-M6</version>
     </parent>
 
     <artifactId>surefire-shared-utils</artifactId>