Skip to content

Commit 0ce2657

Browse files
authored
Migrate from EE 8 to EE 9 (#516)
1 parent 852c802 commit 0ce2657

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>org.jenkins-ci.plugins</groupId>
1919
<artifactId>plugin</artifactId>
20-
<version>4.76</version>
20+
<version>5.7</version>
2121
<relativePath />
2222
</parent>
2323

@@ -66,8 +66,8 @@
6666
<changelist>999999-SNAPSHOT</changelist>
6767
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
6868
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
69-
<jenkins.baseline>2.452</jenkins.baseline>
70-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
69+
<jenkins.baseline>2.479</jenkins.baseline>
70+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
7171
<skip.surefire.tests>${skipTests}</skip.surefire.tests>
7272
<skipITs>true</skipITs>
7373
<it.windows>false</it.windows>
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>io.jenkins.tools.bom</groupId>
9494
<artifactId>bom-${jenkins.baseline}.x</artifactId>
95-
<version>3208.vb_21177d4b_cd9</version>
95+
<version>3893.v213a_42768d35</version>
9696
<type>pom</type>
9797
<scope>import</scope>
9898
</dependency>

src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineCloud.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.jenkins.plugins.computeengine;
1818

19-
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
19+
import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
2020

2121
import com.cloudbees.plugins.credentials.CredentialsMatchers;
2222
import com.cloudbees.plugins.credentials.CredentialsProvider;
@@ -47,6 +47,7 @@
4747
import hudson.util.FormValidation;
4848
import hudson.util.HttpResponses;
4949
import hudson.util.ListBoxModel;
50+
import jakarta.servlet.ServletException;
5051
import java.io.IOException;
5152
import java.io.PrintStream;
5253
import java.security.GeneralSecurityException;
@@ -64,7 +65,6 @@
6465
import java.util.logging.Logger;
6566
import java.util.logging.SimpleFormatter;
6667
import java.util.stream.Collectors;
67-
import javax.servlet.ServletException;
6868
import jenkins.model.Jenkins;
6969
import lombok.Getter;
7070
import lombok.extern.java.Log;

src/test/java/com/google/jenkins/plugins/computeengine/integration/CleanLostNodesWorkIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.google.common.collect.ImmutableList;
1616
import com.google.jenkins.plugins.computeengine.CleanLostNodesWork;
1717
import com.google.jenkins.plugins.computeengine.ComputeEngineCloud;
18-
import java.io.IOException;
1918
import java.util.List;
2019
import java.util.Map;
2120
import java.util.concurrent.TimeUnit;
@@ -179,7 +178,7 @@ public void testLostNodeCleanedUpBySecondController() throws Throwable {
179178
});
180179
}
181180

182-
private static WorkflowJob createPipeline(JenkinsRule j) throws IOException {
181+
private static WorkflowJob createPipeline(JenkinsRule j) throws Exception {
183182
var p1 = j.createProject(WorkflowJob.class, "p1");
184183
/* Sleep the pipeline for a duration that ensures the periodic task runs `CleanLostNodesWork.LOST_MULTIPLIER
185184
+ 1` times. This guarantees that if the VM is to be deleted, it will be deleted. The sleep is split into two

src/test/java/com/google/jenkins/plugins/computeengine/integration/SpotVmProvisioningWithMaxRunDurationCasCIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void testMaxRunDurationDeletesAndNoNewBuilds() throws Exception {
162162
assertThat("Build didn't run on GCP", JenkinsRule.getLog(run), is(containsString(agentName)));
163163
}
164164

165-
private void createProjects() throws IOException {
165+
private void createProjects() throws Exception {
166166
// create a freestyle project
167167
FreeStyleProject fp = j.createFreeStyleProject("f");
168168
Builder step = execute(Commands.ECHO, "hello world");

0 commit comments

Comments
 (0)