From f902168e4a75b55627bb125a46bc7747a47bf850 Mon Sep 17 00:00:00 2001
From: Wadeck Follonier <wadeck.follonier@gmail.com>
Date: Thu, 16 Jul 2020 09:45:15 +0200
Subject: [PATCH 1/2] Update detached plugin versions after security release

- JUnit and structs also due to requireUpperBoundDeps
---
 pom.xml      | 4 ++--
 test/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c53d383d93..d28e7c5a70 100755
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,8 @@ THE SOFTWARE.
     <project.patchManagement.url>https://api.github.com</project.patchManagement.url>
     <patch.tracker.serverId>jenkins-jira</patch.tracker.serverId>
 
-    <matrix-auth.version>2.3</matrix-auth.version>
-    <matrix-project.version>1.14</matrix-project.version>
+    <matrix-auth.version>2.6.2</matrix-auth.version>
+    <matrix-project.version>1.17</matrix-project.version>
     <sorcerer.version>0.11</sorcerer.version>
     <animal.sniffer.skip>${skipTests}</animal.sniffer.skip>
     <java.level>8</java.level>
diff --git a/test/pom.xml b/test/pom.xml
index 6c1c7fcce2..ae843f60e7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -141,13 +141,13 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1.26.1</version>
+      <version>1.29</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>
-      <version>1.7</version>
+      <version>1.20</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From e9d652e89183f3fb1c945133557545f27d9e4952 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Mon, 20 Jul 2020 23:39:51 +0200
Subject: [PATCH 2/2] Update bundled dependencies of JUnit plugin, fix tests

---
 test/pom.xml | 10 ++++++++++
 war/pom.xml  |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index ae843f60e7..a0917c51c9 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -142,12 +142,22 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
       <version>1.29</version>
+      <!-- TODO define property for this and share with war/pom.xml-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>
       <version>1.20</version>
+      <!-- TODO define property for this and share with war/pom.xml-->
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- requireUpperBounds via matrix-project and junit -->
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>script-security</artifactId>
+      <version>1.73</version>
+      <!-- TODO define property for this and share with war/pom.xml-->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index abcd3d235e..fd011e7a51 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -370,21 +370,21 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1.26.1</version>
+                  <version>1.29</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
                   <!-- dependency of junit -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>2.35</version>
+                  <version>2.40</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
                   <!-- dependency of junit -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-step-api</artifactId>
-                  <version>2.20</version>
+                  <version>2.22</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -398,7 +398,7 @@ THE SOFTWARE.
                   <!-- dependency of junit -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>structs</artifactId>
-                  <version>1.18</version>
+                  <version>1.20</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>