Skip to content

Commit 4d91d24

Browse files
authored
Merge pull request #1249 from MarkEWaite/test-java-17
Test with Java 17 in addition to Java 11 and Java 8
2 parents 1435a5e + 6b8a319 commit 4d91d24

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
buildPlugin(failFast: false,
44
configurations: [
5-
[platform: 'linux', jdk: '11'],
6-
[platform: 'windows', jdk: '8'],
5+
[platform: 'linux', jdk: '17', jenkins: '2.342'],
6+
[platform: 'linux', jdk: '11'],
7+
[platform: 'windows', jdk: '8'],
78
])

pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
<revision>4.11.1</revision>
6262
<changelist>-SNAPSHOT</changelist>
6363
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
64-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65-
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
6664
<jenkins.version>2.289.1</jenkins.version>
6765
<no-test-jar>false</no-test-jar>
6866
<useBeta>true</useBeta>

src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public FilePath getWorkingDirectory(GitSCM scm, AbstractProject<?, ?> context, F
104104
* the chosen revision and returning it) or manipulate the state of the working tree (such as
105105
* running git-clean.)
106106
*
107-
* <h3>{@link #decorateRevisionToBuild(GitSCM, Run, GitClient, TaskListener, Revision, Revision)} vs {@link BuildChooser}</h3>
107+
* <strong>{@link #decorateRevisionToBuild(GitSCM, Run, GitClient, TaskListener, Revision, Revision)} vs {@link BuildChooser}</strong>
108108
* <p>
109109
* {@link BuildChooser} and this method are similar in the sense that they both participate in the process
110110
* of determining what commits to build. So when a plugin wants to control the commit to be built, you have

0 commit comments

Comments
 (0)