Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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],
])
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading