Skip to content

Commit

Permalink
[MCHECKSTYLE-419] Upgrade Parent to 37 and cleanup
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
slawekjaranowski committed Aug 17, 2022
1 parent 171827b commit 549bf3d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 61 deletions.
47 changes: 10 additions & 37 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
24 changes: 0 additions & 24 deletions src/main/resources/log4j.properties

This file was deleted.

0 comments on commit 549bf3d

Please sign in to comment.