diff --git a/Jenkinsfile b/Jenkinsfile
index ac2746f31..f56231903 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,4 @@
buildPlugin(timeout: 120, useContainerAgent: true, configurations: [
- [ platform: 'linux', jdk: '8'],
- [ platform: 'windows', jdk: '8'],
- [ platform: 'linux', jdk: '11']
+ [platform: 'linux', jdk: 17],
+ [platform: 'windows', jdk: 11],
])
diff --git a/pipeline-model-definition/pom.xml b/pipeline-model-definition/pom.xml
index e53d18d96..52d273232 100644
--- a/pipeline-model-definition/pom.xml
+++ b/pipeline-model-definition/pom.xml
@@ -55,13 +55,10 @@
maven-surefire-plugin
-
-
-
- jenkins.test.timeout
- 600
-
-
+
+
+ 600
+
diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ASTParserUtilsTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ASTParserUtilsTest.java
index a17c7c6fd..50401177f 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ASTParserUtilsTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ASTParserUtilsTest.java
@@ -86,6 +86,6 @@ public void call(SourceUnit source) throws CompilationFailedException {
.replaceAll("(__model__.*?_\\d+)_\\d+__", "$1_something__")
.replaceAll("ConstantExpression\\[\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", "ConstantExpression[some-uuid");
String expected = fileContentsFromResources("prettyPrintTransformedOutput.txt");
- assertEquals(expected.split("\\n"), prettyPrint.split("\\n"));
+ assertEquals(expected.split("\\R"), prettyPrint.split("\\R"));
}
}
diff --git a/pom.xml b/pom.xml
index 4c205450c..4a322c38e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.jenkins-ci.plugins
plugin
- 4.45
+ 4.56
@@ -74,8 +74,8 @@
io.jenkins.tools.bom
- bom-2.332.x
- 1478.v81d3dc4f9a_43
+ bom-2.361.x
+ 1935.v530f4395930f
import
pom
@@ -84,11 +84,6 @@
jenkins-test-harness-tools
2.2
-
- org.jenkins-ci.plugins
- copyartifact
- 1.46.4
-
com.github.java-json-tools
json-schema-validator
@@ -128,7 +123,7 @@
999999-SNAPSHOT
jenkinsci/pipeline-model-definition-plugin
- 2.332.1
+ 2.361.4