From 019e528ffb4e85141829f4c5c0fa24225511cdc9 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 12 Jun 2017 20:03:08 -0400
Subject: [PATCH 1/2] [JENKINS-41631] Demonstration of POM update.

---
 pom.xml | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 710180bc..322f0b9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.23</version>
+        <version>2.31-20170612.235547-1</version> <!-- TODO https://github.com/jenkinsci/plugin-pom/pull/67 -->
+        <relativePath/>
     </parent>
     
     <licenses>
@@ -38,6 +39,12 @@
             <artifactId>subversion</artifactId>
             <version>2.5.7</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jenkins-ci.plugins</groupId>
+                    <artifactId>scm-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -66,13 +73,17 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpcore</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
           <groupId>org.jenkins-ci.plugins</groupId>
           <artifactId>conditional-buildstep</artifactId>
           <version>1.3.1</version>
-        </dependency>      
+        </dependency>
          
         <!-- Workflow plugin imports are used to test compatibility -->
         <dependency>
@@ -86,6 +97,12 @@
             <artifactId>workflow-cps</artifactId>
             <version>2.27</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jenkins-ci</groupId>
+                    <artifactId>symbol-annotation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -116,6 +133,12 @@
           <artifactId>matrix-auth</artifactId>
 	      <version>1.4</version>
 	      <scope>test</scope>
+              <exclusions>
+                <exclusion>
+                    <groupId>org.jenkins-ci.plugins.icon-shim</groupId>
+                    <artifactId>icon-set</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
            <groupId>org.mockito</groupId>
@@ -129,6 +152,17 @@
              </exclusion>
           </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>script-security</artifactId>
+            <version>1.25</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>token-macro</artifactId>
+            <version>1.10</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <scm>

From dd78f2554aaf0048454792837ba1d7273d8bd905 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 26 Jun 2017 17:21:12 -0400
Subject: [PATCH 2/2] plugin-pom 2.31

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

diff --git a/pom.xml b/pom.xml
index 8c8ab3c3..e44c44a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.31-20170612.235547-1</version> <!-- TODO https://github.com/jenkinsci/plugin-pom/pull/67 -->
+        <version>2.31</version>
         <relativePath/>
     </parent>