From 2809ede81fe002fd878239bea76171f1bbe9dc40 Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Wed, 8 Jun 2022 13:28:50 +0200
Subject: [PATCH 1/2] [No Jira] Avoid triggering auto-staging as part of
 snapshot deployment

---
 Jenkinsfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7d2ed3478..1490175ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,5 @@
 @Library('uima-build-jenkins-shared-library') _
 
 defaultPipeline {
-  // The Eclipse libraries that our plugins depend unfortunately on required Java 11
-  jdk = 'jdk_11_latest'
-  extraMavenArguments = '-Pjacoco,pmd,run-rat-report'
+  extraMavenArguments = '-Pjacoco,spotbugs,pmd,run-rat-report -Ddisable-rc-auto-staging'
 }

From e8682bc105f1cd9bb1588340c20484ac570ebd02 Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Wed, 8 Jun 2022 14:59:02 +0200
Subject: [PATCH 2/2] [No Jira] Temporarily update spotbugs to be compatible
 with Java 17 until we go to Parent POM 16

---
 ruta-parent/pom.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index 9c985bb5b..14550ead1 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -294,4 +294,21 @@
       </plugin>
     </plugins>
   </build>
+  
+  <profiles>
+    <profile>
+      <id>spotbugs</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>com.github.spotbugs</groupId>
+              <artifactId>spotbugs-maven-plugin</artifactId>
+              <version>4.7.0.0</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
 </project>