diff --git a/Jenkinsfile b/Jenkinsfile index 5ff86e3a4f..191bef87f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,7 @@ buildPlugin(failFast: false, configurations: [ - [platform: 'linux', jdk: '11'], - [platform: 'windows', jdk: '8'], + [platform: 'linux', jdk: '17', jenkins: '2.342'], + [platform: 'linux', jdk: '11'], + [platform: 'windows', jdk: '8'], ]) diff --git a/pom.xml b/pom.xml index 34e29fa12f..94a7c997b2 100644 --- a/pom.xml +++ b/pom.xml @@ -61,8 +61,6 @@ 4.11.1 -SNAPSHOT jenkinsci/${project.artifactId}-plugin - UTF-8 - -Dfile.encoding=${project.build.sourceEncoding} 2.289.1 false true diff --git a/src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java b/src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java index af87919873..98180eee62 100644 --- a/src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java +++ b/src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java @@ -104,7 +104,7 @@ public FilePath getWorkingDirectory(GitSCM scm, AbstractProject context, F * the chosen revision and returning it) or manipulate the state of the working tree (such as * running git-clean.) * - *

{@link #decorateRevisionToBuild(GitSCM, Run, GitClient, TaskListener, Revision, Revision)} vs {@link BuildChooser}

+ * {@link #decorateRevisionToBuild(GitSCM, Run, GitClient, TaskListener, Revision, Revision)} vs {@link BuildChooser} *

* {@link BuildChooser} and this method are similar in the sense that they both participate in the process * of determining what commits to build. So when a plugin wants to control the commit to be built, you have