cleanup - make pom.xml files more consistent

cli/pom.xml

@@ -3,14 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
+    <artifactId>pom</artifactId>
     <version>1.597-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>
 
-  <name>Jenkins CLI</name>
+  <name>Jenkins cli</name>
+  <description>Command line interface for Jenkins</description>
 
   <dependencies>
     <dependency>
@@ -93,5 +94,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>

core/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 The MIT License
 
@@ -22,7 +23,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
 <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>
 
@@ -30,15 +30,12 @@ THE SOFTWARE.
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
     <version>1.597-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
 
   <name>Jenkins core</name>
-  <description>
-    Contains the core Jenkins code and view files to render HTML.
-  </description>
+  <description>Jenkins core code and view files to render HTML.</description>
 
   <properties>
     <staplerFork>true</staplerFork>
@@ -862,7 +859,7 @@ THE SOFTWARE.
       </build>
     </profile>
     <profile>
-      <!-- run FindBugs for better error detection. run as "mvn -Pfindbugs install site" -->
+      <!-- Run FindBugs for better error detection. Run as "mvn -Pfindbugs install site". -->
       <id>findbugs</id>
       <reporting>
         <plugins>
@@ -880,9 +877,7 @@ THE SOFTWARE.
       </reporting>
     </profile>
     <profile>
-      <!--
-        Obtain code coverage report. This is done by running Unit tests on our own and suppressing surefire.
-      -->
+      <!-- Obtain code coverage report. This is done by running Unit tests on our own and suppressing surefire. -->
       <id>cobertura</id>
       <build>
         <plugins>

plugins/pom.xml

 <?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>

pom.xml

@@ -38,6 +38,7 @@ THE SOFTWARE.
 
   <name>Jenkins main module</name>
   <description>The module that constitutes the main jenkins.war</description>
+
   <licenses>
     <license>
       <name>The MIT license</name>
@@ -60,6 +61,7 @@ THE SOFTWARE.
     <url>https://github.com/jenkinsci/jenkins</url>
     <tag>HEAD</tag>
   </scm>
+
   <distributionManagement>
     <site>
       <id>github-pages</id>
@@ -113,6 +115,7 @@ THE SOFTWARE.
       </snapshots>
     </repository>
   </repositories>
+
   <pluginRepositories>
     <pluginRepository>
       <id>repo.jenkins-ci.org</id>
@@ -128,7 +131,6 @@ THE SOFTWARE.
 
   <dependencyManagement>
     <dependencies>
-
       <dependency>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
@@ -222,6 +224,7 @@ THE SOFTWARE.
       </dependency>
     </dependencies>
   </dependencyManagement>
+
   <dependencies>
     <dependency>
       <!-- for JRE requirement check annotation -->
@@ -327,6 +330,7 @@ THE SOFTWARE.
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
           <version>1.4</version>
         </plugin>

test/pom.xml

@@ -22,22 +22,19 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
 <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>
-    <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
+    <artifactId>pom</artifactId>
     <version>1.597-SNAPSHOT</version>
   </parent>
-  <groupId>org.jenkins-ci.main</groupId>
+
   <artifactId>jenkins-test-harness</artifactId>
 
   <name>Test harness for Jenkins and plugins</name>
-  <description>
-    Unit test harness (src/main) and Unit tests for Jenkins core (src/test)
-  </description>
+  <description>Unit test harness (src/main) and Unit tests for Jenkins core (src/test)</description>
 
   <properties>
     <concurrency>2</concurrency> <!-- may use e.g. 2C for 2 × (number of cores) -->
@@ -146,7 +143,6 @@ THE SOFTWARE.
       <artifactId>xalan</artifactId>
       <version>2.7.1</version>
     </dependency>
-
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>embedded-rhino-debugger</artifactId>
@@ -246,7 +242,6 @@ THE SOFTWARE.
             <artifactId>ant-launcher</artifactId>
             <version>1.8.0</version>
           </dependency>
-
           <dependency>
             <groupId>org.codehaus.gmaven.runtime</groupId>
             <artifactId>gmaven-runtime-2.0</artifactId>
@@ -279,9 +274,7 @@ THE SOFTWARE.
       </properties>
     </profile>
     <profile>
-      <!--
-        Obtain code coverage report. This is done by running Unit tests on our own and suppressing surefire.
-      -->
+      <!-- Obtain code coverage report. This is done by running Unit tests on our own and suppressing surefire. -->
       <id>cobertura</id>
       <build>
         <plugins>

test/src/main/preset-data/simple-projects/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
+
   <groupId>com.example</groupId>
   <artifactId>test.prop.hudson</artifactId>
   <version>1.0</version>
@@ -9,7 +10,4 @@
   <properties>
      <test>default</test>
   </properties>
-
-  <build>
-  </build>
 </project>

war/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 The MIT License
 
@@ -21,7 +22,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
 <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>
 
@@ -29,17 +29,13 @@ THE SOFTWARE.
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
     <version>1.597-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
   <packaging>war</packaging>
 
   <name>Jenkins war</name>
-  <description>
-    Creates a war file. Also includes additional static web resources, such as images, CSS, JavaScript, and
-    some HTML files.
-  </description>
+  <description>Creates a war file. Also includes additional static web resources, such as images, CSS, JavaScript, and some HTML files.</description>
 
   <properties>
     <JENKINS_HOME>${basedir}/work</JENKINS_HOME>
@@ -54,7 +50,6 @@ THE SOFTWARE.
       <version>1.29</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
@@ -168,7 +163,6 @@ THE SOFTWARE.
       <artifactId>slf4j-jdk14</artifactId>
     </dependency>
 
-
     <!-- offline profiler API when we need it -->
 
     <!--dependency