From 903602d1830227c13d4fecfd5875a96d3e6d67fc Mon Sep 17 00:00:00 2001
From: res0nance <res0nance@users.noreply.github.com>
Date: Tue, 18 May 2021 21:40:26 +0800
Subject: [PATCH 1/2] Fix PCT failures past 2.281

---
 .../generator/DirectiveGeneratorTest.java              | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
index 9ec65a6f6..0fa5897b6 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
@@ -39,7 +39,9 @@
 import hudson.triggers.SCMTrigger;
 import hudson.triggers.TimerTrigger;
 import hudson.triggers.Trigger;
+import hudson.util.VersionNumber;
 import jenkins.model.BuildDiscarderProperty;
+import jenkins.model.Jenkins;
 import jenkins.model.OptionalJobProperty;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -150,12 +152,12 @@ public void simpleInput() throws Exception {
 
     // TODO: Remove once we move to a baseline of 2.90 or later
     private String trimParamOrEmpty() {
-        try {
-            StringParameterDefinition.class.getMethod("isTrim");
-            return ", trim: false";
-        } catch (NoSuchMethodException e) {
+        if (Jenkins.getVersion().isNewerThanOrEqualTo(new VersionNumber("2.281"))) {
             return "";
         }
+        else {
+            return ", trim: false";
+        }
     }
 
     @Test

From 058a12ed46eb866f81ed265b8a19516a44ff71ce Mon Sep 17 00:00:00 2001
From: Raihaan Shouhell <raihaanhimself@gmail.com>
Date: Wed, 19 May 2021 00:12:14 +0800
Subject: [PATCH 2/2] Reword comment

---
 .../modeldefinition/generator/DirectiveGeneratorTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
index 0fa5897b6..d326554f6 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/generator/DirectiveGeneratorTest.java
@@ -150,7 +150,7 @@ public void simpleInput() throws Exception {
                         "}");
     }
 
-    // TODO: Remove once we move to a baseline of 2.90 or later
+    // TODO: Remove once we move to a baseline of 2.281 or later
     private String trimParamOrEmpty() {
         if (Jenkins.getVersion().isNewerThanOrEqualTo(new VersionNumber("2.281"))) {
             return "";