From 6859c270685ed1722d5f98826268b0f050d5f22b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Nov 2025 15:02:09 +0000 Subject: [PATCH 1/2] Bump org.jenkins-ci.plugins:plugin from 5.26 to 5.28 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.26 to 5.28. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-5.26...plugin-5.28) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-version: '5.28' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ed059b2..66927b93 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. org.jenkins-ci.plugins plugin - 5.26 + 5.28 From cefb6be823516630b8e4048dabd77ceeeb1d33e4 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Sun, 2 Nov 2025 12:36:08 +0100 Subject: [PATCH 2/2] Apply spotless formatting changes --- .../plugins/jclouds/cli/ReplacementsTest.java | 9 +++------ .../jenkins/plugins/jclouds/compute/TestHelper.java | 6 ++---- .../plugins/jclouds/compute/UserDataCommandTest.java | 6 ++---- .../plugins/jclouds/internal/CryptoHelperTest.java | 12 ++++-------- .../jclouds/internal/SSHPublicKeyExtractorTest.java | 12 ++++-------- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/test/java/jenkins/plugins/jclouds/cli/ReplacementsTest.java b/src/test/java/jenkins/plugins/jclouds/cli/ReplacementsTest.java index ae270384..8d28d1b9 100644 --- a/src/test/java/jenkins/plugins/jclouds/cli/ReplacementsTest.java +++ b/src/test/java/jenkins/plugins/jclouds/cli/ReplacementsTest.java @@ -22,8 +22,7 @@ void testOut() throws Exception { @Test void testIn() throws Exception { - String rxml = - """ + String rxml = """ @@ -39,8 +38,7 @@ void testIn() throws Exception { @Test void testReplace() throws Exception { - String rxml = - """ + String rxml = """ @@ -55,8 +53,7 @@ void testReplace() throws Exception { @Test void testReplaceXml() throws Exception { - String rxml = - """ + String rxml = """ diff --git a/src/test/java/jenkins/plugins/jclouds/compute/TestHelper.java b/src/test/java/jenkins/plugins/jclouds/compute/TestHelper.java index 8418e43f..645812cc 100644 --- a/src/test/java/jenkins/plugins/jclouds/compute/TestHelper.java +++ b/src/test/java/jenkins/plugins/jclouds/compute/TestHelper.java @@ -30,8 +30,7 @@ public static boolean findTemplate(JenkinsRule j, String cloud, String name) { return true; } - private static final String RSA_PEM = - """ + private static final String RSA_PEM = """ -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAujBFmpi6nyHAK6RBaIkERTO/BGhgZ8h2zoqvT12+mSpjbNRF YN2oeMH1NsUMYLUdRzFlERqHo/U5pgS9SbXTvUujM153Voh6P+t4d822I2UN7vDc @@ -61,8 +60,7 @@ public static boolean findTemplate(JenkinsRule j, String cloud, String name) { -----END RSA PRIVATE KEY----- """; - private static final String ECDSA_PEM = - """ + private static final String ECDSA_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS 1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQL0Pqfy/oa5tr7GUl8WjHoWNnWozMV diff --git a/src/test/java/jenkins/plugins/jclouds/compute/UserDataCommandTest.java b/src/test/java/jenkins/plugins/jclouds/compute/UserDataCommandTest.java index 4f4f70df..f290cdb7 100644 --- a/src/test/java/jenkins/plugins/jclouds/compute/UserDataCommandTest.java +++ b/src/test/java/jenkins/plugins/jclouds/compute/UserDataCommandTest.java @@ -283,8 +283,7 @@ void testUserDataEncryptDecrypt(JenkinsRule j) throws Exception { assertThat(newCfgreps, equalTo(origCfgreps)); } - private static final String RSA_PEM = - """ + private static final String RSA_PEM = """ -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAujBFmpi6nyHAK6RBaIkERTO/BGhgZ8h2zoqvT12+mSpjbNRF YN2oeMH1NsUMYLUdRzFlERqHo/U5pgS9SbXTvUujM153Voh6P+t4d822I2UN7vDc @@ -314,8 +313,7 @@ void testUserDataEncryptDecrypt(JenkinsRule j) throws Exception { -----END RSA PRIVATE KEY----- """; - private static final String ECDSA_PEM = - """ + private static final String ECDSA_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS 1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQL0Pqfy/oa5tr7GUl8WjHoWNnWozMV diff --git a/src/test/java/jenkins/plugins/jclouds/internal/CryptoHelperTest.java b/src/test/java/jenkins/plugins/jclouds/internal/CryptoHelperTest.java index f5038d08..012096be 100644 --- a/src/test/java/jenkins/plugins/jclouds/internal/CryptoHelperTest.java +++ b/src/test/java/jenkins/plugins/jclouds/internal/CryptoHelperTest.java @@ -22,8 +22,7 @@ @WithJenkins class CryptoHelperTest { - private static final String RSA_2048_PEM = - """ + private static final String RSA_2048_PEM = """ -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAujBFmpi6nyHAK6RBaIkERTO/BGhgZ8h2zoqvT12+mSpjbNRF YN2oeMH1NsUMYLUdRzFlERqHo/U5pgS9SbXTvUujM153Voh6P+t4d822I2UN7vDc @@ -53,8 +52,7 @@ class CryptoHelperTest { -----END RSA PRIVATE KEY----- """; - private static final String RSA_3072_PEM = - """ + private static final String RSA_3072_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn NhAAAAAwEAAQAAAYEAkDhQoShgSFvCfNQIgwYVbGYSmxPD/3/7q8L83GSxmCxeei0dj4Ao @@ -94,8 +92,7 @@ class CryptoHelperTest { weutDFT4xIYu8AAAAWZmVsZmVydEBmcml0ei5mZS50aGluawECAwQF -----END OPENSSH PRIVATE KEY----- """; - private static final String RSA_4096_PEM = - """ + private static final String RSA_4096_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAACFwAAAAdzc2gtcn NhAAAAAwEAAQAAAgEA2P8WQIfUf5C3XF269HrU8S/ahoBRofQePlqAQDyRQc/8nNEsnDPD @@ -147,8 +144,7 @@ class CryptoHelperTest { -----END OPENSSH PRIVATE KEY----- """; - private static final String ECDSA_PEM = - """ + private static final String ECDSA_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS 1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQL0Pqfy/oa5tr7GUl8WjHoWNnWozMV diff --git a/src/test/java/jenkins/plugins/jclouds/internal/SSHPublicKeyExtractorTest.java b/src/test/java/jenkins/plugins/jclouds/internal/SSHPublicKeyExtractorTest.java index d60ed540..baea29f6 100644 --- a/src/test/java/jenkins/plugins/jclouds/internal/SSHPublicKeyExtractorTest.java +++ b/src/test/java/jenkins/plugins/jclouds/internal/SSHPublicKeyExtractorTest.java @@ -11,8 +11,7 @@ */ class SSHPublicKeyExtractorTest { - private static final String RSA_PEM = - """ + private static final String RSA_PEM = """ -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAujBFmpi6nyHAK6RBaIkERTO/BGhgZ8h2zoqvT12+mSpjbNRF YN2oeMH1NsUMYLUdRzFlERqHo/U5pgS9SbXTvUujM153Voh6P+t4d822I2UN7vDc @@ -50,8 +49,7 @@ class SSHPublicKeyExtractorTest { + "Q3UDT4XBZJrVoyXWiFTMRj6PqkifYB4IeAnb3RLERMZHMkEbavff/0wCdJxZ1OVqh6m" + "CenQgr4J9fMIf65"; - private static final String DSA_PEM = - """ + private static final String DSA_PEM = """ -----BEGIN DSA PRIVATE KEY----- MIIBugIBAAKBgQCkmZ26oY3DJJ0cH/HVy65WNSMxk7cvNYq/AUvoXbgG/8S+2I70 lamh6i0MvIYsUdPawJk8FIZPo+YNrR8kpVhOE9kWaJLLstSun2ieC1kjGbvUQxQK @@ -77,8 +75,7 @@ class SSHPublicKeyExtractorTest { + "ntPGVE4WLGgrSjM+M06LIhNL/E3wu50YRBDvOdN/xusxDjOdAWyZh2qY/Z9CbVix7lwT" + "Qus1oEumEMQ=="; - private static final String ECDSA_PEM = - """ + private static final String ECDSA_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS 1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQL0Pqfy/oa5tr7GUl8WjHoWNnWozMV @@ -93,8 +90,7 @@ class SSHPublicKeyExtractorTest { + "XNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAvQ+p/L+hrm2vsZSXxaMehY2dajM" + "xV/8yWeHsJ3Ht3ailUyORt5x8wBeiSBM5eyyltPVr402qq5v3i6UJFFadc="; - private static final String ED25519_PEM = - """ + private static final String ED25519_PEM = """ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW QyNTUxOQAAACBIfalPqPWFPLQNy37Jdc7lIVSu9stxBqDGEyZQe1xc7wAAAKAUZQXDFGUF