From 142a8d6248fe2b78bf640b2d598e8e9577f48bc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Apr 2022 11:32:53 +0000
Subject: [PATCH 1/3] Bump jenkins from 1.57 to 1.73

Bumps [jenkins](https://github.com/jenkinsci/pom) from 1.57 to 1.73.
- [Release notes](https://github.com/jenkinsci/pom/releases)
- [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG-old.md)
- [Commits](https://github.com/jenkinsci/pom/compare/jenkins-1.57...jenkins-1.73)

---
updated-dependencies:
- dependency-name: org.jenkins-ci:jenkins
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c813f4a0..36079ea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>jenkins</artifactId>
-      <version>1.57</version>
+      <version>1.73</version>
   </parent>
 
   <groupId>org.jenkins-ci</groupId>

From 9e35997e6b1edb61d4d9b1eae8d1b40fcec66800 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Sun, 10 Apr 2022 13:13:44 +0200
Subject: [PATCH 2/3] fix: exclude jna-platform

---
 pom.xml | 283 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 147 insertions(+), 136 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36079ea6..a2f7f872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,149 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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</groupId>
-      <artifactId>jenkins</artifactId>
-      <version>1.73</version>
-  </parent>
+    <parent>
+        <groupId>org.jenkins-ci</groupId>
+        <artifactId>jenkins</artifactId>
+        <version>1.73</version>
+    </parent>
 
-  <groupId>org.jenkins-ci</groupId>
-  <artifactId>trilead-ssh2</artifactId>
-  <version>${revision}-${changelist}</version>
+    <groupId>org.jenkins-ci</groupId>
+    <artifactId>trilead-ssh2</artifactId>
+    <version>${revision}-${changelist}</version>
 
-  <name>Ganymed SSH2 for Java</name>
-  <description>Ganymed SSH2 for Java is a library which implements the SSH-2 protocol in pure Java</description>
-  <url>http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2/tags/1.0.0-build217/trilead-ssh2/</url>
-  <licenses>
-    <license>
-      <name>BSD style license</name>
-      <url>http://www.ganymed.ethz.ch/ssh2/LICENSE.txt</url>
-    </license>
-  </licenses>
+    <name>Ganymed SSH2 for Java</name>
+    <description>Ganymed SSH2 for Java is a library which implements the SSH-2 protocol in pure Java</description>
+    <url>http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2/tags/1.0.0-build217/trilead-ssh2/</url>
+    <licenses>
+        <license>
+            <name>BSD style license</name>
+            <url>http://www.ganymed.ethz.ch/ssh2/LICENSE.txt</url>
+        </license>
+    </licenses>
 
-  <developers>
-    <developer>
-      <id>mc1arke</id>
-      <name>Michael Clarke</name>
-      <email>michael.m.clarke@gmail.com</email>
-    </developer>
-    <developer>
-      <id>kuisathaverat</id>
-      <name>Ivan Fernandez</name>
-      <email>kuisathaverat@gmail.com</email>
-    </developer>
-  </developers>
+    <developers>
+        <developer>
+            <id>mc1arke</id>
+            <name>Michael Clarke</name>
+            <email>michael.m.clarke@gmail.com</email>
+        </developer>
+        <developer>
+            <id>kuisathaverat</id>
+            <name>Ivan Fernandez</name>
+            <email>kuisathaverat@gmail.com</email>
+        </developer>
+    </developers>
 
-  <scm>
-    <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
-    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
-    <url>https://github.com/${gitHubRepo}</url>
-    <tag>${scmTag}</tag>
-  </scm>
+    <scm>
+        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
+        <tag>${scmTag}</tag>
+    </scm>
 
-  <repositories>
-    <repository>
-      <id>repo.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/public/</url>
-    </repository>
-  </repositories>
+    <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>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>repo.jenkins-ci.org</id>
+            <url>https://repo.jenkins-ci.org/public/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.11.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
-      <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>4.4.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.i2p.crypto</groupId>
-      <artifactId>eddsa</artifactId>
-      <version>0.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.connectbot.jbcrypt</groupId>
-      <artifactId>jbcrypt</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-     <dependency>
-      <groupId>com.google.crypto.tink</groupId>
-      <artifactId>tink</artifactId>
-      <version>1.5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
-      <version>1.14.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.4.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna-platform</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.i2p.crypto</groupId>
+            <artifactId>eddsa</artifactId>
+            <version>0.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.connectbot.jbcrypt</groupId>
+            <artifactId>jbcrypt</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.crypto.tink</groupId>
+            <artifactId>tink</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.14.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>test</directory>
-        <includes>
-          <include>**</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <executions>
-              <execution>
-                  <id>display-info</id>
-                  <configuration>
-                      <rules>
-                          <enforceBytecodeVersion>
-                              <excludes combine.children="append">
-                                  <exclude>org.connectbot.jbcrypt</exclude>
-                              </excludes>
-                          </enforceBytecodeVersion>
-                      </rules>
-                  </configuration>
-              </execution>
-          </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>test</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>display-info</id>
+                        <configuration>
+                            <rules>
+                                <enforceBytecodeVersion>
+                                    <excludes combine.children="append">
+                                        <exclude>org.connectbot.jbcrypt</exclude>
+                                    </excludes>
+                                </enforceBytecodeVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-  <properties>
-    <revision>build-217-jenkins</revision>
-    <changelist>999999-SNAPSHOT</changelist>
-    <gitHubRepo>jenkinsci/trilead-ssh2</gitHubRepo>
-    <java.level>8</java.level>
-  </properties>
+    <properties>
+        <revision>build-217-jenkins</revision>
+        <changelist>999999-SNAPSHOT</changelist>
+        <gitHubRepo>jenkinsci/trilead-ssh2</gitHubRepo>
+        <java.level>8</java.level>
+    </properties>
 
 </project>

From 0314546d4656bbaed261db07c385f6462705d066 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Sun, 10 Apr 2022 14:18:49 +0200
Subject: [PATCH 3/3] fix: update spotbugs config

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e3ef7a44..fa04cda0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,11 +17,11 @@ pipeline {
                             '--update-snapshots',
                             "-Dmaven.repo.local=$m2repo",
                             '-Dmaven.test.failure.ignore',
-                            "-Dfindbugs.failOnError=false",
+                            "-Dspotbugs.failOnError=false",
                             "-Dset.changelist",
                             "-Djava.security.egd=file:/dev/./urandom",
                             "clean install",
-                            "findbugs:findbugs"
+                            "spotbugs:spotbugs"
                     ]
 
                     infra.runMaven(mavenOptions, jdk)