From 3fcfc2e866a776d4e76243b03de107585b51d980 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Mon, 18 Jun 2018 15:11:35 +0200
Subject: [PATCH 01/12] [JENKINS-52001] - Update JBoss Marshalling to
 2.0.5.Final in order to get Java 9+ fixes

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 90e39e54..b9c1f983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.jboss.marshalling</groupId>
             <artifactId>jboss-marshalling-river</artifactId>
-            <version>1.4.12.jenkins-3</version> <!-- https://github.com/jglick/jboss-marshalling/compare/1.4.12.Final...1.4.12.jenkins-3 -->
+            <version>2.0.5.Final</version> <!-- https://github.com/jglick/jboss-marshalling/compare/1.4.12.Final...1.4.12.jenkins-3 -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>

From 38984f8bc3a604f6f1131f423a9f168d446436cf Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Mon, 18 Jun 2018 16:05:01 +0200
Subject: [PATCH 02/12] [JENKINS-52001] - Bump to the core versions with new
 BCT

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b9c1f983..d5946157 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,8 @@
     <properties>
         <revision>2.19</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.62</jenkins.version>
+        <jenkins-core.version>2.129-20180618.135411-1</jenkins-core.version>
+        <jenkins-war.version>2.129-20180618.135443-1</jenkins-war.version>
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <git-plugin.version>3.7.0</git-plugin.version>

From b10885cbd9dcc03143675aaa753344e1a1d8111e Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Mon, 18 Jun 2018 11:37:57 -0400
Subject: [PATCH 03/12] Initial fixes to allow build with rough Java10 support

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index d5946157..f708c646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,8 @@
         <workflow-scm-step-plugin.version>2.6</workflow-scm-step-plugin.version>
         <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
+        <enforcer.skip>true</enforcer.skip> <!-- Ignore the higher classfile version for JBoss Marshallig until we resolve JENKINS-52014 and JENKINS-52006 -->
+        <animal.sniffer.skip>true</animal.sniffer.skip> <!-- Temporary for JENKINS-52007 -->
     </properties>
     <dependencies>
         <dependency>
@@ -95,10 +97,17 @@
             <version>1.39</version>
         </dependency>
         <dependency>
+            <!-- Requires Java 9+ -->
             <groupId>org.jboss.marshalling</groupId>
             <artifactId>jboss-marshalling-river</artifactId>
             <version>2.0.5.Final</version> <!-- https://github.com/jglick/jboss-marshalling/compare/1.4.12.Final...1.4.12.jenkins-3 -->
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci</groupId>
+            <artifactId>annotation-indexer</artifactId>
+            <version>1.12</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-step-api</artifactId>

From bacb9d9bf636aa3a4abac42f6a7e643964e77526 Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Mon, 18 Jun 2018 14:22:35 -0400
Subject: [PATCH 04/12] Disable broken unit tests to permit us to deploy an
 Incremental

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index f708c646..e7d9064d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
         <enforcer.skip>true</enforcer.skip> <!-- Ignore the higher classfile version for JBoss Marshallig until we resolve JENKINS-52014 and JENKINS-52006 -->
         <animal.sniffer.skip>true</animal.sniffer.skip> <!-- Temporary for JENKINS-52007 -->
+        <maven.test.skip>true</maven.test.skip>
     </properties>
     <dependencies>
         <dependency>

From 9c0d5f5a19927ac7c9ec2ba49d16e971d0169352 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Tue, 19 Jun 2018 11:56:21 +0200
Subject: [PATCH 05/12] [JENKINS-52001] - Skip Tests in buildPlugin()

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a229fa51..ae8a7a2d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1,2 @@
-buildPlugin()
+//TODO: Currently some tests fail (JENKINS-52014, etc.)
+buildPlugin(tests: [skip: true])

From 5c80fa90cf8b40b2f63d4b9e38ca357f9596a49c Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Tue, 19 Jun 2018 12:23:26 +0200
Subject: [PATCH 06/12] [JENKINS-52001] - Kickstart the build after the
 Pipeline Library update

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ae8a7a2d..c628d891 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
-//TODO: Currently some tests fail (JENKINS-52014, etc.)
+//TODO: Currently some tests fail (JENKINS-52014, etc.) 
 buildPlugin(tests: [skip: true])

From 34609aa33aeeab4bc2dac99fc14a5bae7c76dc01 Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Fri, 22 Jun 2018 15:31:25 -0400
Subject: [PATCH 07/12] Consume new animalsniffer dependency and re-enable
 testing

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7d9064d..c3946bdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.12</version>
+        <version>3.16</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -73,7 +73,6 @@
         <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
         <enforcer.skip>true</enforcer.skip> <!-- Ignore the higher classfile version for JBoss Marshallig until we resolve JENKINS-52014 and JENKINS-52006 -->
-        <animal.sniffer.skip>true</animal.sniffer.skip> <!-- Temporary for JENKINS-52007 -->
         <maven.test.skip>true</maven.test.skip>
     </properties>
     <dependencies>

From f6d88d04c06e6967ca8639b7139974499e84b20e Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Fri, 22 Jun 2018 15:55:56 -0400
Subject: [PATCH 08/12] Pick up core incremental build for now

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c3946bdb..28a8afe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,8 +64,8 @@
     <properties>
         <revision>2.19</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins-core.version>2.129-20180618.135411-1</jenkins-core.version>
-        <jenkins-war.version>2.129-20180618.135443-1</jenkins-war.version>
+        <jenkins-core.version>2.129-rc15784.940fadf41694</jenkins-core.version>
+        <jenkins-war.version>2.129-rc15784.940fadf41694</jenkins-war.version>
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <git-plugin.version>3.7.0</git-plugin.version>
@@ -73,7 +73,6 @@
         <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
         <enforcer.skip>true</enforcer.skip> <!-- Ignore the higher classfile version for JBoss Marshallig until we resolve JENKINS-52014 and JENKINS-52006 -->
-        <maven.test.skip>true</maven.test.skip>
     </properties>
     <dependencies>
         <dependency>

From 4420c05093ad380eb61f0b93fe5f0b5b00675e4d Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Tue, 26 Jun 2018 11:52:17 -0400
Subject: [PATCH 09/12] Remove core dependency so we can run this on current
 Jenkins and re-enable enforcer

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28a8afe5..14e58b8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,15 +64,13 @@
     <properties>
         <revision>2.19</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins-core.version>2.129-rc15784.940fadf41694</jenkins-core.version>
-        <jenkins-war.version>2.129-rc15784.940fadf41694</jenkins-war.version>
+        <jenkins.version>2.62</jenkins.version>
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <git-plugin.version>3.7.0</git-plugin.version>
         <workflow-scm-step-plugin.version>2.6</workflow-scm-step-plugin.version>
         <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
-        <enforcer.skip>true</enforcer.skip> <!-- Ignore the higher classfile version for JBoss Marshallig until we resolve JENKINS-52014 and JENKINS-52006 -->
     </properties>
     <dependencies>
         <dependency>

From be6f10cf3b7107c60b65925edee7d93d767f4fe2 Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Wed, 27 Jun 2018 10:58:43 -0400
Subject: [PATCH 10/12] Prevent enforcer failure due to multi-release JAR for
 JBoss Marshalling

---
 pom.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 14e58b8b..f818699a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
             <!-- Requires Java 9+ -->
             <groupId>org.jboss.marshalling</groupId>
             <artifactId>jboss-marshalling-river</artifactId>
-            <version>2.0.5.Final</version> <!-- https://github.com/jglick/jboss-marshalling/compare/1.4.12.Final...1.4.12.jenkins-3 -->
+            <version>2.0.5.Final</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci</groupId>
@@ -222,6 +222,25 @@
                     <compatibleSinceVersion>2.17</compatibleSinceVersion>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>display-info</id>
+                        <configuration>
+                            <rules>
+                                <enforceBytecodeVersion>
+                                    <excludes combine.children="append">
+                                        <!-- Prevents enforcer complaining about multi-release JAR -->
+                                        <exclude>org.jboss.marshalling:jboss-marshalling-river</exclude>
+                                        <exclude>org.jboss.marshalling:jboss-marshalling</exclude>
+                                    </excludes>
+                                </enforceBytecodeVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

From d2438241788b19380e7fbe28d54f9720e5a2e2ae Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Fri, 21 Sep 2018 19:44:34 -0700
Subject: [PATCH 11/12] Mark compatiblesince for change in serialization

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7d9064d..02a33e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
                 <artifactId>maven-hpi-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <compatibleSinceVersion>2.17</compatibleSinceVersion>
+                    <compatibleSinceVersion>2.21</compatibleSinceVersion>
                 </configuration>
             </plugin>
         </plugins>

From 8880828ddb99a9fc3d079deecfbf3608660d0960 Mon Sep 17 00:00:00 2001
From: Sam Van Oort <samvanoort@gmail.com>
Date: Fri, 21 Sep 2018 19:46:59 -0700
Subject: [PATCH 12/12] Tests come back?

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c628d891..a229fa51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1 @@
-//TODO: Currently some tests fail (JENKINS-52014, etc.) 
-buildPlugin(tests: [skip: true])
+buildPlugin()