Skip to content

Commit

Permalink
Merge pull request #173 from MarkEWaite/test-with-java-21
Browse files Browse the repository at this point in the history
Test with Java 21
  • Loading branch information
rsandell committed Nov 19, 2023
2 parents aaf7d55 + 4634d10 commit b78892c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
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.6</version>
<version>1.7</version>
</extension>
</extensions>
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
buildPlugin(useContainerAgent: true, configurations: [
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
])
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.63</version>
<version>4.75</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>2081.v85885a_d2e5c5</version>
<version>2102.v854b_fec19c92</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@ static Set<Class<?>> findSubtypes(Class<?> supertype) {
* @deprecated as of 1.2
* Use {@link #uninstantiate2(Object)}
*/
@Deprecated
public Map<String,Object> uninstantiate(T o) throws UnsupportedOperationException {
return uninstantiate2(o).toMap();
}
Expand Down Expand Up @@ -737,6 +738,7 @@ public UninstantiatedDescribable uninstantiate2(T o) throws UnsupportedOperation
*
* @deprecated as of 1.2. Use {@link #uninstantiate2_(Object)}
*/
@Deprecated
public static Map<String,Object> uninstantiate_(Object o) {
return uninstantiate__(o, o.getClass());
}
Expand Down

0 comments on commit b78892c

Please sign in to comment.