diff --git a/pom.xml b/pom.xml
index 6ef107e83d..beec12b62c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  ~ THE SOFTWARE.
  -->
-
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -38,16 +37,28 @@
   <scm>
     <connection>scm:git:ssh://git@github.com/jenkinsci/plugin-pom.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/plugin-pom.git</developerConnection>
-    <url>https://github.com/jenkinsci/plugin-pom</url>
     <tag>HEAD</tag>
+    <url>https://github.com/jenkinsci/plugin-pom</url>
   </scm>
 
+  <distributionManagement>
+    <repository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>maven.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>maven.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <releaseProfiles> </releaseProfiles>
-    <arguments> </arguments>
+    <releaseProfiles />
+    <arguments />
     <argLine>-Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1</argLine>
 
     <jenkins.version>2.204</jenkins.version>
@@ -68,7 +79,7 @@
     <spotbugs.threshold>Medium</spotbugs.threshold>
     <!-- Defines a SpotBugs effort. Use "Max" to maximize the scan depth -->
     <spotbugs.effort>Default</spotbugs.effort>
-    
+
     <!-- Whether to skip tests during release phase (they are executed in the prepare phase). -->
     <release.skipTests>true</release.skipTests>
     <!-- By default we do not create *-tests.jar. Set to false to allow other plugins to depend on test utilities in yours, using <classifier>tests</classifier>. -->
@@ -80,9 +91,15 @@
     <frontend-version>1.12.0</frontend-version>
     <nodeDownloadRoot>https://repo.jenkins-ci.org/nodejs-dist/</nodeDownloadRoot>
     <npmDownloadRoot>https://repo.jenkins-ci.org/npm-dist/</npmDownloadRoot>
-    <skip.node.tests /> <!-- changed by -DskipTests, if specified - see profile -->
-    <skip.node.lint /> <!-- changed by -DskipLint, if specified - see profile -->
-    <npm.loglevel /> <!-- may use e.g. -\-silent (without backslash) -->
+
+    <!-- changed by -DskipTests, if specified - see profile -->
+    <skip.node.tests />
+
+    <!-- changed by -DskipLint, if specified - see profile -->
+    <skip.node.lint />
+
+    <!-- may use e.g. -\-silent (without backslash) -->
+    <npm.loglevel />
 
     <!-- To skip the wizard by default in hpi:run. It should not impact other goals. -->
     <hudson.Main.development>true</hudson.Main.development>
@@ -151,7 +168,8 @@
         <version>4.13.2</version>
       </dependency>
       <!-- JTN tidy this up? -->
-      <dependency> <!-- used in JTH and jenkins core > 2.x -->
+      <dependency>
+        <!-- used in JTH and jenkins core > 2.x -->
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
         <version>3.1.0</version>
@@ -234,10 +252,11 @@
 
     <!-- for JRE requirement check annotation -->
     <dependency>
+      <!-- no need to have this at runtime -->
       <groupId>org.codehaus.mojo</groupId>
       <artifactId>animal-sniffer-annotations</artifactId>
       <scope>provided</scope>
-      <optional>true</optional><!-- no need to have this at runtime -->
+      <optional>true</optional>
     </dependency>
     <dependency>
       <!-- to avoid https://www.slf4j.org/codes.html#release warning -->
@@ -277,6 +296,20 @@
     </dependency>
   </dependencies>
 
+  <repositories>
+    <repository>
+      <id>repo.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/public/</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>repo.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/public/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <!--
       Since new versions need to overwrite old versions, it's better
@@ -318,8 +351,9 @@
           <version>3.0.0-M4</version>
         </plugin>
         <plugin>
+          <!-- TODO >3.0.0-M1 when MDEPLOY-244 is fixed (likely to cause security release issues without) -->
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version> <!-- TODO >3.0.0-M1 when MDEPLOY-244 is fixed (likely to cause security release issues without) -->
+          <version>2.8.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
@@ -389,10 +423,10 @@
           <executions>
             <execution>
               <id>add-source</id>
-              <phase>generate-sources</phase>
               <goals>
                 <goal>add-source</goal>
               </goals>
+              <phase>generate-sources</phase>
               <configuration>
                 <sources>
                   <source>${project.build.directory}/generated-sources/localizer</source>
@@ -436,7 +470,8 @@
           <artifactId>maven-license-plugin</artifactId>
           <version>1.10</version>
         </plugin>
-        <plugin> <!-- not gated by Incrementals profiles, since we want the incrementalify goal to be available from the start -->
+        <plugin>
+          <!-- not gated by Incrementals profiles, since we want the incrementalify goal to be available from the start -->
           <groupId>io.jenkins.tools.incrementals</groupId>
           <artifactId>incrementals-maven-plugin</artifactId>
           <version>1.2</version>
@@ -478,14 +513,21 @@
       </plugin>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>1.5.1</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <id>display-info</id>
-            <phase>validate</phase>
             <goals>
               <goal>display-info</goal>
               <goal>enforce</goal>
             </goals>
+            <phase>validate</phase>
             <configuration>
               <rules>
                 <requireMavenVersion>
@@ -543,25 +585,28 @@
                 <bannedDependencies>
                   <excludes>
                     <exclude>javax.servlet:servlet-api</exclude>
-                    <exclude>org.apache.logging.log4j:*:(,2.15.0-rc1]</exclude> <!-- CVE-2021-44228 -->
                     <exclude>org.sonatype.sisu:sisu-guice</exclude>
                     <exclude>log4j:log4j:*:jar:compile</exclude>
                     <exclude>log4j:log4j:*:jar:runtime</exclude>
                     <exclude>commons-logging:commons-logging:*:jar:compile</exclude>
                     <exclude>commons-logging:commons-logging:*:jar:runtime</exclude>
+
+                    <!-- CVE-2021-44228 -->
+                    <exclude>org.apache.logging.log4j:*:(,2.15.0-rc1]</exclude>
+
                     <!-- Jenkins Test Harness is based on JUnit. Adding TestNG dependency would disable some of its functionality. -->
                     <exclude>org.testng:testng</exclude>
                   </excludes>
                 </bannedDependencies>
                 <requireUpperBoundDeps>
                   <excludes>
+                    <exclude>com.google.code.findbugs:annotations</exclude>
+                    <exclude>com.google.code.findbugs:jsr305</exclude>
+                    <exclude>com.google.guava:guava</exclude>
+                    <exclude>commons-logging:commons-logging</exclude>
                     <exclude>javax.servlet:javax.servlet-api</exclude>
                     <exclude>javax.servlet:servlet-api</exclude>
-                    <exclude>com.google.guava:guava</exclude> <!-- TODO needed for Jenkins 2.71 and earlier -->
-                    <exclude>commons-logging:commons-logging</exclude> <!-- ditto -->
-                    <exclude>com.google.code.findbugs:annotations</exclude>
-                    <exclude>com.google.code.findbugs:jsr305</exclude> <!-- ditto -->
-                    <exclude>net.java.dev.jna:jna</exclude> <!-- needed for Jenkins 1.585 and earlier -->
+                    <exclude>net.java.dev.jna:jna</exclude>
                     <exclude>org.kohsuke:access-modifier-annotation</exclude>
                     <!--
                       Work around the following require upper bound dependencies error on 2.222.x
@@ -634,10 +679,10 @@
           </execution>
           <execution>
             <id>no-snapshots-in-release</id>
-            <phase>validate</phase>
             <goals>
               <goal>enforce</goal>
             </goals>
+            <phase>validate</phase>
             <configuration>
               <rules>
                 <!-- 
@@ -654,13 +699,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.5.1</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
@@ -698,21 +736,21 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java1${java.level}</artifactId>
+          </signature>
+        </configuration>
         <executions>
           <execution>
+            <id>check</id>
             <goals>
               <goal>check</goal>
             </goals>
-            <id>check</id>
             <phase>test</phase>
           </execution>
         </executions>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java1${java.level}</artifactId>
-          </signature>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
@@ -779,6 +817,10 @@
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
+        <configuration>
+          <!-- gmavenplus generates into generated-sources/test by default. gmaven generated into this directory. -->
+          <testStubsOutputDirectory>${project.build.directory}/generated-test-sources/groovy-stubs</testStubsOutputDirectory>
+        </configuration>
         <executions>
           <execution>
             <id>test-in-groovy</id>
@@ -789,26 +831,22 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <!-- gmavenplus generates into generated-sources/test by default. gmaven generated into this directory. -->
-          <testStubsOutputDirectory>${project.build.directory}/generated-test-sources/groovy-stubs</testStubsOutputDirectory>
-        </configuration>
-
       </plugin>
-      <plugin> <!-- https://stackoverflow.com/a/4086207/12916 -->
+      <plugin>
+        <!-- https://stackoverflow.com/a/4086207/12916 -->
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
             <id>createTempDir</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
             <phase>generate-test-resources</phase>
             <configuration>
               <target>
                 <mkdir dir="${surefireTempDir}" />
               </target>
             </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>
@@ -852,8 +890,7 @@
             <configuration>
               <!--requireCompleteLicenseInfo>true</requireCompleteLicenseInfo-->
               <generateLicenseXml>target/${project.artifactId}/WEB-INF/licenses.xml</generateLicenseXml>
-              <inlineScript><![CDATA[
-                filter {
+              <inlineScript><![CDATA[filter {
                     def plugins = [] as Set
                     
                     // collect all Jenkins plugins
@@ -877,8 +914,7 @@
                             
                         return false;
                     })
-                }              
-              ]]></inlineScript>
+                }]]></inlineScript>
             </configuration>
           </execution>
         </executions>
@@ -932,38 +968,13 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>repo.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/public/</url>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>repo.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/public/</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <distributionManagement>
-    <repository>
-      <uniqueVersion>false</uniqueVersion>
-      <id>maven.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>maven.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <profiles>
     <profile>
       <id>uninherited-java.level</id>
       <activation>
         <file>
-          <exists>${basedir}/src/it/undefined-java-level/pom.xml</exists> <!-- just something that is only here -->
+          <!-- just something that is only here -->
+          <exists>${basedir}/src/it/undefined-java-level/pom.xml</exists>
         </file>
       </activation>
       <properties>
@@ -1159,6 +1170,11 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/Messages.class</exclude>
+              </excludes>
+            </configuration>
             <executions>
               <execution>
                 <goals>
@@ -1172,11 +1188,6 @@
                 </goals>
               </execution>
             </executions>
-            <configuration>
-              <excludes>
-                <exclude>**/Messages.class</exclude>
-              </excludes>
-            </configuration>
           </plugin>
         </plugins>
       </build>
@@ -1198,11 +1209,11 @@
             <executions>
 
               <execution>
-                <phase>initialize</phase>
                 <id>install node and npm</id>
                 <goals>
                   <goal>install-node-and-npm</goal>
                 </goals>
+                <phase>initialize</phase>
                 <configuration>
                   <nodeVersion>v${node.version}</nodeVersion>
                   <npmVersion>${npm.version}</npmVersion>
@@ -1212,11 +1223,11 @@
               </execution>
 
               <execution>
-                <phase>initialize</phase>
                 <id>npm install</id>
                 <goals>
                   <goal>npm</goal>
                 </goals>
+                <phase>initialize</phase>
                 <configuration>
                   <!-- Note that this may not be omitted lest maven-release-plugin be confused (frontend-maven-plugin #109): -->
                   <arguments>install ${npm.loglevel}</arguments>
@@ -1224,11 +1235,11 @@
               </execution>
 
               <execution>
-                <phase>generate-sources</phase>
                 <id>npm mvnbuild</id>
                 <goals>
                   <goal>npm</goal>
                 </goals>
+                <phase>generate-sources</phase>
                 <configuration>
                   <!-- The package.json must define an "mvnbuild" script -->
                   <arguments>run mvnbuild</arguments>
@@ -1236,11 +1247,11 @@
               </execution>
 
               <execution>
-                <phase>test</phase>
                 <id>npm mvntest</id>
                 <goals>
                   <goal>npm</goal>
                 </goals>
+                <phase>test</phase>
                 <configuration>
                   <!-- The package.json must define an "mvntest" script -->
                   <arguments>run mvntest</arguments>
@@ -1270,11 +1281,11 @@
             <executions>
 
               <execution>
-                <phase>initialize</phase>
                 <id>install node and yarn</id>
                 <goals>
                   <goal>install-node-and-yarn</goal>
                 </goals>
+                <phase>initialize</phase>
                 <configuration>
                   <nodeVersion>v${node.version}</nodeVersion>
                   <yarnVersion>v${yarn.version}</yarnVersion>
@@ -1284,11 +1295,11 @@
               </execution>
 
               <execution>
-                <phase>initialize</phase>
                 <id>yarn install</id>
                 <goals>
                   <goal>yarn</goal>
                 </goals>
+                <phase>initialize</phase>
                 <configuration>
                   <!-- ensure only one concurrent 'yarn install' -->
                   <!-- when yarn cache is empty, multiple yarns performing network fetches frequently results in opaque errors -->
@@ -1297,11 +1308,11 @@
               </execution>
 
               <execution>
-                <phase>generate-sources</phase>
                 <id>yarn mvnbuild</id>
                 <goals>
                   <goal>yarn</goal>
                 </goals>
+                <phase>generate-sources</phase>
                 <configuration>
                   <!-- The package.json must define an "mvnbuild" script -->
                   <arguments>run mvnbuild</arguments>
@@ -1309,11 +1320,11 @@
               </execution>
 
               <execution>
-                <phase>test</phase>
                 <id>yarn mvntest</id>
                 <goals>
                   <goal>yarn</goal>
                 </goals>
+                <phase>test</phase>
                 <configuration>
                   <!-- The package.json must define an "mvntest" script -->
                   <arguments>run mvntest</arguments>
@@ -1328,12 +1339,12 @@
     <profile>
       <id>clean-node</id>
       <activation>
-        <file>
-          <exists>package.json</exists>
-        </file>
         <property>
           <name>cleanNode</name>
         </property>
+        <file>
+          <exists>package.json</exists>
+        </file>
       </activation>
       <build>
         <plugins>
@@ -1361,20 +1372,20 @@
       <id>consume-incrementals</id>
       <repositories>
         <repository>
-          <id>incrementals</id>
-          <url>${incrementals.url}</url>
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
+          <id>incrementals</id>
+          <url>${incrementals.url}</url>
         </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>
-          <id>incrementals</id>
-          <url>${incrementals.url}</url>
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
+          <id>incrementals</id>
+          <url>${incrementals.url}</url>
         </pluginRepository>
       </pluginRepositories>
     </profile>
@@ -1392,10 +1403,10 @@
             <executions>
               <execution>
                 <id>flatten</id>
-                <phase>process-resources</phase>
                 <goals>
                   <goal>flatten</goal>
                 </goals>
+                <phase>process-resources</phase>
                 <configuration>
                   <flattenMode>oss</flattenMode>
                   <outputDirectory>${project.build.directory}</outputDirectory>
@@ -1406,6 +1417,13 @@
           </plugin>
           <plugin>
             <artifactId>maven-enforcer-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>io.jenkins.tools.incrementals</groupId>
+                <artifactId>incrementals-enforcer-rules</artifactId>
+                <version>1.2</version>
+              </dependency>
+            </dependencies>
             <executions>
               <execution>
                 <id>display-info</id>
@@ -1418,13 +1436,6 @@
                 </configuration>
               </execution>
             </executions>
-            <dependencies>
-              <dependency>
-                <groupId>io.jenkins.tools.incrementals</groupId>
-                <artifactId>incrementals-enforcer-rules</artifactId>
-                <version>1.2</version>
-              </dependency>
-            </dependencies>
           </plugin>
           <plugin>
             <artifactId>maven-release-plugin</artifactId>
@@ -1486,7 +1497,8 @@
         </plugins>
       </build>
     </profile>
-    <profile> <!-- JEP-229 -->
+    <profile>
+      <!-- JEP-229 -->
       <id>block-MRP</id>
       <activation>
         <property>