Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Move properties towards the top

Browse Source 
Whitespace and normalize comments
This commit is contained in:
Gary Gregory
2024-05-11 10:41:57 -04:00
parent 541b25f365
commit ebe6c93ce2
1 changed files with 84 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
pom.xml
View File

@@ -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"> <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 Note that due to the special requirements of logging unit-tests, most
- tests are executed in the "integration-test" phase rather than the tests are executed in the "integration-test" phase rather than the
- "test" phase. Please run "mvn integration-test" to run the full suite of "test" phase. Please run "mvn integration-test" to run the full suite of
- available unit tests. available unit tests.
--> -->
<parent> <parent>
<groupId>org.apache.commons</groupId> <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, <description>Apache Commons Logging is a thin adapter allowing configurable bridging to other,
well-known logging systems.</description> well-known logging systems.</description>
<url>https://commons.apache.org/proper/commons-logging/</url> <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> <issueManagement>
<system>JIRA</system> <system>JIRA</system>
<url>https://issues.apache.org/jira/browse/LOGGING</url> <url>https://issues.apache.org/jira/browse/LOGGING</url>
</issueManagement> </issueManagement>
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<scm> <scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</connection> <connection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</developerConnection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</developerConnection>
<url>https://gitbox.apache.org/repos/asf/commons-logging</url> <url>https://gitbox.apache.org/repos/asf/commons-logging</url>
</scm> </scm>
<build> <build>
<!-- TODO spotbugs:check --> <!-- TODO spotbugs:check -->
<defaultGoal>clean verify apache-rat:check japicmp:cmp javadoc:javadoc checkstyle:check pmd:check</defaultGoal> <defaultGoal>clean verify apache-rat:check japicmp:cmp javadoc:javadoc checkstyle:check pmd:check</defaultGoal>
<plugins> <plugins>
<!-- <!--
- We want to create four jarfiles from this project: normal, tests, api 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 and adapters. The first two are handled by the normal jar:jar and
- jar:test-jar targets. jar:test-jar targets.
- The jar plugin with some includes/excludes is used to create the other The jar plugin with some includes/excludes is used to create the other
- ones. ones.
--> -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -68,8 +106,8 @@ under the License.
<executions> <executions>
<execution> <execution>
<!-- <!--
- The custom test framework requires the unit test code to be The custom test framework requires the unit test code to be
- in a jarfile so it can control its place in the classpath. in a jarfile so it can control its place in the classpath.
--> -->
<id>create-test-jar</id> <id>create-test-jar</id>
<phase>package</phase> <phase>package</phase>
@@ -77,7 +115,6 @@ under the License.
<goal>test-jar</goal> <goal>test-jar</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>create-api-jar</id> <id>create-api-jar</id>
<phase>package</phase> <phase>package</phase>
@@ -101,7 +138,6 @@ under the License.
</excludes> </excludes>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>create-adapters-jar</id> <id>create-adapters-jar</id>
<phase>package</phase> <phase>package</phase>
@@ -130,7 +166,6 @@ under the License.
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
@@ -153,15 +188,14 @@ under the License.
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<!-- <!--
- Many of JCL's tests use tricky techniques to place the generated Many of JCL's tests use tricky techniques to place the generated
- JCL jarfiles on the classpath in various configurations. This means JCL jarfiles on the classpath in various configurations. This means
- that those tests must be run *after* the "package" build phase. 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 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. phase. This is done by skipping the execution of the surefire plugin.
--> -->
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
@@ -169,15 +203,14 @@ under the License.
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<!-- <!--
- Many of JCL's tests use tricky techniques to place the generated Many of JCL's tests use tricky techniques to place the generated
- JCL jarfiles on the classpath in various configurations. This means JCL jarfiles on the classpath in various configurations. This means
- that those tests must be run *after* the "package" build phase. that those tests must be run *after* the "package" build phase.
-
- Disable cobertura report generation as this does not work correctly Disable cobertura report generation as this does not work correctly
- with integration-tests and the normal unit tests are disabled too. with integration-tests and the normal unit tests are disabled too.
--> -->
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>cobertura-maven-plugin</artifactId>
@@ -186,7 +219,6 @@ under the License.
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.moditect</groupId> <groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId> <artifactId>moditect-maven-plugin</artifactId>
@@ -206,15 +238,14 @@ under the License.
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<!-- <!--
- Many of JCL's tests use tricky techniques to place the generated Many of JCL's tests use tricky techniques to place the generated
- JCL jarfiles on the classpath in various configurations. This means JCL jarfiles on the classpath in various configurations. This means
- that those tests must be run *after* the "package" build phase. that those tests must be run *after* the "package" build phase.
-
- For this we use the failsafe plugin which is bound to the For this we use the failsafe plugin which is bound to the
- "integration-test" phase by default. "integration-test" phase by default.
--> -->
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
@@ -260,8 +291,8 @@ under the License.
</configuration> </configuration>
</execution> </execution>
<!-- <!--
- The ServiceLoaderTestCase uses a custom implementation of LogFactory, The ServiceLoaderTestCase uses a custom implementation of LogFactory,
- therefore it requires a separate execution. therefore it requires a separate execution.
--> -->
<execution> <execution>
<id>serviceLoader-test</id> <id>serviceLoader-test</id>
@@ -278,7 +309,7 @@ under the License.
</configuration> </configuration>
</execution> </execution>
<!-- <!--
- Tests logging through the Log4j 2 API. Tests logging through the Log4j 2 API.
--> -->
<execution> <execution>
<id>log4j-test</id> <id>log4j-test</id>
@@ -298,16 +329,16 @@ under the License.
</includes> </includes>
<systemPropertyVariables> <systemPropertyVariables>
<!-- Due to a bug in `log4j-core-test`, <!-- Due to a bug in `log4j-core-test`,
~ the default LogEventFactory loses the location info. the default LogEventFactory loses the location info.
~ We need to force the usage of the reusable version. We need to force the usage of the reusable version.
<log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory> <log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory>
--> -->
<log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory> <log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</execution> </execution>
<!-- <!--
- Tests logging through the Log4j 2 API for 1.2. Tests logging through the Log4j 2 API for 1.2.
--> -->
<execution> <execution>
<id>log4j12-test</id> <id>log4j12-test</id>
@@ -337,8 +368,8 @@ under the License.
</includes> </includes>
<systemPropertyVariables> <systemPropertyVariables>
<!-- Due to a bug in `log4j-core-test`, <!-- Due to a bug in `log4j-core-test`,
~ the default LogEventFactory loses the location info. the default LogEventFactory loses the location info.
~ We need to force the usage of the reusable version. We need to force the usage of the reusable version.
<log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory> <log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory>
--> -->
<log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory> <log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory>
@@ -354,7 +385,7 @@ under the License.
</configuration> </configuration>
</execution> </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> <execution>
<id>slf4j-test</id> <id>slf4j-test</id>
@@ -379,7 +410,7 @@ under the License.
</configuration> </configuration>
</execution> </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> <execution>
<id>log4j-to-slf4j-test</id> <id>log4j-to-slf4j-test</id>
@@ -412,7 +443,6 @@ under the License.
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@@ -436,7 +466,6 @@ under the License.
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId> <artifactId>maven-scm-publish-plugin</artifactId>
@@ -447,7 +476,6 @@ under the License.
</ignorePathsToDelete> </ignorePathsToDelete>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
@@ -457,7 +485,6 @@ under the License.
<enableRulesSummary>false</enableRulesSummary> <enableRulesSummary>false</enableRulesSummary>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
@@ -482,9 +509,8 @@ under the License.
</plugins> </plugins>
</configuration> </configuration>
</plugin> </plugin>
<!-- <!--
~ Ban Commons Logging clones Ban Commons Logging clones
--> -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -508,12 +534,9 @@ under the License.
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@@ -526,12 +549,9 @@ under the License.
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.vintage</groupId> <groupId>org.junit.vintage</groupId>
@@ -614,7 +634,6 @@ under the License.
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
@@ -651,7 +670,6 @@ under the License.
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
<distributionManagement> <distributionManagement>
<site> <site>
<id>apache.website</id> <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> <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-logging/</url>
</site> </site>
</distributionManagement> </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> <developers>
<developer> <developer>
<id>baliuka</id> <id>baliuka</id>
@@ -846,5 +820,4 @@ under the License.
<email>arturobernalg@yahoo.com</email> <email>arturobernalg@yahoo.com</email>
</contributor> </contributor>
</contributors> </contributors>
</project> </project>