From f4c5d3a183ccb8665175cf5d0e2d9a3dab3257d2 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 27 Dec 2021 20:30:19 -0800
Subject: [PATCH] Adopt POM Code Convention (#312)

---
 core/pom.xml   |  35 +++++----
 groovy/pom.xml |   5 +-
 jelly/pom.xml  |  18 ++---
 jrebel/pom.xml |   4 +-
 jsp/pom.xml    |   5 +-
 pom.xml        | 192 ++++++++++++++++++++++++-------------------------
 6 files changed, 128 insertions(+), 131 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 95bffcc0cc..e4a7819ee1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,25 +6,10 @@
     <artifactId>stapler-parent</artifactId>
     <version>${changelist}</version>
   </parent>
-  
+
   <artifactId>stapler</artifactId>
   <name>Stapler</name>
   <description>Stapler HTTP request handling engine</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
     <dependency>
       <groupId>javax.annotation</groupId>
@@ -99,7 +84,7 @@
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
       <version>1.4</version>
-    </dependency>    
+    </dependency>
     <!-- optional REST support -->
     <dependency>
       <groupId>com.sun.xml.txw2</groupId>
@@ -181,5 +166,19 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/groovy/pom.xml b/groovy/pom.xml
index e4db4255c7..ee38b751ec 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -6,11 +6,11 @@
     <artifactId>stapler-parent</artifactId>
     <version>${changelist}</version>
   </parent>
-  
+
   <artifactId>stapler-groovy</artifactId>
   <name>Stapler Groovy module</name>
   <description>Groovy binding for Stapler</description>
-  
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -53,4 +53,3 @@
     </dependency>
   </dependencies>
 </project>
-
diff --git a/jelly/pom.xml b/jelly/pom.xml
index 01f7d04c40..d0fdf0702a 100644
--- a/jelly/pom.xml
+++ b/jelly/pom.xml
@@ -42,7 +42,8 @@
       <artifactId>dom4j</artifactId>
       <version>2.1.3</version>
     </dependency>
-    <dependency><!-- only needed for annotations, hence optional -->
+    <dependency>
+      <!-- only needed for annotations, hence optional -->
       <groupId>org.jvnet.maven-jellydoc-plugin</groupId>
       <artifactId>jellydoc-annotations</artifactId>
       <version>1.5</version>
@@ -151,13 +152,6 @@
           <plugin>
             <groupId>org.jvnet.maven-jellydoc-plugin</groupId>
             <artifactId>maven-jellydoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>jellydoc</goal>
-                </goals>
-              </execution>
-            </executions>
             <dependencies>
               <dependency>
                 <groupId>com.github.olivergondza</groupId>
@@ -165,6 +159,13 @@
                 <version>0.1</version>
               </dependency>
             </dependencies>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jellydoc</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
@@ -181,4 +182,3 @@
     </profile>
   </profiles>
 </project>
-
diff --git a/jrebel/pom.xml b/jrebel/pom.xml
index 6391062454..a8ec5b2e71 100644
--- a/jrebel/pom.xml
+++ b/jrebel/pom.xml
@@ -6,11 +6,11 @@
     <artifactId>stapler-parent</artifactId>
     <version>${changelist}</version>
   </parent>
-  
+
   <artifactId>stapler-jrebel</artifactId>
   <name>Stapler JRebel module</name>
   <description>JRebel reloading support for Stapler</description>
-  
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/jsp/pom.xml b/jsp/pom.xml
index eaaa313845..16adfcbbf3 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -6,11 +6,11 @@
     <artifactId>stapler-parent</artifactId>
     <version>${changelist}</version>
   </parent>
-  
+
   <artifactId>stapler-jsp</artifactId>
   <name>Stapler JSP module</name>
   <description>JSP binding for Stapler</description>
-  
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -36,4 +36,3 @@
     </dependency>
   </dependencies>
 </project>
-
diff --git a/pom.xml b/pom.xml
index c6f0fe5bfb..4d2a22834a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
@@ -10,37 +10,120 @@
   </parent>
   <groupId>org.kohsuke.stapler</groupId>
   <artifactId>stapler-parent</artifactId>
-  <packaging>pom</packaging>
   <version>${changelist}</version>
+  <packaging>pom</packaging>
 
   <name>Stapler</name>
   <description>Stapler HTTP request handling engine</description>
-  
-  <modules>
-    <module>core</module>
-    <module>jsp</module>
-    <module>jelly</module>
-    <module>groovy</module>
-    <module>jrebel</module>
-  </modules>
 
   <url>https://github.com/jenkinsci/stapler</url>
 
   <licenses>
     <license>
       <name>2-clause BSD license</name>
-      <distribution>repo</distribution>
       <url>https://opensource.org/licenses/BSD-2-Clause</url>
+      <distribution>repo</distribution>
     </license>
   </licenses>
-  
+
+  <modules>
+    <module>core</module>
+    <module>jsp</module>
+    <module>jelly</module>
+    <module>groovy</module>
+    <module>jrebel</module>
+  </modules>
+
   <scm>
     <connection>scm:git:https://github.com/jenkinsci/stapler.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/stapler.git</developerConnection>
-    <url>https://github.com/jenkinsci/stapler</url>
     <tag>${scmTag}</tag>
+    <url>https://github.com/jenkinsci/stapler</url>
   </scm>
 
+  <properties>
+    <changelist>999999-SNAPSHOT</changelist>
+    <scmTag>HEAD</scmTag>
+    <spotbugs.excludeFilterFile>${project.basedir}/../src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
+    <jetty.version>9.4.44.v20210927</jetty.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.kohsuke.metainf-services</groupId>
+        <artifactId>metainf-services</artifactId>
+        <version>1.8</version>
+      </dependency>
+
+      <!-- test dependencies -->
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-servlet</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>4.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.main</groupId>
+        <artifactId>jenkins-test-harness-htmlunit</artifactId>
+        <version>66.v712ea44bccba</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jvnet.hudson</groupId>
+        <artifactId>commons-jelly-tags-define</artifactId>
+        <version>1.0.1-hudson-20071021</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
   <repositories>
     <repository>
       <id>repo.jenkins-ci.org</id>
@@ -55,13 +138,6 @@
     </pluginRepository>
   </pluginRepositories>
 
-  <properties>
-    <changelist>999999-SNAPSHOT</changelist>
-    <scmTag>HEAD</scmTag>
-    <spotbugs.excludeFilterFile>${project.basedir}/../src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
-    <jetty.version>9.4.44.v20210927</jetty.version>
-  </properties>
-
   <build>
     <pluginManagement>
       <plugins>
@@ -78,80 +154,4 @@
       </plugins>
     </pluginManagement>
   </build>
-
-  <dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.kohsuke.metainf-services</groupId>
-      <artifactId>metainf-services</artifactId>
-      <version>1.8</version>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>jenkins-test-harness-htmlunit</artifactId>
-      <version>66.v712ea44bccba</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>commons-jelly-tags-define</artifactId>
-      <version>1.0.1-hudson-20071021</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
-    </dependency>
-  </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
 </project>