Skip to content

Commit 549bf3d

Browse files
[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
1 parent 171827b commit 549bf3d

File tree

2 files changed

+10
-61
lines changed

2 files changed

+10
-61
lines changed

pom.xml

+10-37
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ under the License.
2525
<parent>
2626
<artifactId>maven-plugins</artifactId>
2727
<groupId>org.apache.maven.plugins</groupId>
28-
<version>34</version>
28+
<version>37</version>
2929
<relativePath />
3030
</parent>
3131

@@ -53,7 +53,7 @@ under the License.
5353
</issueManagement>
5454
<ciManagement>
5555
<system>Jenkins</system>
56-
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-checkstyle-plugin/</url>
56+
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-checkstyle-plugin/</url>
5757
</ciManagement>
5858
<distributionManagement>
5959
<site>
@@ -90,21 +90,25 @@ under the License.
9090
<groupId>org.apache.maven</groupId>
9191
<artifactId>maven-artifact</artifactId>
9292
<version>${mavenVersion}</version>
93+
<scope>provided</scope>
9394
</dependency>
9495
<dependency>
9596
<groupId>org.apache.maven</groupId>
9697
<artifactId>maven-core</artifactId>
9798
<version>${mavenVersion}</version>
99+
<scope>provided</scope>
98100
</dependency>
99101
<dependency>
100102
<groupId>org.apache.maven</groupId>
101103
<artifactId>maven-model</artifactId>
102104
<version>${mavenVersion}</version>
105+
<scope>provided</scope>
103106
</dependency>
104107
<dependency>
105108
<groupId>org.apache.maven</groupId>
106109
<artifactId>maven-plugin-api</artifactId>
107110
<version>${mavenVersion}</version>
111+
<scope>provided</scope>
108112
</dependency>
109113
<dependency>
110114
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -247,25 +251,8 @@ under the License.
247251
</excludes>
248252
</configuration>
249253
</plugin>
250-
<!-- remove with parent pom upgrade -->
251-
<plugin>
252-
<groupId>org.apache.maven.plugins</groupId>
253-
<artifactId>maven-project-info-reports-plugin</artifactId>
254-
<version>3.3.0</version>
255-
</plugin>
256-
<plugin>
257-
<groupId>org.apache.maven.plugins</groupId>
258-
<artifactId>maven-enforcer-plugin</artifactId>
259-
<version>3.1.0</version>
260-
<dependencies>
261-
<dependency>
262-
<groupId>org.codehaus.mojo</groupId>
263-
<artifactId>extra-enforcer-rules</artifactId>
264-
<version>1.6.1</version>
265-
</dependency>
266-
</dependencies>
267-
</plugin>
268254
<plugin>
255+
<!-- check with parent pom upgrade -->
269256
<artifactId>maven-checkstyle-plugin</artifactId>
270257
<version>3.1.1</version>
271258
<dependencies>
@@ -284,18 +271,6 @@ under the License.
284271
</plugins>
285272
</pluginManagement>
286273
<plugins>
287-
<plugin>
288-
<groupId>org.apache.maven.plugins</groupId>
289-
<artifactId>maven-enforcer-plugin</artifactId>
290-
<version>3.1.0</version>
291-
<dependencies>
292-
<dependency>
293-
<groupId>org.codehaus.mojo</groupId>
294-
<artifactId>extra-enforcer-rules</artifactId>
295-
<version>1.6.1</version>
296-
</dependency>
297-
</dependencies>
298-
</plugin>
299274
<plugin>
300275
<groupId>org.codehaus.mojo</groupId>
301276
<artifactId>build-helper-maven-plugin</artifactId>
@@ -342,6 +317,7 @@ under the License.
342317
<plugin>
343318
<groupId>org.codehaus.plexus</groupId>
344319
<artifactId>plexus-component-metadata</artifactId>
320+
<version>2.1.1</version>
345321
<executions>
346322
<execution>
347323
<goals>
@@ -385,13 +361,10 @@ under the License.
385361
<!-- can't use this version: parent still uses sourceDirectory -->
386362
</plugin>
387363
<plugin>
388-
<groupId>com.googlecode.l10n-maven-plugin</groupId>
364+
<groupId>org.codehaus.mojo</groupId>
389365
<artifactId>l10n-maven-plugin</artifactId>
390-
<version>1.8</version>
366+
<version>1.0.0</version>
391367
<configuration>
392-
<excludes>
393-
<exclude>**/log4j.properties</exclude>
394-
</excludes>
395368
<locales>
396369
<locale>de</locale>
397370
<locale>fr</locale>

src/main/resources/log4j.properties

-24
This file was deleted.

0 commit comments

Comments
 (0)