This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch bnd in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b6fdda9c20f57b0fef105ee484426ed2a05da405 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Sep 27 23:18:58 2023 +0200 Cleanup plugin configurations --- log4j-api-test/pom.xml | 1 - log4j-api/pom.xml | 4 - log4j-bom/pom.xml | 5 - log4j-core-its/pom.xml | 12 --- log4j-core-test/pom.xml | 68 ------------ log4j-core/pom.xml | 7 -- log4j-flume-ng/pom.xml | 26 ----- log4j-taglib/pom.xml | 11 -- pom.xml | 273 +----------------------------------------------- 9 files changed, 3 insertions(+), 404 deletions(-) diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index d4da0aea65..e99998956b 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -111,7 +111,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> <excludedGroups>performance,smoke</excludedGroups> </configuration> </plugin> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index 1ac6fd4fe6..3af826c5f8 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -107,10 +107,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - </plugin> </plugins> </build> </project> diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index 1cd7392dc7..0972d9f467 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@ -252,11 +252,6 @@ <build> <plugins> - <!-- RAT report --> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index 7f9df6fb75..04b6083366 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -183,18 +183,6 @@ </dependencies> <build> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>test-compile</id> - <goals> - <goal>testCompile</goal> - </goals> - <phase>test-compile</phase> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index 41259663ec..9419d2a025 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -329,72 +329,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <goals> - <goal>add-source</goal> - </goals> - <phase>generate-sources</phase> - <configuration> - <sources> - <source>${project.build.directory}/log4j-core-java9</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <!-- disable annotation processing for first pass --> - <id>default-compile</id> - <configuration> - <excludes> - <exclude>module-info.java</exclude> - </excludes> - <proc>none</proc> - </configuration> - </execution> - <execution> - <!-- then do a processing-only pass to generate plugins .dat file --> - <id>process-plugins</id> - <goals> - <goal>compile</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <excludes> - <exclude>module-info.java</exclude> - </excludes> - <proc>only</proc> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludedGroups>org.apache.logging.log4j.categories.PerformanceTests</excludedGroups> - <systemPropertyVariables> - <org.apache.activemq.SERIALIZABLE_PACKAGES>*</org.apache.activemq.SERIALIZABLE_PACKAGES> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index b084361c82..cc36f84940 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -244,13 +244,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> </plugins> </build> </project> diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml index 7154b61641..00e995da92 100644 --- a/log4j-flume-ng/pom.xml +++ b/log4j-flume-ng/pom.xml @@ -105,30 +105,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xms256m -Xmx1024m -XX:MaxPermSize=512m</argLine> - <forkCount>1</forkCount> - <reuseForks>true</reuseForks> - </configuration> - </plugin> - --> - </plugins> - </build> </project> diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml index f9392feda0..0a5788e992 100644 --- a/log4j-taglib/pom.xml +++ b/log4j-taglib/pom.xml @@ -78,15 +78,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/pom.xml b/pom.xml index ffde0bb927..49d2ec9f44 100644 --- a/pom.xml +++ b/pom.xml @@ -349,26 +349,11 @@ Plugin version properties (in alphabetical order) ================================================= --> <asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version> - <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version> - <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version> <docker-maven-plugin.version>0.43.4</docker-maven-plugin.version> <exam-maven-plugin.version>4.13.5</exam-maven-plugin.version> - <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version> - <log4j-tools.version>0.3.0</log4j-tools.version> - <maven-artifact-plugin.version>3.4.0</maven-artifact-plugin.version> - <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version> - <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version> - <maven-scm-plugin.version>1.13.0</maven-scm-plugin.version> - <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <maven-taglib-plugin.version>2.4</maven-taglib-plugin.version> - <maven-toolchains-plugin.version>3.1.0</maven-toolchains-plugin.version> - <spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version> <!-- `surefire.version` property used in `apache.org:apache`: --> <surefire.version>3.1.2</surefire.version> - <!-- Maven site depends on Velocity and the escaping rules are different in newer versions. --> - <!-- See https://maven.apache.org/plugins/maven-site-plugin/migrate.html --> - <velocity.plugin.version>1.5</velocity.plugin.version> - <xml-maven-plugin.version>1.1.0</xml-maven-plugin.version> <!-- ===================================================== Direct dependency version properties (in alphabetical order) @@ -1360,19 +1345,6 @@ <pluginManagement> <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>${build-helper-maven-plugin.version}</version> - </plugin> - - <!-- used by `log4j-distribution` module which is enabled via `apache-release` profile: --> - <plugin> - <groupId>net.nicoulaj.maven.plugins</groupId> - <artifactId>checksum-maven-plugin</artifactId> - <version>${checksum-maven-plugin.version}</version> - </plugin> - <!-- used by `docker` profile in `log4j-layout-template-json-test`: --> <plugin> <groupId>io.fabric8</groupId> @@ -1380,71 +1352,20 @@ <version>${docker-maven-plugin.version}</version> </plugin> + <!-- used by OSGi tests --> <plugin> <groupId>org.ops4j.pax.exam</groupId> <artifactId>exam-maven-plugin</artifactId> <version>${exam-maven-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-changelog-maven-plugin</artifactId> - <version>${log4j-tools.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-artifact-plugin</artifactId> - <version>${maven-artifact-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${maven-enforcer-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-plugin</artifactId> - <version>${maven-scm-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>${maven-source-plugin.version}</version> - </plugin> - + <!-- used to generate taglib documentation --> <plugin> <groupId>net.sourceforge.maven-taglib</groupId> <artifactId>maven-taglib-plugin</artifactId> <version>${maven-taglib-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-toolchains-plugin</artifactId> - <version>${maven-toolchains-plugin.version}</version> - </plugin> - - <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <version>${spotbugs-maven-plugin.version}</version> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>${xml-maven-plugin.version}</version> - </plugin> </plugins> </pluginManagement> @@ -1458,18 +1379,12 @@ <artifactId>apache-rat-plugin</artifactId> <configuration> <consoleOutput>true</consoleOutput> - <excludes> - <exclude>**/target/**/*</exclude> + <excludes combine.children="append"> <!-- Matches other RAT configurations in this POM --> <exclude>src/main/resources/META-INF/services/**/*</exclude> - <!-- IntelliJ files --> - <exclude>.idea/**/*</exclude> - <exclude>**/*.iml</exclude> <exclude>src/test/resources/**/*</exclude> <!-- IDE settings imports --> <exclude>src/ide/**</exclude> - <!-- does it even make sense to apply a license to a GPG signature? --> - <exclude>**/*.asc</exclude> <!-- jQuery is MIT-licensed, but RAT can't figure it out --> <exclude>src/site/resources/js/jquery.js</exclude> <exclude>src/site/resources/js/jquery.min.js</exclude> @@ -1483,7 +1398,6 @@ <exclude>felix-cache/**</exclude> <exclude>**/README.md</exclude> <exclude>SECURITY.md</exclude> - <exclude>.java-version</exclude> <exclude>**/*.yml</exclude> <exclude>**/*.yaml</exclude> <exclude>**/*.json</exclude> @@ -1492,20 +1406,8 @@ <exclude>**/rabbitmq.config</exclude> <exclude>**/MANIFEST.MF</exclude> <exclude>.surefire-*</exclude> - <exclude>.mvn/jvm.config</exclude> - <!-- License headers in GitHub templates pollute the prompt displayed to the user: --> - <exclude>.github/ISSUE_TEMPLATE/*.md</exclude> - <exclude>.github/pull_request_template.md</exclude> </excludes> </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> </plugin> <plugin> @@ -1523,58 +1425,6 @@ </configuration> </plugin> - <!-- Ensure that version for each dependency resolved during a build, is equal to or higher than all transitive dependency declarations. - A failure here requires adding the dependency to the dependency management. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-upper-bound-deps</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireUpperBoundDeps /> - </rules> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - <goal>test-jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <configuration> - <plugins> - <plugin> - <groupId>com.h3xstream.findsecbugs</groupId> - <artifactId>findsecbugs-plugin</artifactId> - <version>${findsecbugs-plugin.version}</version> - </plugin> - </plugins> - <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile> - <fork>true</fork> - <effort>Default</effort> - <threshold>Normal</threshold> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -1588,31 +1438,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <validationSets> - <validationSet> - <dir>src/changelog</dir> - <includes>**/*.xml</includes> - <publicId>http://logging.apache.org/log4j/changelog</publicId> - <systemId>https://logging.apache.org/log4j/changelog-0.1.1.xsd</systemId> - <validating>true</validating> - </validationSet> - </validationSets> - </configuration> - <executions> - <execution> - <goals> - <goal>validate</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - </plugin> - <!-- ███████ ████████ █████ ██████ ████████ ███████ ██ ████████ ███████ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ███████ ██ ███████ ██████ ██ ███████ ██ ██ █████ @@ -1799,58 +1624,6 @@ <profiles> - <!-- Shortcut to populate `src/changelog/<releaseVersion>` from `src/changelog/.<releaseVersionMajor>.x.x` --> - <profile> - <id>changelog-release</id> - <build> - <defaultGoal>validate</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-changelog-maven-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <releaseVersion>${log4jReleaseVersion}</releaseVersion> - </configuration> - <executions> - <execution> - <id>changelog-release</id> - <goals> - <goal>release</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Shortcut to enable `log4j-distribution` module creating the release distribution containing artifacts, sources, etc. --> - <profile> - <id>apache-release</id> - <modules> - <module>log4j-distribution</module> - </modules> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>source-release-assembly</id> - <configuration> - <skipAssembly>true</skipAssembly> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>java8-doclint-disabled</id> <activation> @@ -1893,46 +1666,6 @@ </build> </profile> - <profile> - <id>rewrite</id> - <properties> - <rewrite-java.version>8.2.0</rewrite-java.version> - <rewrite-maven-plugin.version>5.4.1</rewrite-maven-plugin.version> - <rewrite-static-analysis.version>1.0.5</rewrite-static-analysis.version> - <rewrite-testing.version>2.0.9</rewrite-testing.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.openrewrite.maven</groupId> - <artifactId>rewrite-maven-plugin</artifactId> - <version>${rewrite-maven-plugin.version}</version> - <configuration> - <activeRecipes> - <recipe>org.apache.logging.log4j.rewrite.FinalizeAll</recipe> - </activeRecipes> - </configuration> - <dependencies> - <dependency> - <groupId>org.openrewrite</groupId> - <artifactId>rewrite-java</artifactId> - <version>${rewrite-java.version}</version> - </dependency> - <dependency> - <groupId>org.openrewrite.recipe</groupId> - <artifactId>rewrite-static-analysis</artifactId> - <version>${rewrite-static-analysis.version}</version> - </dependency> - <dependency> - <groupId>org.openrewrite.recipe</groupId> - <artifactId>rewrite-testing-frameworks</artifactId> - <version>${rewrite-testing.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>
