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 a99a01c5cb3cb393ad43e98c0c9efc4413d13ed9 Author: Matt Sicker <[email protected]> AuthorDate: Sun May 1 21:33:31 2022 -0500 Simplify pom files Redundant entries removed. Signed-off-by: Matt Sicker <[email protected]> --- log4j-plugins-test/pom.xml | 34 +++------------------------------- log4j-plugins/pom.xml | 15 ++++----------- log4j-script/pom.xml | 46 ---------------------------------------------- 3 files changed, 7 insertions(+), 88 deletions(-) diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml index 84a4e02c5f..4f1182f942 100644 --- a/log4j-plugins-test/pom.xml +++ b/log4j-plugins-test/pom.xml @@ -151,9 +151,9 @@ <execution> <id>default-testCompile</id> <configuration> - <compilerArgs> - <arg>-ApluginPackage=org.apache.logging.log4j.plugins.convert.test</arg> - </compilerArgs> + <compilerArguments> + <ApluginPackage>org.apache.logging.log4j.plugins.convert.test</ApluginPackage> + </compilerArguments> </configuration> </execution> </executions> @@ -162,12 +162,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <useModulePath>false</useModulePath> - <excludedGroups> - org.apache.logging.log4j.categories.PerformanceTests - </excludedGroups> - <systemPropertyVariables> - <org.apache.activemq.SERIALIZABLE_PACKAGES>*</org.apache.activemq.SERIALIZABLE_PACKAGES> - </systemPropertyVariables> <argLine>--add-opens java.base/java.net=ALL-UNNAMED</argLine> </configuration> </plugin> @@ -250,28 +244,6 @@ <link>http://www.osgi.org/javadoc/r4v43/core/</link> <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link> </links> - <groups> - <group> - <title>Core API</title> - <packages>org.apache.logging.log4j.core</packages> - </group> - <group> - <title>Configuration</title> - <packages>org.apache.logging.log4j.core.config*:org.apache.logging.log4j.core.selector</packages> - </group> - <group> - <title>Core Plugins</title> - <packages>org.apache.logging.log4j.core.appender*:org.apache.logging.log4j.core.filter:org.apache.logging.log4j.core.layout:org.apache.logging.log4j.core.lookup:org.apache.logging.log4j.core.pattern:org.apache.logging.log4j.core.script</packages> - </group> - <group> - <title>Tools</title> - <packages>org.apache.logging.log4j.core.net*:org.apache.logging.log4j.core.tools</packages> - </group> - <group> - <title>Internals</title> - <packages>org.apache.logging.log4j.core.async:org.apache.logging.log4j.core.impl:org.apache.logging.log4j.core.util*:org.apache.logging.log4j.core.osgi:org.apache.logging.log4j.core.jackson:org.apache.logging.log4j.core.jmx</packages> - </group> - </groups> </configuration> <reportSets> <reportSet> diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml index 0a3dc9a030..9b276023b1 100644 --- a/log4j-plugins/pom.xml +++ b/log4j-plugins/pom.xml @@ -126,22 +126,14 @@ <execution> <id>default-compile</id> </execution> - <execution> - <id>default-testCompile</id> - </execution> </executions> </plugin> + + <!-- tests are in log4j-plugins-test module --> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <useModulePath>false</useModulePath> - <excludedGroups> - org.apache.logging.log4j.categories.PerformanceTests - </excludedGroups> - <systemPropertyVariables> - <org.apache.activemq.SERIALIZABLE_PACKAGES>*</org.apache.activemq.SERIALIZABLE_PACKAGES> - </systemPropertyVariables> - <argLine>--add-opens java.base/java.net=ALL-UNNAMED</argLine> + <skipTests>true</skipTests> </configuration> </plugin> <plugin> @@ -151,6 +143,7 @@ <skipTests>true</skipTests> </configuration> </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> diff --git a/log4j-script/pom.xml b/log4j-script/pom.xml index 179ea71ca4..42f1f582f9 100644 --- a/log4j-script/pom.xml +++ b/log4j-script/pom.xml @@ -128,52 +128,6 @@ </instructions> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> - <configuration> - <systemPropertyVariables> - <java.awt.headless>true</java.awt.headless> - </systemPropertyVariables> - <argLine>-Xms256m -Xmx1024m</argLine> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - </configuration> - <executions> - <execution> - <id>default-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <excludes> - <exclude>${log4j.skip.test1}</exclude> - <exclude>${log4j.skip.test2}</exclude> - <exclude>Log4jBridgeHandlerTest.java</exclude> - </excludes> - </configuration> - </execution> - <execution> - <!-- this test needs some special configuration, thus its own run --> - <id>bridgeHandler-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>Log4jBridgeHandlerTest.java</include> - </includes> - <systemPropertyVariables> - <java.util.logging.config.file>src/test/resources/logging-test.properties</java.util.logging.config.file> - <log4j2.configurationFile>log4j2-julBridge-test.xml</log4j2.configurationFile> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> <reporting>
