This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch LoggerContextProperties in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 67b69806f56bed838993067eff573e6d678d3529 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Apr 19 17:01:12 2023 +0200 Bump logging-parent from 8 to 9 By bumping to logging-parent 9, we remove the explicit Spotless configuration. --- checkstyle-header.txt | 16 ---------------- log4j-bom/pom.xml | 23 +---------------------- pom.xml | 44 +------------------------------------------- 3 files changed, 2 insertions(+), 81 deletions(-) diff --git a/checkstyle-header.txt b/checkstyle-header.txt deleted file mode 100644 index 4f33236203..0000000000 --- a/checkstyle-header.txt +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. - */ diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index 7d5cc40fe8..687da5beca 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>8</version> + <version>9</version> <relativePath/> </parent> <groupId>org.apache.logging.log4j</groupId> @@ -40,7 +40,6 @@ <maven.site.skip>true</maven.site.skip> <maven.site.deploy.skip>true</maven.site.deploy.skip> <project.build.outputTimestamp>0</project.build.outputTimestamp> - <spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version> </properties> <dependencyManagement> @@ -330,26 +329,6 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> </plugin> - <plugin> - <groupId>com.diffplug.spotless</groupId> - <artifactId>spotless-maven-plugin</artifactId> - <version>${spotless-maven-plugin.version}</version> - <configuration> - <pom> - <sortPom> - <expandEmptyElements>false</expandEmptyElements> - </sortPom> - </pom> - </configuration> - <executions> - <execution> - <id>default-spotless</id> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/pom.xml b/pom.xml index 9f6cb8412f..20ab81fc04 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>8</version> + <version>9</version> <relativePath/> </parent> @@ -370,7 +370,6 @@ <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <maven-taglib-plugin.version>2.4</maven-taglib-plugin.version> <spotbugs-maven-plugin.version>4.7.2.1</spotbugs-maven-plugin.version> - <spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version> <!-- `surefire.version` property used in `apache.org:apache`: --> <surefire.version>3.0.0-M7</surefire.version> <!-- Maven site depends on Velocity and the escaping rules are different in newer versions. --> @@ -1494,12 +1493,6 @@ <version>${spotbugs-maven-plugin.version}</version> </plugin> - <plugin> - <groupId>com.diffplug.spotless</groupId> - <artifactId>spotless-maven-plugin</artifactId> - <version>${spotless-maven-plugin.version}</version> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>xml-maven-plugin</artifactId> @@ -1603,41 +1596,6 @@ <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <plugin> - <groupId>com.diffplug.spotless</groupId> - <artifactId>spotless-maven-plugin</artifactId> - <configuration> - <ratchetFrom>HEAD~31</ratchetFrom> - <java> - <licenseHeader> - <file>${log4jParentDir}/checkstyle-header.txt</file> - </licenseHeader> - <trimTrailingWhitespace/> - <endWithNewline/> - <indent> - <spaces>true</spaces> - <spacesPerTab>4</spacesPerTab> - </indent> - <importOrder> - <order>java,org,com,\#</order> - </importOrder> - </java> - <pom> - <sortPom> - <expandEmptyElements>false</expandEmptyElements> - </sortPom> - </pom> - </configuration> - <executions> - <execution> - <id>default-spotless</id> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId>
