From 1eedafc62604bdc653c20452a8237fab46a1906d Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 22 Nov 2021 16:28:35 -0800
Subject: [PATCH] Bump `json-schema-validator` from 2.0.4 to 2.2.14

---
 pipeline-model-api/pom.xml                        |  3 ++-
 .../pipeline/modeldefinition/ASTSchema.java       |  2 +-
 pipeline-model-definition/pom.xml                 |  1 +
 .../plugins/pipeline/modeldefinition/Utils.groovy | 13 ++++++-------
 .../modeldefinition/parser/Converter.groovy       | 10 +++++-----
 .../modeldefinition/parser/JSONParser.groovy      | 12 ++++++------
 .../validator/JSONErrorCollector.groovy           |  4 ++--
 .../endpoints/ModelConverterAction.java           |  4 ++--
 .../modeldefinition/AbstractModelDefTest.java     |  8 ++++----
 .../modeldefinition/BaseParserLoaderTest.java     |  4 ++--
 .../RestartDeclarativePipelineActionTest.java     |  2 +-
 .../modeldefinition/validator/JSONSchemaTest.java |  4 ++--
 pipeline-model-extensions/pom.xml                 |  1 +
 .../pipeline/modeldefinition/CommonUtils.java     |  5 ++---
 pipeline-stage-tags-metadata/pom.xml              |  1 +
 pom.xml                                           | 15 ++++++++-------
 16 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/pipeline-model-api/pom.xml b/pipeline-model-api/pom.xml
index 7485a8201..0972b23a6 100644
--- a/pipeline-model-api/pom.xml
+++ b/pipeline-model-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ The MIT License
   ~
@@ -44,7 +45,7 @@
       <artifactId>jackson2-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.github.fge</groupId>
+      <groupId>com.github.java-json-tools</groupId>
       <artifactId>json-schema-validator</artifactId>
       <exclusions>
         <exclusion>
diff --git a/pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java b/pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java
index fee44fd34..0b06bfa9c 100644
--- a/pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java
+++ b/pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java
@@ -24,7 +24,7 @@
 
 package org.jenkinsci.plugins.pipeline.modeldefinition;
 
-import com.github.fge.jsonschema.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
 import com.github.fge.jsonschema.main.JsonSchema;
 import com.github.fge.jsonschema.main.JsonSchemaFactory;
 import hudson.Extension;
diff --git a/pipeline-model-definition/pom.xml b/pipeline-model-definition/pom.xml
index 25437fc44..f6df95db2 100644
--- a/pipeline-model-definition/pom.xml
+++ b/pipeline-model-definition/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ The MIT License
   ~
diff --git a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
index d005c5771..2f15d66b3 100644
--- a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
+++ b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
@@ -25,9 +25,9 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.github.fge.jsonschema.tree.JsonTree
-import com.github.fge.jsonschema.tree.SimpleJsonTree
-import com.github.fge.jsonschema.util.JsonLoader
+import com.github.fge.jsonschema.core.tree.JsonTree
+import com.github.fge.jsonschema.core.tree.SimpleJsonTree
+import com.github.fge.jackson.JsonLoader
 import com.google.common.base.Predicate
 import com.google.common.cache.CacheBuilder
 import com.google.common.cache.CacheLoader
@@ -91,7 +91,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse
 
 import edu.umd.cs.findbugs.annotations.CheckForNull
 import edu.umd.cs.findbugs.annotations.NonNull
-import edu.umd.cs.findbugs.annotations.Nullable
 import javax.lang.model.SourceVersion
 import java.util.concurrent.TimeUnit
 
@@ -158,7 +157,7 @@ class Utils {
     static Predicate<FlowNode> nodeIdNotEquals(final FlowNode original) {
         return new Predicate<FlowNode>() {
             @Override
-            boolean apply(@Nullable FlowNode input) {
+            boolean apply(FlowNode input) {
                 return input == null || original == null || original.id != input.id
             }
         }
@@ -167,7 +166,7 @@ class Utils {
     static Predicate<FlowNode> endNodeForStage(final BlockStartNode startNode) {
         return new Predicate<FlowNode>() {
             @Override
-            boolean apply(@Nullable FlowNode input) {
+            boolean apply(FlowNode input) {
                 return input != null &&
                     input instanceof BlockEndNode &&
                     input.getStartNode() == startNode
@@ -212,7 +211,7 @@ class Utils {
     static Predicate<FlowNode> isParallelBranchFlowNode(final String stageName, FlowExecution execution = null) {
         return new Predicate<FlowNode>() {
             @Override
-            boolean apply(@Nullable FlowNode input) {
+            boolean apply(FlowNode input) {
                 if (input != null) {
                     if (input.getAction(LabelAction.class) != null &&
                         input.getAction(ThreadNameAction.class) != null &&
diff --git a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy
index a9ffe3368..c1daafa19 100644
--- a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy
+++ b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy
@@ -25,12 +25,12 @@ package org.jenkinsci.plugins.pipeline.modeldefinition.parser
 
 import com.cloudbees.groovy.cps.NonCPS
 import com.fasterxml.jackson.databind.JsonNode
-import com.github.fge.jsonschema.exceptions.ProcessingException
+import com.github.fge.jsonschema.core.exceptions.ProcessingException
 import com.github.fge.jsonschema.main.JsonSchema
-import com.github.fge.jsonschema.report.ProcessingReport
-import com.github.fge.jsonschema.tree.JsonTree
-import com.github.fge.jsonschema.tree.SimpleJsonTree
-import com.github.fge.jsonschema.util.JsonLoader
+import com.github.fge.jsonschema.core.report.ProcessingReport
+import com.github.fge.jsonschema.core.tree.JsonTree
+import com.github.fge.jsonschema.core.tree.SimpleJsonTree
+import com.github.fge.jackson.JsonLoader
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import jenkins.model.Jenkins
 import net.sf.json.JSONObject
diff --git a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
index 970c914e1..c555d08f5 100644
--- a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
+++ b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
@@ -24,12 +24,12 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition.parser
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.github.fge.jsonschema.exceptions.JsonReferenceException
-import com.github.fge.jsonschema.exceptions.ProcessingException
-import com.github.fge.jsonschema.jsonpointer.JsonPointer
-import com.github.fge.jsonschema.report.ProcessingMessage
-import com.github.fge.jsonschema.report.ProcessingReport
-import com.github.fge.jsonschema.tree.JsonTree
+import com.github.fge.jsonschema.core.exceptions.JsonReferenceException
+import com.github.fge.jsonschema.core.exceptions.ProcessingException
+import com.github.fge.jackson.jsonpointer.JsonPointer
+import com.github.fge.jsonschema.core.report.ProcessingMessage
+import com.github.fge.jsonschema.core.report.ProcessingReport
+import com.github.fge.jsonschema.core.tree.JsonTree
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import org.jenkinsci.plugins.pipeline.modeldefinition.Messages
 import org.jenkinsci.plugins.pipeline.modeldefinition.ModelStepLoader
diff --git a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONErrorCollector.groovy b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONErrorCollector.groovy
index b40222434..149e39982 100644
--- a/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONErrorCollector.groovy
+++ b/pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONErrorCollector.groovy
@@ -23,8 +23,8 @@
  */
 package org.jenkinsci.plugins.pipeline.modeldefinition.validator
 
-import com.github.fge.jsonschema.jsonpointer.JsonPointer
-import com.github.fge.jsonschema.tree.JsonTree
+import com.github.fge.jackson.jsonpointer.JsonPointer
+import com.github.fge.jsonschema.core.tree.JsonTree
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import net.sf.json.JSONArray
 import net.sf.json.JSONObject
diff --git a/pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java b/pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java
index 91167aa7f..605dccf26 100644
--- a/pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java
+++ b/pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java
@@ -24,8 +24,8 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition.endpoints;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jsonschema.tree.SimpleJsonTree;
-import com.github.fge.jsonschema.util.JsonLoader;
+import com.github.fge.jsonschema.core.tree.SimpleJsonTree;
+import com.github.fge.jackson.JsonLoader;
 import com.google.common.collect.ImmutableList;
 import hudson.Extension;
 import hudson.model.RootAction;
diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
index d04bef947..d718da211 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
@@ -221,7 +221,7 @@ public static Iterable<Object[]> configsWithErrors() {
 
         result.add(new Object[]{"perStageConfigEmptySteps", Messages.JSONParser_TooFewItems(0, 1)});
         result.add(new Object[]{"perStageConfigMissingSteps", Messages.JSONParser_MissingRequiredProperties("'steps'")});
-        result.add(new Object[]{"perStageConfigUnknownSection", "additional properties are not allowed"});
+        result.add(new Object[]{"perStageConfigUnknownSection", "object instance has properties which are not allowed by the schema"});
 
         result.add(new Object[]{"unknownAgentType", Messages.ModelValidatorImpl_InvalidAgentType("foo", "[any, label, none, otherField]")});
 
@@ -234,7 +234,7 @@ public static Iterable<Object[]> configsWithErrors() {
         result.add(new Object[]{"unknownBareAgentType", Messages.ModelValidatorImpl_InvalidAgentType("foo", legalAgentTypes)});
         result.add(new Object[]{"agentMissingRequiredParam", Messages.ModelValidatorImpl_MultipleAgentParameters("otherField", "[label, otherField]")});
         result.add(new Object[]{"agentUnknownParamForType", Messages.ModelValidatorImpl_InvalidAgentParameter("fruit", "otherField", "[label, otherField, nested]")});
-        result.add(new Object[]{"notificationsSectionRemoved", "additional properties are not allowed"});
+        result.add(new Object[]{"notificationsSectionRemoved", "object instance has properties which are not allowed by the schema"});
         result.add(new Object[]{"unknownWhenConditional", Messages.ModelValidatorImpl_UnknownWhenConditional("banana",
                 "allOf, anyOf, branch, buildingTag, changeRequest, changelog, changeset, environment, equals, expression, isRestartedRun, not, tag")});
         result.add(new Object[]{"whenInvalidParameterType", Messages.ModelValidatorImpl_InvalidUnnamedParameterType("class java.lang.String", 4, Integer.class)});
@@ -280,8 +280,8 @@ public static Iterable<Object[]> configsWithErrors() {
 
 
         // TODO: Better error messaging for these schema violations.
-        result.add(new Object[]{"nestedWhenWithArgs", "instance failed to match at least one schema"});
-        result.add(new Object[]{"invalidWhenWithChildren", "instance failed to match at least one schema"});
+        result.add(new Object[]{"nestedWhenWithArgs", "instance failed to match at least one required schema among 2"});
+        result.add(new Object[]{"invalidWhenWithChildren", "instance failed to match at least one required schema among 2"});
 
         result.add(new Object[]{"malformed", "Unexpected close marker ']': expected '}'"});
 
diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BaseParserLoaderTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BaseParserLoaderTest.java
index 3a942b1ad..abf78cc1c 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BaseParserLoaderTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BaseParserLoaderTest.java
@@ -24,8 +24,8 @@
 package org.jenkinsci.plugins.pipeline.modeldefinition;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jsonschema.tree.SimpleJsonTree;
-import com.github.fge.jsonschema.util.JsonLoader;
+import com.github.fge.jsonschema.core.tree.SimpleJsonTree;
+import com.github.fge.jackson.JsonLoader;
 import org.codehaus.groovy.control.ErrorCollector;
 import org.codehaus.groovy.control.Janitor;
 import org.codehaus.groovy.control.MultipleCompilationErrorsException;
diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/actions/RestartDeclarativePipelineActionTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/actions/RestartDeclarativePipelineActionTest.java
index 4c689b2cf..068c1f53e 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/actions/RestartDeclarativePipelineActionTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/actions/RestartDeclarativePipelineActionTest.java
@@ -32,7 +32,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
-import com.github.fge.jsonschema.util.JsonLoader;
+import com.github.fge.jackson.JsonLoader;
 import hudson.model.*;
 import hudson.scm.ChangeLogSet;
 import hudson.security.ACL;
diff --git a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONSchemaTest.java b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONSchemaTest.java
index 94c78ccda..8e686aa95 100644
--- a/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONSchemaTest.java
+++ b/pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONSchemaTest.java
@@ -23,8 +23,8 @@
  */
 package org.jenkinsci.plugins.pipeline.modeldefinition.validator;
 
-import com.github.fge.jsonschema.report.ProcessingMessage;
-import com.github.fge.jsonschema.report.ProcessingReport;
+import com.github.fge.jsonschema.core.report.ProcessingMessage;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
 import net.sf.json.JSONObject;
 import org.jenkinsci.plugins.pipeline.modeldefinition.AbstractModelDefTest;
 import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTPipelineDef;
diff --git a/pipeline-model-extensions/pom.xml b/pipeline-model-extensions/pom.xml
index e6abc524c..c610a3fe1 100644
--- a/pipeline-model-extensions/pom.xml
+++ b/pipeline-model-extensions/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ The MIT License
   ~
diff --git a/pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/CommonUtils.java b/pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/CommonUtils.java
index 43e08014a..2f2d506b2 100644
--- a/pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/CommonUtils.java
+++ b/pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/CommonUtils.java
@@ -39,7 +39,6 @@
 import org.jenkinsci.plugins.workflow.graphanalysis.ForkScanner;
 import org.jenkinsci.plugins.workflow.support.steps.StageStep;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -53,7 +52,7 @@ public class CommonUtils {
     public static Predicate<FlowNode> isStageWithOptionalName(final String stageName) {
         return new Predicate<FlowNode>() {
             @Override
-            public boolean apply(@Nullable FlowNode input) {
+            public boolean apply(FlowNode input) {
                 if (input != null) {
                     if (input instanceof StepStartNode
                             && ((StepStartNode) input).getDescriptor() instanceof StageStep.DescriptorImpl
@@ -108,7 +107,7 @@ public static List<FlowNode> findPossiblyUnfinishedEndNodeForCurrentStage(String
     public static Predicate<FlowNode> isSomewhereWithinStage(final FlowNode stageStartNode) {
         return new Predicate<FlowNode>() {
             @Override
-            public boolean apply(@Nullable FlowNode input) {
+            public boolean apply(FlowNode input) {
                 if (input != null && stageStartNode instanceof BlockStartNode) {
                     return input.getEnclosingBlocks().contains(stageStartNode);
                 }
diff --git a/pipeline-stage-tags-metadata/pom.xml b/pipeline-stage-tags-metadata/pom.xml
index 29a804540..4483f4a68 100644
--- a/pipeline-stage-tags-metadata/pom.xml
+++ b/pipeline-stage-tags-metadata/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ The MIT License
   ~
diff --git a/pom.xml b/pom.xml
index f6bb7d9b2..f90237564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ The MIT License
   ~
@@ -26,7 +27,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.29</version>
+    <version>4.31</version>
     <relativePath />
   </parent>
 
@@ -42,7 +43,7 @@
   <licenses>
     <license>
         <name>MIT</name>
-        <url>http://opensource.org/licenses/MIT</url>
+        <url>https://opensource.org/licenses/MIT</url>
         <distribution>repo</distribution>
     </license>
   </licenses>
@@ -73,8 +74,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.235.x</artifactId>
-        <version>918.vae501d2cdc99</version>
+        <artifactId>bom-2.319.x</artifactId>
+        <version>1013.vf8058992a042</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -121,9 +122,9 @@
         <version>1.46.1</version>
       </dependency>
       <dependency>
-        <groupId>com.github.fge</groupId>
+        <groupId>com.github.java-json-tools</groupId>
         <artifactId>json-schema-validator</artifactId>
-        <version>2.0.4</version>
+        <version>2.2.14</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -160,7 +161,7 @@
     <revision>1.9.4</revision>
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/pipeline-model-definition-plugin</gitHubRepo>
-    <jenkins.version>2.235.5</jenkins.version>
+    <jenkins.version>2.321</jenkins.version>
     <java.level>8</java.level>
     <groovy.version>2.4.12</groovy.version>
     <argLine>-Djava.awt.headless=true -Xmx4g -Xms512m -XX:MaxPermSize=512m</argLine>