From ebe6c93ce24f49f4741dc33b7f88dec5b843bfae Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Sat, 11 May 2024 10:41:57 -0400
Subject: [PATCH] Move properties towards the top

Whitespace and normalize comments
---
 pom.xml | 195 ++++++++++++++++++++++++--------------------------------
 1 file changed, 84 insertions(+), 111 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39bb4de..85fc93a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,10 @@ under the License.
 -->
 <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/xsd/maven-4.0.0.xsd">
   <!--
-    - Note that due to the special requirements of logging unit-tests, most
-    - tests are executed in the "integration-test" phase rather than the
-    - "test" phase. Please run "mvn integration-test" to run the full suite of
-    - available unit tests.
+      Note that due to the special requirements of logging unit-tests, most
+      tests are executed in the "integration-test" phase rather than the
+      "test" phase. Please run "mvn integration-test" to run the full suite of
+      available unit tests.
     -->
   <parent>
     <groupId>org.apache.commons</groupId>
@@ -36,31 +36,69 @@ under the License.
   <description>Apache Commons Logging is a thin adapter allowing configurable bridging to other,
     well-known logging systems.</description>
   <url>https://commons.apache.org/proper/commons-logging/</url>
-
+  <properties>
+    <animal-sniffer.signature>java18</animal-sniffer.signature>
+    <commons.logging.javaversion>1.8</commons.logging.javaversion>
+    <maven.compiler.source>${commons.logging.javaversion}</maven.compiler.source>
+    <maven.compiler.target>${commons.logging.javaversion}</maven.compiler.target>
+    <commons.componentid>logging</commons.componentid>
+    <commons.module.name>org.apache.commons.logging</commons.module.name>
+    <commons.release.version>1.3.1</commons.release.version>
+    <commons.release.next>1.3.2</commons.release.next>
+    <commons.bc.version>1.3.0</commons.bc.version>
+    <commons.release.isDistModule>true</commons.release.isDistModule>
+    <commons.jira.id>LOGGING</commons.jira.id>
+    <commons.jira.pid>12310484</commons.jira.pid>
+    <!-- The RC version used in the staging repository URL. -->
+    <commons.rc.version>RC2</commons.rc.version>
+    <skipSurefireReport>true</skipSurefireReport>
+    <!-- Since version 3.2 additional classpath dependencies are allowed. -->
+    <commons.failsafe.version>3.2.1</commons.failsafe.version>
+    <!-- Allow default test run order to be changed -->
+    <failsafe.runorder>filesystem</failsafe.runorder>
+    <log4j2.version>2.23.1</log4j2.version>
+    <logback.version>1.3.14</logback.version>
+    <slf4j.version>2.0.13</slf4j.version>
+    <findsecbugs.version>1.13.0</findsecbugs.version>
+    <commons.osgi.import>
+      javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional,
+      org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional,
+      org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional,
+      org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional,
+      org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional,
+      org.slf4j;version="[1.7, 3)";resolution:=optional,
+      org.slf4j.spi;version="[1.7, 3)";resolution:=optional
+    </commons.osgi.import>
+    <project.build.outputTimestamp>2024-03-24T15:00:55Z</project.build.outputTimestamp>
+    <!-- JaCoCo: Don't make code coverage worse than: -->
+    <commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
+    <commons.jacoco.classRatio>0.86</commons.jacoco.classRatio>
+    <commons.jacoco.instructionRatio>0.52</commons.jacoco.instructionRatio>
+    <commons.jacoco.methodRatio>0.69</commons.jacoco.methodRatio>
+    <commons.jacoco.branchRatio>0.49</commons.jacoco.branchRatio>
+    <commons.jacoco.lineRatio>0.56</commons.jacoco.lineRatio>
+    <commons.jacoco.complexityRatio>0.50</commons.jacoco.complexityRatio>
+  </properties>
   <issueManagement>
     <system>JIRA</system>
     <url>https://issues.apache.org/jira/browse/LOGGING</url>
   </issueManagement>
-
   <inceptionYear>2001</inceptionYear>
-
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</developerConnection>
     <url>https://gitbox.apache.org/repos/asf/commons-logging</url>
   </scm>
-
   <build>
     <!-- TODO spotbugs:check -->
     <defaultGoal>clean verify apache-rat:check japicmp:cmp javadoc:javadoc checkstyle:check pmd:check</defaultGoal>
     <plugins>
-
       <!--
-        - We want to create four jarfiles from this project: normal, tests, api
-        - and adapters. The first two are handled by the normal jar:jar and
-        - jar:test-jar targets.
-        - The jar plugin with some includes/excludes is used to create the other
-        - ones.
+          We want to create four jarfiles from this project: normal, tests, api
+          and adapters. The first two are handled by the normal jar:jar and
+          jar:test-jar targets.
+          The jar plugin with some includes/excludes is used to create the other
+          ones.
         -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -68,8 +106,8 @@ under the License.
         <executions>
           <execution>
             <!--
-              - The custom test framework requires the unit test code to be
-              - in a jarfile so it can control its place in the classpath.
+                The custom test framework requires the unit test code to be
+                in a jarfile so it can control its place in the classpath.
               -->
             <id>create-test-jar</id>
             <phase>package</phase>
@@ -77,7 +115,6 @@ under the License.
               <goal>test-jar</goal>
             </goals>
           </execution>
-
           <execution>
             <id>create-api-jar</id>
             <phase>package</phase>
@@ -101,7 +138,6 @@ under the License.
               </excludes>
             </configuration>
           </execution>
-
           <execution>
             <id>create-adapters-jar</id>
             <phase>package</phase>
@@ -130,7 +166,6 @@ under the License.
           </archive>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -153,15 +188,14 @@ under the License.
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <!--
-          - Many of JCL's tests use tricky techniques to place the generated
-          - JCL jarfiles on the classpath in various configurations. This means
-          - that those tests must be run *after* the "package" build phase.
-          -
-          - In order to not mess with the Ant build we "disable" the normal test
-          - phase. This is done by skipping the execution of the surefire plugin.
+            Many of JCL's tests use tricky techniques to place the generated
+            JCL jarfiles on the classpath in various configurations. This means
+            that those tests must be run *after* the "package" build phase.
+           
+            In order to not mess with the Ant build we "disable" the normal test
+            phase. This is done by skipping the execution of the surefire plugin.
           -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -169,15 +203,14 @@ under the License.
           <skip>true</skip>
         </configuration>
       </plugin>
-
       <plugin>
         <!--
-          - Many of JCL's tests use tricky techniques to place the generated
-          - JCL jarfiles on the classpath in various configurations. This means
-          - that those tests must be run *after* the "package" build phase.
-          -
-          - Disable cobertura report generation as this does not work correctly
-          - with integration-tests and the normal unit tests are disabled too.
+            Many of JCL's tests use tricky techniques to place the generated
+            JCL jarfiles on the classpath in various configurations. This means
+            that those tests must be run *after* the "package" build phase.
+           
+            Disable cobertura report generation as this does not work correctly
+            with integration-tests and the normal unit tests are disabled too.
           -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
@@ -186,7 +219,6 @@ under the License.
           <skip>true</skip>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
@@ -206,15 +238,14 @@ under the License.
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <!--
-          - Many of JCL's tests use tricky techniques to place the generated
-          - JCL jarfiles on the classpath in various configurations. This means
-          - that those tests must be run *after* the "package" build phase.
-          -
-          - For this we use the failsafe plugin which is bound to the
-          - "integration-test" phase by default.
+            Many of JCL's tests use tricky techniques to place the generated
+            JCL jarfiles on the classpath in various configurations. This means
+            that those tests must be run *after* the "package" build phase.
+           
+            For this we use the failsafe plugin which is bound to the
+            "integration-test" phase by default.
           -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -260,8 +291,8 @@ under the License.
             </configuration>
           </execution>
           <!--
-            - The ServiceLoaderTestCase uses a custom implementation of LogFactory,
-            - therefore it requires a separate execution.
+              The ServiceLoaderTestCase uses a custom implementation of LogFactory,
+              therefore it requires a separate execution.
             -->
           <execution>
             <id>serviceLoader-test</id>
@@ -278,7 +309,7 @@ under the License.
             </configuration>
           </execution>
           <!--
-            - Tests logging through the Log4j 2 API.
+              Tests logging through the Log4j 2 API.
             -->
           <execution>
             <id>log4j-test</id>
@@ -298,16 +329,16 @@ under the License.
               </includes>
               <systemPropertyVariables>
                 <!-- Due to a bug in `log4j-core-test`,
-                   ~ the default LogEventFactory loses the location info.
-                   ~ We need to force the usage of the reusable version.
+                     the default LogEventFactory loses the location info.
+                     We need to force the usage of the reusable version.
                 <log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory>
-                   -->
+                  -->
                 <log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory>
               </systemPropertyVariables>
             </configuration>
           </execution>
           <!--
-            - Tests logging through the Log4j 2 API for 1.2.
+              Tests logging through the Log4j 2 API for 1.2.
             -->
           <execution>
             <id>log4j12-test</id>
@@ -337,8 +368,8 @@ under the License.
               </includes>
               <systemPropertyVariables>
                 <!-- Due to a bug in `log4j-core-test`,
-                   ~ the default LogEventFactory loses the location info.
-                   ~ We need to force the usage of the reusable version.
+                     the default LogEventFactory loses the location info.
+                     We need to force the usage of the reusable version.
                 <log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory>
                    -->
                 <log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory>
@@ -354,7 +385,7 @@ under the License.
             </configuration>
           </execution>
           <!--
-            - Tests falling back to the SLF4J API, when the Log4j API is absent.
+              Tests falling back to the SLF4J API, when the Log4j API is absent.
           -->
           <execution>
             <id>slf4j-test</id>
@@ -379,7 +410,7 @@ under the License.
             </configuration>
           </execution>
           <!--
-            - Tests falling back to the SLF4J API, when the Log4j API is present, but redirected to SLF4J.
+              Tests falling back to the SLF4J API, when the Log4j API is present, but redirected to SLF4J.
           -->
           <execution>
             <id>log4j-to-slf4j-test</id>
@@ -412,7 +443,6 @@ under the License.
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -436,7 +466,6 @@ under the License.
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-publish-plugin</artifactId>
@@ -447,7 +476,6 @@ under the License.
           </ignorePathsToDelete>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -457,7 +485,6 @@ under the License.
           <enableRulesSummary>false</enableRulesSummary>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
@@ -482,9 +509,8 @@ under the License.
               </plugins>
           </configuration>
       </plugin>
-
       <!--
-        ~ Ban Commons Logging clones
+          Ban Commons Logging clones
         -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -508,12 +534,9 @@ under the License.
           </execution>
         </executions>
       </plugin>
-
     </plugins>
-
     <pluginManagement>
       <plugins>
-
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -526,12 +549,9 @@ under the License.
             </instructions>
           </configuration>
         </plugin>
-
       </plugins>
     </pluginManagement>
-
   </build>
-
   <dependencies>
     <dependency>
       <groupId>org.junit.vintage</groupId>
@@ -614,7 +634,6 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <reporting>
     <plugins>
       <plugin>
@@ -651,7 +670,6 @@ under the License.
       </plugin>
     </plugins>
   </reporting>
-
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -659,50 +677,6 @@ under the License.
       <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-logging/</url>
     </site>
   </distributionManagement>
-
-  <properties>
-    <animal-sniffer.signature>java18</animal-sniffer.signature>
-    <commons.logging.javaversion>1.8</commons.logging.javaversion>
-    <maven.compiler.source>${commons.logging.javaversion}</maven.compiler.source>
-    <maven.compiler.target>${commons.logging.javaversion}</maven.compiler.target>
-    <commons.componentid>logging</commons.componentid>
-    <commons.module.name>org.apache.commons.logging</commons.module.name>
-    <commons.release.version>1.3.1</commons.release.version>
-    <commons.release.next>1.3.2</commons.release.next>
-    <commons.bc.version>1.3.0</commons.bc.version>
-    <commons.release.isDistModule>true</commons.release.isDistModule>
-    <commons.jira.id>LOGGING</commons.jira.id>
-    <commons.jira.pid>12310484</commons.jira.pid>
-    <!-- The RC version used in the staging repository URL. -->
-    <commons.rc.version>RC2</commons.rc.version>
-    <skipSurefireReport>true</skipSurefireReport>
-    <!-- Since version 3.2 additional classpath dependencies are allowed. -->
-    <commons.failsafe.version>3.2.1</commons.failsafe.version>
-    <!-- Allow default test run order to be changed -->
-    <failsafe.runorder>filesystem</failsafe.runorder>
-    <log4j2.version>2.23.1</log4j2.version>
-    <logback.version>1.3.14</logback.version>
-    <slf4j.version>2.0.13</slf4j.version>
-    <findsecbugs.version>1.13.0</findsecbugs.version>
-    <commons.osgi.import>
-      javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional,
-      org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional,
-      org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional,
-      org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional,
-      org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional,
-      org.slf4j;version="[1.7, 3)";resolution:=optional,
-      org.slf4j.spi;version="[1.7, 3)";resolution:=optional
-    </commons.osgi.import>
-    <project.build.outputTimestamp>2024-03-24T15:00:55Z</project.build.outputTimestamp>
-    <!-- JaCoCo: Don't make code coverage worse than: -->
-    <commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
-    <commons.jacoco.classRatio>0.86</commons.jacoco.classRatio>
-    <commons.jacoco.instructionRatio>0.52</commons.jacoco.instructionRatio>
-    <commons.jacoco.methodRatio>0.69</commons.jacoco.methodRatio>
-    <commons.jacoco.branchRatio>0.49</commons.jacoco.branchRatio>
-    <commons.jacoco.lineRatio>0.56</commons.jacoco.lineRatio>
-    <commons.jacoco.complexityRatio>0.50</commons.jacoco.complexityRatio>
-  </properties>
   <developers>
     <developer>
       <id>baliuka</id>
@@ -846,5 +820,4 @@ under the License.
       <email>arturobernalg@yahoo.com</email>
     </contributor>
   </contributors>
-  
 </project>