diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 4e0774d..9440b18 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.13</version>
   </extension>
 </extensions>
diff --git a/Jenkinsfile b/Jenkinsfile
index 09032da..347471d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,6 @@ buildPlugin(
   forkCount: '1C', // run this number of tests in parallel for faster feedback.  If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
-    [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
+    [platform: 'linux', jdk: 25],
+    [platform: 'windows', jdk: 21],
 ])
diff --git a/pom.xml b/pom.xml
index 15abc97..d21f54a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.7</version>
+    <version>5.2102.v5f5fe09fccf1</version>
     <relativePath />
   </parent>
 
@@ -37,7 +37,7 @@ limitations under the License.
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.baseline>2.528</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>
   </properties>
 
@@ -82,7 +82,7 @@ limitations under the License.
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>4136.vca_c3202a_7fd1</version>
+        <version>5829.v04f53fa_f8705</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/src/main/java/com/google/jenkins/flakyTestHandler/junit/FlakyCaseResult.java b/src/main/java/com/google/jenkins/flakyTestHandler/junit/FlakyCaseResult.java
index bb233fa..d125a43 100644
--- a/src/main/java/com/google/jenkins/flakyTestHandler/junit/FlakyCaseResult.java
+++ b/src/main/java/com/google/jenkins/flakyTestHandler/junit/FlakyCaseResult.java
@@ -19,6 +19,7 @@
 
 import com.google.jenkins.flakyTestHandler.plugin.JUnitFlakyTestDataAction;
 
+import jakarta.annotation.Nonnull;
 import org.apache.commons.io.FileUtils;
 import org.dom4j.Element;
 import org.jvnet.localizer.Localizable;
@@ -37,8 +38,6 @@
 import java.util.Objects;
 import java.util.logging.Logger;
 
-import javax.annotation.Nonnull;
-
 import hudson.model.AbstractBuild;
 import hudson.tasks.junit.Messages;
 import hudson.tasks.junit.TestAction;
diff --git a/src/main/java/com/google/jenkins/flakyTestHandler/plugin/HistoryAggregatedFlakyTestResultAction.java b/src/main/java/com/google/jenkins/flakyTestHandler/plugin/HistoryAggregatedFlakyTestResultAction.java
index e270e1e..944d06c 100644
--- a/src/main/java/com/google/jenkins/flakyTestHandler/plugin/HistoryAggregatedFlakyTestResultAction.java
+++ b/src/main/java/com/google/jenkins/flakyTestHandler/plugin/HistoryAggregatedFlakyTestResultAction.java
@@ -21,6 +21,7 @@
 import com.google.jenkins.flakyTestHandler.plugin.FlakyTestResultAction.FlakyRunStats;
 import com.google.jenkins.flakyTestHandler.plugin.deflake.DeflakeCause;
 
+import jakarta.annotation.Nonnull;
 import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse2;
 
@@ -34,7 +35,6 @@
 import java.util.Stack;
 import java.util.TreeMap;
 
-import javax.annotation.Nonnull;
 import jakarta.servlet.ServletException;
 import jenkins.triggers.SCMTriggerItem;
 import hudson.model.AbstractProject;
diff --git a/src/main/java/com/google/jenkins/flakyTestHandler/plugin/deflake/DeflakeAction.java b/src/main/java/com/google/jenkins/flakyTestHandler/plugin/deflake/DeflakeAction.java
index 82e2b91..ff139c5 100644
--- a/src/main/java/com/google/jenkins/flakyTestHandler/plugin/deflake/DeflakeAction.java
+++ b/src/main/java/com/google/jenkins/flakyTestHandler/plugin/deflake/DeflakeAction.java
@@ -20,6 +20,7 @@
 import com.google.jenkins.flakyTestHandler.plugin.FlakyTestResultAction;
 
 import hudson.model.*;
+import jakarta.annotation.Nonnull;
 import net.sf.json.JSONObject;
 
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -34,7 +35,6 @@
 import java.util.Set;
 import java.util.logging.Level;
 
-import javax.annotation.Nonnull;
 import jakarta.servlet.ServletException;
 
 import jenkins.model.Jenkins;