You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/08/17 18:59:05 UTC
[maven-checkstyle-plugin] branch master updated: [MCHECKSTYLE-419] Upgrade Parent to 37 and cleanup
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 549bf3d [MCHECKSTYLE-419] Upgrade Parent to 37 and cleanup
549bf3d is described below
commit 549bf3d58a1608dedb0054fd9418efc3fcfffc33
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Wed Aug 17 19:49:26 2022 +0200
[MCHECKSTYLE-419] Upgrade Parent to 37 and cleanup
- upgrade parent to 37
- fix jenkins url
- Maven core artifacts in provided scope
- use plugins versions from parent
- l10n-maven-plugin to codehaus 1.0.0
- remove log4j properties - there isn't log4j on classpath
---
pom.xml | 47 ++++++++-----------------------------
src/main/resources/log4j.properties | 24 -------------------
2 files changed, 10 insertions(+), 61 deletions(-)
diff --git a/pom.xml b/pom.xml
index a1b3f34..ae15401 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>34</version>
+ <version>37</version>
<relativePath />
</parent>
@@ -53,7 +53,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-checkstyle-plugin/</url>
+ <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-checkstyle-plugin/</url>
</ciManagement>
<distributionManagement>
<site>
@@ -90,21 +90,25 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -247,25 +251,8 @@ under the License.
</excludes>
</configuration>
</plugin>
- <!-- remove with parent pom upgrade -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.6.1</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
+ <!-- check with parent pom upgrade -->
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<dependencies>
@@ -284,18 +271,6 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.6.1</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -342,6 +317,7 @@ under the License.
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<goals>
@@ -385,13 +361,10 @@ under the License.
<!-- can't use this version: parent still uses sourceDirectory -->
</plugin>
<plugin>
- <groupId>com.googlecode.l10n-maven-plugin</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>l10n-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>1.0.0</version>
<configuration>
- <excludes>
- <exclude>**/log4j.properties</exclude>
- </excludes>
<locales>
<locale>de</locale>
<locale>fr</locale>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index dc98239..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,24 +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.
-
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%c{1}:%L] %d{ISO8601} - %m%n
-
-log4j.logger.org.apache.commons.beanutils=ERROR