chore: switch to 2.479 baseline

jenkinsci · Nov 25, 2024 · 1a67921 · 1a67921
1 parent a66a627
commit 1a67921
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.../test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepMavenExecResolutionTest.java b/.../test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepMavenExecResolutionTest.java
@@ -189,7 +189,7 @@ private void registerAgentForContainer(GenericContainer<?> slaveContainer) throw
         registerAgentForSlaveContainer(slaveContainer);
     }
 
-    private void addTestSshCredentials() {
+    private void addTestSshCredentials() throws Exception {
         Credentials credentials =
                 new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, SSH_CREDENTIALS_ID, null, "test", "test");
 

diff --git a/pipeline-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepTest.java b/pipeline-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepTest.java
@@ -242,7 +242,7 @@ private void registerAgentForContainer(GenericContainer<?> container) throws Exc
         registerAgentForSlaveContainer(container);
     }
 
-    private void addTestSshCredentials() {
+    private void addTestSshCredentials() throws Exception {
         Credentials credentials =
                 new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, SSH_CREDENTIALS_ID, null, "test", "test");
 

diff --git a/...aven/src/test/java/org/jenkinsci/plugins/pipeline/maven/util/FakeCredentialsProvider.java b/...aven/src/test/java/org/jenkinsci/plugins/pipeline/maven/util/FakeCredentialsProvider.java
@@ -36,9 +36,14 @@ public <C extends Credentials> List<C> getCredentials(
             ItemGroup itemGroup,
             Authentication authentication,
             List<DomainRequirement> domainRequirements) {
-        UsernamePasswordCredentialsImpl creds = new UsernamePasswordCredentialsImpl(GLOBAL, id, "", username, password);
-        creds.setUsernameSecret(usernameIsSecret);
-        return (List<C>) asList(creds);
+        UsernamePasswordCredentialsImpl creds;
+        try {
+            creds = new UsernamePasswordCredentialsImpl(GLOBAL, id, "", username, password);
+            creds.setUsernameSecret(usernameIsSecret);
+            return (List<C>) asList(creds);
+        } catch (FormException e) {
+            throw new IllegalStateException("Cannot create fake credentials", e);
+        }
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.3</version>
     <relativePath />
   </parent>
 
@@ -100,8 +100,8 @@
     <jenkins-plugin-mysql.version>8.4.0-31.va_b_5ce7933762</jenkins-plugin-mysql.version>
     <jenkins-plugin-postgresql.version>42.7.2-40.v76d376d65c77</jenkins-plugin-postgresql.version>
     <jenkins-plugin-tasks.version>4.53</jenkins-plugin-tasks.version>
-    <jenkins-tools-bom.version>3258.vcdcf15936a_fd</jenkins-tools-bom.version>
-    <jenkins.version>2.440.3</jenkins.version>
+    <jenkins-tools-bom.version>3696.vb_b_4e2d1a_0542</jenkins-tools-bom.version>
+    <jenkins.version>2.479.1</jenkins.version>
     <junit.version>5.11.3</junit.version>
     <mariadb-client.version>3.5.0</mariadb-client.version>
     <maven-plugin-sisu.version>0.3.5</maven-plugin-sisu.version>
@@ -120,7 +120,7 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.440.x</artifactId>
+        <artifactId>bom-2.479.x</artifactId>
         <version>${jenkins-tools-bom.version}</version>
         <type>pom</type>
         <scope>import</scope>