This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 10bc51fad5b43af5286caa1ec1a1c5457bc8f22b Author: Matt Sicker <[email protected]> AuthorDate: Fri May 27 00:03:46 2022 -0500 Clean up maven-{compiler,surefire}-plugin usage This removes a bit of redundant configuration that is already inherited from the parent pom or repeats plugin defaults. This also enables test output redirection to files along with enabling failed-first test ordering by default. Signed-off-by: Matt Sicker <[email protected]> --- .gitignore | 1 + log4j-api-test/pom.xml | 35 --------------------------- log4j-api/pom.xml | 34 --------------------------- log4j-core-test/pom.xml | 48 -------------------------------------- log4j-layout-template-json/pom.xml | 48 -------------------------------------- log4j-plugin-processor/pom.xml | 35 +-------------------------- log4j-plugins-test/pom.xml | 48 -------------------------------------- log4j-plugins/pom.xml | 39 ------------------------------- pom.xml | 14 ++++------- 9 files changed, 6 insertions(+), 296 deletions(-) diff --git a/.gitignore b/.gitignore index 15b5062178..77fdef58ba 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ felix-cache/ bin/ .mvn/wrapper/MavenWrapperDownloader.java /.metadata/ +.surefire-* diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index bce0f32652..61170b6efb 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -97,38 +97,6 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${compiler.plugin.version}</version> <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <verbose>false</verbose> - <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> <annotationProcessorPaths> <path> <groupId>com.google.errorprone</groupId> @@ -136,8 +104,6 @@ <version>${errorprone.version}</version> </path> </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> </configuration> <executions> <execution> @@ -159,7 +125,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> - <excludedGroups>performance,smoke</excludedGroups> </configuration> </plugin> <!-- Include the standard NOTICE and LICENSE --> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index 93eb030532..2669d7f776 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -101,38 +101,6 @@ <execution> <id>default-compile</id> <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <verbose>false</verbose> - <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> <annotationProcessorPaths> <path> <groupId>com.google.errorprone</groupId> @@ -140,8 +108,6 @@ <version>${errorprone.version}</version> </path> </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> </configuration> </execution> </executions> diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index 6d80805584..e5ceb1f713 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -307,54 +307,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${compiler.plugin.version}</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <verbose>false</verbose> - <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> - <annotationProcessorPaths> - <path> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugin-processor</artifactId> - <version>${project.version}</version> - </path> - <path> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_core</artifactId> - <version>${errorprone.version}</version> - </path> - </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> - </configuration> <executions> <execution> <id>default-testCompile</id> diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml index 6507df8f6b..fcd3a10713 100644 --- a/log4j-layout-template-json/pom.xml +++ b/log4j-layout-template-json/pom.xml @@ -129,54 +129,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${compiler.plugin.version}</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <verbose>false</verbose> - <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> - <annotationProcessorPaths> - <path> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugin-processor</artifactId> - <version>${project.version}</version> - </path> - <path> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_core</artifactId> - <version>${errorprone.version}</version> - </path> - </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> - </configuration> <executions> <execution> <id>default-compile</id> diff --git a/log4j-plugin-processor/pom.xml b/log4j-plugin-processor/pom.xml index 57c9bcc2bf..75dcf0ac05 100644 --- a/log4j-plugin-processor/pom.xml +++ b/log4j-plugin-processor/pom.xml @@ -88,38 +88,7 @@ <goals> <goal>compile</goal> </goals> - <configuration combine.self="override"> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <encoding>UTF-8</encoding> - <fork>true</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> + <configuration> <annotationProcessorPaths> <path> <groupId>com.google.errorprone</groupId> @@ -127,8 +96,6 @@ <version>${errorprone.version}</version> </path> </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> <compileSourceRoots> <compileSourceRoot>${project.basedir}/src/main/java</compileSourceRoot> <!--compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>--> diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml index 4f1182f942..51552d2bb1 100644 --- a/log4j-plugins-test/pom.xml +++ b/log4j-plugins-test/pom.xml @@ -87,54 +87,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${compiler.plugin.version}</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <verbose>false</verbose> - <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> - <annotationProcessorPaths> - <path> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugin-processor</artifactId> - <version>${project.version}</version> - </path> - <path> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_core</artifactId> - <version>${errorprone.version}</version> - </path> - </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> - </configuration> <executions> <execution> <id>compile-module-info</id> diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml index 9b276023b1..477a40084b 100644 --- a/log4j-plugins/pom.xml +++ b/log4j-plugins/pom.xml @@ -80,38 +80,6 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${compiler.plugin.version}</version> <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <verbose>false</verbose> - <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArgs> - <arg>-XDcompilePolicy=simple</arg> - <arg>-Xplugin:ErrorProne</arg> - <!-- - https://errorprone.info/docs/installation - in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs - --> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg> - <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg> - <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> - </compilerArgs> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> <annotationProcessorPaths> <path> <groupId>com.google.errorprone</groupId> @@ -119,14 +87,7 @@ <version>${errorprone.version}</version> </path> </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> </configuration> - <executions> - <execution> - <id>default-compile</id> - </execution> - </executions> </plugin> <!-- tests are in log4j-plugins-test module --> diff --git a/pom.xml b/pom.xml index 56af379def..f5c78ac70b 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ <properties> <!-- make sure to update these for each release! --> <log4jParentDir>${basedir}</log4jParentDir> - <Log4jReleaseVersion>2.10.0</Log4jReleaseVersion> + <Log4jReleaseVersion>3.0.0</Log4jReleaseVersion> <Log4jReleaseManager>Ralph Goers</Log4jReleaseManager> <Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey> <!--<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager> --> @@ -269,6 +269,7 @@ <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.release>11</maven.compiler.release> + <maven.compiler.parameters>true</maven.compiler.parameters> <maven.doap.skip>false</maven.doap.skip> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- 1641056400 = Jan 1 2022, instead of 1969, which shows up in Javadoc --> @@ -1138,16 +1139,9 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${compiler.plugin.version}</version> <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <release>${maven.compiler.release}</release> <showDeprecation>true</showDeprecation> <showWarnings>true</showWarnings> - <verbose>false</verbose> <encoding>UTF-8</encoding> - <fork>false</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> <compilerArgs> <arg>-XDcompilePolicy=simple</arg> <arg>-Xplugin:ErrorProne</arg> @@ -1182,8 +1176,6 @@ <version>${errorprone.version}</version> </path> </annotationProcessorPaths> - <forceJavacCompilerUse>true</forceJavacCompilerUse> - <parameters>true</parameters> </configuration> </plugin> <plugin> @@ -1353,6 +1345,8 @@ </systemPropertyVariables> <forkCount>1</forkCount> <reuseForks>false</reuseForks> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <runOrder>failedfirst</runOrder> </configuration> </plugin> <plugin>
