From 8eb18b77ebf0cb8565a62854ba6b03b503ca61c0 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 17 Feb 2021 13:48:32 +0100
Subject: [PATCH 1/9] Bump version to 5.0.0-beta-1.

---
 pom.xml | 101 ++++++++++++++++++++++++++------------------------------
 1 file changed, 47 insertions(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index 725e05a4..642adb0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +1,20 @@
-<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">
+<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>
 
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
     <version>4.16</version>
-    <relativePath />
+    <relativePath/>
   </parent>
 
   <groupId>org.jvnet.hudson.plugins</groupId>
   <artifactId>analysis-pom</artifactId>
   <packaging>pom</packaging>
   <name>Analysis Plug-ins Parent POM</name>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>5.0.0-beta-1-SNAPSHOT</version>
+
   <url>https://github.com/jenkinsci/analysis-pom-plugin</url>
   <description>This static analysis POM serves as parent POM for all my Jenkins Plugins. It basically enhances the
     Parent POM for Jenkins Plugins (see https://github.com/jenkinsci/plugin-pom) with a predefined configuration of
@@ -22,14 +24,15 @@
   </description>
 
   <properties>
-    <jenkins.baseline>2.204</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.6</jenkins.version>
+    <jenkins.baseline>2.249</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <java.level>8</java.level>
     <spotbugs.failOnError>false</spotbugs.failOnError>
-    <codingstyle.config.version>1.6.0</codingstyle.config.version>
+    <codingstyle.config.version>2.0.0</codingstyle.config.version>
 
     <!-- Library Dependencies Versions -->
     <error-prone.version>2.5.1</error-prone.version>
+    <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     <slf4j.version>1.7.30</slf4j.version>
 
     <!-- Test Library Dependencies Versions -->
@@ -87,26 +90,11 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>2.2</version>
-      </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
         <version>5.0.4</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.uber.nullaway</groupId>
-        <artifactId>nullaway</artifactId>
-        <version>${nullaway.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -118,6 +106,11 @@
       <artifactId>error_prone_annotations</artifactId>
       <version>${error-prone.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${javax.annotation-api.version}</version>
+    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
@@ -170,13 +163,7 @@
     </dependency>
     <dependency>
       <groupId>com.tngtech.archunit</groupId>
-      <artifactId>archunit-junit5-api</artifactId>
-      <version>${archunit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tngtech.archunit</groupId>
-      <artifactId>archunit-junit5-engine</artifactId>
+      <artifactId>archunit-junit5</artifactId>
       <version>${archunit.version}</version>
       <scope>test</scope>
     </dependency>
@@ -531,35 +518,41 @@
           </dependencies>
           <configuration>
             <analysisConfiguration>
+              <versionFormat>[-0-9.]*</versionFormat>
+              <failBuildOnProblemsFound>true</failBuildOnProblemsFound>
               <revapi.semver.ignore>
                 <enabled>true</enabled>
               </revapi.semver.ignore>
-              <revapi.ignore>
-                <item>
-                  <regex>true</regex>
-                  <code>java.class.nonPublicPartOfAPI</code>
-                  <classQualifiedName>org.jvnet.hudson.*</classQualifiedName>
-                  <justification>Not relevant</justification>
-                </item>
-                <item>
-                  <regex>true</regex>
-                  <code>java.class.nonPublicPartOfAPI</code>
-                  <classQualifiedName>net.sf.json.*</classQualifiedName>
-                  <justification>Not relevant</justification>
-                </item>
-                <item>
-                  <regex>true</regex>
-                  <code>java.class.nonPublicPartOfAPI</code>
-                  <classQualifiedName>hudson.*</classQualifiedName>
-                  <justification>Not relevant</justification>
-                </item>
-                <item>
-                  <regex>true</regex>
-                  <code>java.class.nonPublicPartOfAPI</code>
-                  <classQualifiedName>org.kohsuke.*</classQualifiedName>
-                  <justification>Not relevant</justification>
-                </item>
-              </revapi.ignore>
+              <revapi.differences>
+                <justification>SpotBugs annotations are save to change</justification>
+                <criticality>allowed</criticality>
+                <differences>
+                  <item>
+                    <regex>true</regex>
+                    <code>java.class.nonPublicPartOfAPI</code>
+                    <classQualifiedName>org.jvnet.hudson.*</classQualifiedName>
+                    <justification>Not relevant</justification>
+                  </item>
+                  <item>
+                    <regex>true</regex>
+                    <code>java.class.nonPublicPartOfAPI</code>
+                    <classQualifiedName>net.sf.json.*</classQualifiedName>
+                    <justification>Not relevant</justification>
+                  </item>
+                  <item>
+                    <regex>true</regex>
+                    <code>java.class.nonPublicPartOfAPI</code>
+                    <classQualifiedName>hudson.*</classQualifiedName>
+                    <justification>Not relevant</justification>
+                  </item>
+                  <item>
+                    <regex>true</regex>
+                    <code>java.class.nonPublicPartOfAPI</code>
+                    <classQualifiedName>org.kohsuke.*</classQualifiedName>
+                    <justification>Not relevant</justification>
+                  </item>
+                </differences>
+              </revapi.differences>
             </analysisConfiguration>
           </configuration>
           <executions>

From f63ba295296ed664f042ecd1677a43b60360dce0 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 17 Feb 2021 13:49:54 +0100
Subject: [PATCH 2/9] [maven-release-plugin] prepare release v5.0.0-beta-1

---
 pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 642adb0b..ef9ca80b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,18 @@
-<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">
+<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>
 
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
     <version>4.16</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <groupId>org.jvnet.hudson.plugins</groupId>
   <artifactId>analysis-pom</artifactId>
   <packaging>pom</packaging>
   <name>Analysis Plug-ins Parent POM</name>
-  <version>5.0.0-beta-1-SNAPSHOT</version>
+  <version>5.0.0-beta-1</version>
 
   <url>https://github.com/jenkinsci/analysis-pom-plugin</url>
   <description>This static analysis POM serves as parent POM for all my Jenkins Plugins. It basically enhances the
@@ -643,7 +642,7 @@
     <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>${scmTag}</tag>
+    <tag>v5.0.0-beta-1</tag>
   </scm>
 
   <repositories>

From 0a3ccea6d2abd1b360d3d58157958bdd818e9db0 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 17 Feb 2021 13:50:00 +0100
Subject: [PATCH 3/9] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef9ca80b..8667aff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>analysis-pom</artifactId>
   <packaging>pom</packaging>
   <name>Analysis Plug-ins Parent POM</name>
-  <version>5.0.0-beta-1</version>
+  <version>5.0.0-beta-2-SNAPSHOT</version>
 
   <url>https://github.com/jenkinsci/analysis-pom-plugin</url>
   <description>This static analysis POM serves as parent POM for all my Jenkins Plugins. It basically enhances the
@@ -642,7 +642,7 @@
     <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>v5.0.0-beta-1</tag>
+    <tag>${scmTag}</tag>
   </scm>
 
   <repositories>

From 5068a6cab5460abb73c7d1478f5d6b203ba377ab Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 22 Feb 2021 19:48:58 +0100
Subject: [PATCH 4/9] Do not trim stack traces.

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 8667aff9..bcb931d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,6 +241,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire.plugin}</version>
         <configuration>
+          <trimStackTrace>false</trimStackTrace>
           <excludes>
             <exclude>**/*ITest.*</exclude>
             <exclude>**/InjectedTest.*</exclude>

From ef171221bf3bba93f3f69e9d4af4bb16a6650f09 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 23 Feb 2021 11:33:16 +0100
Subject: [PATCH 5/9] Remove dependencies (included in plugin-util).

---
 pom.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index bcb931d7..e6647e2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,18 +99,6 @@
 
   <dependencies>
 
-    <!-- Project Dependencies -->
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>${error-prone.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>${javax.annotation-api.version}</version>
-    </dependency>
-
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -241,7 +229,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire.plugin}</version>
         <configuration>
-          <trimStackTrace>false</trimStackTrace>
+          <trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1798 -->
           <excludes>
             <exclude>**/*ITest.*</exclude>
             <exclude>**/InjectedTest.*</exclude>

From ccf2a8ff09f58d3f5cfed458a50088d2b63e46e7 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 23 Feb 2021 16:18:16 +0100
Subject: [PATCH 6/9] Bump version of codingstyle to 2.0.6.

---
 pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6647e2a..9a592c0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,7 @@
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <java.level>8</java.level>
     <spotbugs.failOnError>false</spotbugs.failOnError>
-    <codingstyle.config.version>2.0.0</codingstyle.config.version>
-
-    <!-- Library Dependencies Versions -->
-    <error-prone.version>2.5.1</error-prone.version>
-    <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
-    <slf4j.version>1.7.30</slf4j.version>
+    <codingstyle.config.version>2.0.6</codingstyle.config.version>
 
     <!-- Test Library Dependencies Versions -->
     <junit.version>5.7.1</junit.version>
@@ -336,7 +331,6 @@
             <artifactId>codingstyle</artifactId>
             <version>${codingstyle.config.version}</version>
             <classifier>config</classifier>
-
           </dependency>
         </dependencies>
       </plugin>

From 619669e89b7c530416c3c5cade9a54457d9e8cdd Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 23 Feb 2021 16:18:45 +0100
Subject: [PATCH 7/9] [maven-release-plugin] prepare release v5.0.0-beta-2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9a592c0b..e5636c29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>analysis-pom</artifactId>
   <packaging>pom</packaging>
   <name>Analysis Plug-ins Parent POM</name>
-  <version>5.0.0-beta-2-SNAPSHOT</version>
+  <version>5.0.0-beta-2</version>
 
   <url>https://github.com/jenkinsci/analysis-pom-plugin</url>
   <description>This static analysis POM serves as parent POM for all my Jenkins Plugins. It basically enhances the
@@ -625,7 +625,7 @@
     <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>${scmTag}</tag>
+    <tag>v5.0.0-beta-2</tag>
   </scm>
 
   <repositories>

From 399e320b45f5a2c9875e1cb1ce441f95560e7bef Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 23 Feb 2021 16:18:52 +0100
Subject: [PATCH 8/9] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5636c29..d043d09a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>analysis-pom</artifactId>
   <packaging>pom</packaging>
   <name>Analysis Plug-ins Parent POM</name>
-  <version>5.0.0-beta-2</version>
+  <version>5.0.0-beta-3-SNAPSHOT</version>
 
   <url>https://github.com/jenkinsci/analysis-pom-plugin</url>
   <description>This static analysis POM serves as parent POM for all my Jenkins Plugins. It basically enhances the
@@ -625,7 +625,7 @@
     <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>v5.0.0-beta-2</tag>
+    <tag>${scmTag}</tag>
   </scm>
 
   <repositories>

From 46e0a963faaad3f00feea6f42855cabc4c9a2fad Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 25 Feb 2021 16:10:59 +0100
Subject: [PATCH 9/9] Bump version of PMD to 6.31.0.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d043d09a..e2adc14a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
     <!-- Maven plug-in versions -->
     <maven-pmd-plugin.version>3.14.0</maven-pmd-plugin.version>
-    <pmd.version>6.29.0</pmd.version>
+    <pmd.version>6.31.0</pmd.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
     <checkstyle.version>8.40</checkstyle.version>
     <findsecbugs-plugin.version>1.11.0</findsecbugs-plugin.version>