From f4fb8e86b14e8408f191aac68a689962354bf271 Mon Sep 17 00:00:00 2001
From: Torsten Friebe <torsten.friebe@gmail.com>
Date: Thu, 26 Nov 2020 21:20:46 +0100
Subject: [PATCH 1/2]  #857 migrated findbugs plugin to spotbugs plugin

---
 Jenkinsfile |  6 +++---
 pom.xml     | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1bf52cb54d..fe06f58090 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
         }
         stage ('Build') {
             steps {
-               echo 'Unit testing'
+               echo 'Building'
                sh 'mvn -B -C -Poracle,mssql clean test-compile'
             }
         }
@@ -45,11 +45,11 @@ pipeline {
             }
             steps {
                 echo 'Quality checking'
-                sh 'mvn -B -C -fae -Poracle,mssql findbugs:findbugs checkstyle:checkstyle javadoc:javadoc'
+                sh 'mvn -B -C -fae -Poracle,mssql com.github.spotbugs:spotbugs-maven-plugin:spotbugs checkstyle:checkstyle javadoc:javadoc'
             }
             post {
                 success {
-                    findbugs canComputeNew: false, defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', pattern: '**/findbugsXml.xml', unHealthy: ''
+                    findbugs canComputeNew: false, defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', pattern: '**/spotbugsXml.xml', unHealthy: ''
                     checkstyle canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: '**/checkstyle-result.xml', unHealthy: ''
                 }
             }
diff --git a/pom.xml b/pom.xml
index 20e516e311..bb28e0ddac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1130,19 +1130,18 @@
       <reporting>
         <plugins>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <version>2.5.2</version>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-maven-plugin</artifactId>
+            <version>4.1.3</version>
             <configuration>
               <xmlOutput>true</xmlOutput>
-              <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-              <findbugsXmlOutput>true</findbugsXmlOutput>
+              <spotbugsXmlOutput>true</spotbugsXmlOutput>
             </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-pmd-plugin</artifactId>
-            <version>2.7.1</version>
+            <version>3.14.0</version>
             <configuration>
               <linkXref>true</linkXref>
               <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>

From 3781973e4eb7c72e08bcec298c5ce8b736ecb3e5 Mon Sep 17 00:00:00 2001
From: Lyn Elisa Goltz <goltz@lat-lon.de>
Date: Tue, 29 Jun 2021 10:17:00 +0200
Subject: [PATCH 2/2] #857 - fixed echo

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fe06f58090..e7e419e862 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
         }
         stage ('Build') {
             steps {
-               echo 'Building'
+               echo 'Unit testing'
                sh 'mvn -B -C -Poracle,mssql clean test-compile'
             }
         }