Skip to content

Commit b28bbc5

Browse files
Bump org.jenkins-ci.plugins:plugin from 5.27 to 5.28 (#1355)
* Bump org.jenkins-ci.plugins:plugin from 5.27 to 5.28 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.27 to 5.28. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](jenkinsci/plugin-pom@plugin-5.27...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] <[email protected]> * Format with spotless --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark Waite <[email protected]>
1 parent 1de5cef commit b28bbc5

File tree

7 files changed

+17
-34
lines changed

7 files changed

+17
-34
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>5.27</version>
8+
<version>5.28</version>
99
<relativePath />
1010
</parent>
1111

src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,9 +2297,7 @@ private Boolean fixSELinuxLabel(Path key, String label) {
22972297
}
22982298

22992299
if (!clue_sysfs && !clue_proc) { // && !clue_ls
2300-
listener.getLogger()
2301-
.println(
2302-
"""
2300+
listener.getLogger().println("""
23032301
[INFO] SELinux is present on the host \
23042302
and we could not confirm that it does not apply actively: \
23052303
will try to relabel temporary files now; this may complain \

src/main/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifier.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ public ServerKeyDatabase.Configuration getServerKeyDatabaseConfiguration() {
6565

6666
private void logHint(TaskListener listener) {
6767
listener.getLogger()
68-
.println(
69-
HyperlinkNote.encodeTo(
70-
"https://plugins.jenkins.io/git-client/#plugin-content-ssh-host-key-verification",
71-
"""
68+
.println(HyperlinkNote.encodeTo(
69+
"https://plugins.jenkins.io/git-client/#plugin-content-ssh-host-key-verification", """
7270
You're using 'Known hosts file' strategy to verify ssh host keys,\
7371
but your known_hosts file does not exist, please go to \
7472
'Manage Jenkins' -> 'Security' -> 'Git Host Key Verification Configuration' \

src/test/java/jmh/benchmark/FolderForBenchmark.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ public File newFolder(String... folderNames) throws IOException {
9191
private void validateFolderName(String folderName) throws IOException {
9292
File tempFile = new File(folderName);
9393
if (tempFile.getParent() != null) {
94-
String errorMsg =
95-
"""
94+
String errorMsg = """
9695
Folder name cannot consist of multiple path components separated by a file separator.\
9796
Please use newFolder('MyParentFolder','MyFolder') to create hierarchies of folders\
9897
""";

src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestUpdate.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -989,13 +989,11 @@ public void testGetSubmodules() throws Exception {
989989
.branch("tests/getSubmodules")
990990
.execute();
991991
List<IndexEntry> r = w.git.getSubmodules("HEAD");
992-
assertEquals(
993-
"""
992+
assertEquals("""
994993
[IndexEntry[mode=160000,type=commit,file=modules/firewall,object=978c8b223b33e203a5c766ecf79704a5ea9b35c8], \
995994
IndexEntry[mode=160000,type=commit,file=modules/ntp,object=b62fabbc2bb37908c44ded233e0f4bf479e45609], \
996995
IndexEntry[mode=160000,type=commit,file=modules/sshkeys,object=689c45ed57f0829735f9a2b16760c14236fe21d9]]\
997-
""",
998-
r.toString());
996+
""", r.toString());
999997
w.git.submoduleInit();
1000998
w.git.submoduleUpdate().execute();
1001999

src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,7 @@ private String randomEmail(String name) {
375375
@Issue("JENKINS-29977")
376376
void testChangelogVeryLong() throws Exception {
377377

378-
final String gitMessage =
379-
"""
378+
final String gitMessage = """
380379
Uno Dos Tres Cuatro Cinco Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut \
381380
posuere tellus eu efficitur tristique. In iaculis neque in dolor vulputate\
382381
sollicitudin eget a quam. Donec finibus sapien quis lectus euismod facilisis. Integer\
@@ -1787,8 +1786,7 @@ void testCheckoutWithoutLFSWhenLFSNotAvailable() throws Exception {
17871786
File uuidFile = new File(repoRoot, "uuid.txt");
17881787
String fileContent =
17891788
Files.readString(uuidFile.toPath(), StandardCharsets.UTF_8).trim();
1790-
String expectedContent =
1791-
"""
1789+
String expectedContent = """
17921790
version https://git-lfs.github.com/spec/v1
17931791
oid sha256:75d122e4160dc91480257ff72403e77ef276e24d7416ed2be56d4e726482d86e
17941792
size 33\
@@ -3339,8 +3337,7 @@ void test_git_branch_with_line_breaks_and_long_strings() {
33393337
return;
33403338
}
33413339
// Embedded \r (carriage return) must be retained in the gitBranchOutput
3342-
String gitBranchOutput =
3343-
"""
3340+
String gitBranchOutput = """
33443341
* (HEAD detached at b297853) b297853e667d5989801937beea30fcec7d1d2595 Commit message with line breaks\r very-long-string-with-more-than-44-characters
33453342
remotes/origin/master e0d3f46c4fdb8acd068b6b127356931411d16e23 Commit message with line breaks\r very-long-string-with-more-than-44-characters and some more text
33463343
remotes/origin/develop fc8996efc1066d9dae529e5187800f84995ca56f Single-line commit message

src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,19 @@
2525

2626
class AcceptFirstConnectionVerifierTest {
2727

28-
private static final String FILE_CONTENT =
29-
"""
28+
private static final String FILE_CONTENT = """
3029
|1|4MiAohNAs5mYhPnYkpnOUWXmMTA=|iKR8xF3kCEdmSch/QtdXfdjWMCo=\
3130
ssh-ed25519\
3231
AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl\
3332
""";
3433

35-
private static final String KEY_ECDSA_SHA_2_NISTP_256 =
36-
"""
34+
private static final String KEY_ECDSA_SHA_2_NISTP_256 = """
3735
|1|owDOW+8aankl2aFSPKPIXsIf31E=|lGZ9BEWUfa9HoQteyYE5wIqHJdo=,|1|eGv/ezgtZ9YMw7OHcykKKOvAINk=|3lpkF7XiveRl/D7XvTOMc3ra2kU=\
3836
ecdsa-sha2-nistp256\
3937
AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=\
4038
""";
4139

42-
private static final String KEY_SSH_RSA =
43-
"""
40+
private static final String KEY_SSH_RSA = """
4441
|1|HnmPCP38pBhCY0NUtBXSraOg9pM=|L6YZ9asEeb2xplTDEThGOxRq7ZY=\
4542
ssh-rsa\
4643
AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==\
@@ -148,8 +145,7 @@ void testVerifyServerHostKeyWhenHostnameWithoutPort() throws Exception {
148145
@Test
149146
void testVerifyServerHostKeyWhenSecondConnectionWhenNotDefaultAlgorithm() throws Exception {
150147
assumeTrue(runKnownHostsTests());
151-
String fileContent =
152-
"""
148+
String fileContent = """
153149
github.com,140.82.121.4\
154150
ecdsa-sha2-nistp256\
155151
AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=\
@@ -180,8 +176,7 @@ void testVerifyServerHostKeyWhenSecondConnectionWhenNotDefaultAlgorithm() throws
180176
@Disabled("FIXME not sure what is the test here")
181177
void testVerifyServerHostKeyWhenSecondConnectionWithNonEqualKeys() throws Exception {
182178
assumeTrue(runKnownHostsTests());
183-
String fileContent =
184-
"""
179+
String fileContent = """
185180
|1|f7esvmtaiBk+EMHjPzWbRYRpBPY=|T7Qe4QAksYPZPwYEx5QxQykSjfc=\
186181
ssh-ed25519\
187182
AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9OOOO\
@@ -212,8 +207,7 @@ void testVerifyServerHostKeyWhenSecondConnectionWithNonEqualKeys() throws Except
212207
@Test
213208
void testVerifyServerHostKeyWhenConnectionWithAnotherHost() throws Exception {
214209
assumeTrue(runKnownHostsTests());
215-
String bitbucketFileContent =
216-
"""
210+
String bitbucketFileContent = """
217211
|1|HnmPCP38pBhCY0NUtBXSraOg9pM=|L6YZ9asEeb2xplTDEThGOxRq7ZY=\
218212
ssh-rsa\
219213
AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==\
@@ -244,8 +238,7 @@ void testVerifyServerHostKeyWhenConnectionWithAnotherHost() throws Exception {
244238
@Test
245239
void testVerifyServerHostKeyWhenHostnamePortProvided() throws Exception {
246240
assumeTrue(runKnownHostsTests());
247-
String fileContent =
248-
"""
241+
String fileContent = """
249242
|1|6uMj3M7sLgZpn54vQbGqgPNTCVM=|OkV9Lu9REJZR5QCVrITAIY34I1M= \
250243
ssh-ed25519 \
251244
AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl\

0 commit comments

Comments
 (0)