Refresh plugin for March 2023

jenkinsci · Mar 22, 2023 · 5750774 · 5750774
1 parent d87fb65
commit 5750774
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git 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
@@ -55,13 +55,10 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <systemProperties combine.children="append">
-            <property>
-              <!-- some of the AbstractModelDefTest’s run for a long time with @ClassRule JenkinsRule -->
-              <name>jenkins.test.timeout</name>
-              <value>600</value>
-            </property>
-          </systemProperties>
+          <systemPropertyVariables combine.children="append">
+            <!-- some of the AbstractModelDefTest’s run for a long time with @ClassRule JenkinsRule -->
+            <jenkins.test.timeout>600</jenkins.test.timeout>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
     </plugins>

diff --git a/...c/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ASTParserUtilsTest.java b/...c/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
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.45</version>
+    <version>4.56</version>
     <relativePath />
   </parent>
 
@@ -74,8 +74,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.332.x</artifactId>
-        <version>1478.v81d3dc4f9a_43</version>
+        <artifactId>bom-2.361.x</artifactId>
+        <version>1935.v530f4395930f</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -84,11 +84,6 @@
         <artifactId>jenkins-test-harness-tools</artifactId>
         <version>2.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>copyartifact</artifactId>
-        <version>1.46.4</version>
-      </dependency>
       <dependency>
         <groupId>com.github.java-json-tools</groupId>
         <artifactId>json-schema-validator</artifactId>
@@ -128,7 +123,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/pipeline-model-definition-plugin</gitHubRepo>
-    <jenkins.version>2.332.1</jenkins.version>
+    <jenkins.version>2.361.4</jenkins.version>
   </properties>
 
   <profiles>