Skip to content

Commit 77e42ca

Browse files
[MDEP-796] Upgrade Maven Parent to 35
1 parent 78976c0 commit 77e42ca

File tree

1 file changed

+30
-51
lines changed

1 file changed

+30
-51
lines changed

pom.xml

Lines changed: 30 additions & 51 deletions
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>35</version>
2929
<relativePath/>
3030
</parent>
3131

@@ -93,11 +93,27 @@ under the License.
9393
<jettyVersion>9.4.45.v20220203</jettyVersion>
9494
<pluginTestingVersion>3.1.0</pluginTestingVersion>
9595
<javaVersion>8</javaVersion>
96-
<mavenPluginToolsVersion>3.6.4</mavenPluginToolsVersion>
9796
<project.build.outputTimestamp>2021-06-07T12:17:08Z</project.build.outputTimestamp>
9897
<slf4j.version>1.7.36</slf4j.version>
9998
</properties>
10099

100+
<dependencyManagement>
101+
<dependencies>
102+
<!-- TODO check with Maven Api upgrade -->
103+
<!-- the same version as in Maven 3.1.1 -->
104+
<dependency>
105+
<groupId>org.eclipse.sisu</groupId>
106+
<artifactId>org.eclipse.sisu.inject</artifactId>
107+
<version>0.0.0.M5</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.eclipse.sisu</groupId>
111+
<artifactId>org.eclipse.sisu.plexus</artifactId>
112+
<version>0.0.0.M5</version>
113+
</dependency>
114+
</dependencies>
115+
</dependencyManagement>
116+
101117
<dependencies>
102118
<!-- maven -->
103119
<dependency>
@@ -221,6 +237,7 @@ under the License.
221237
<dependency>
222238
<groupId>org.apache.maven.plugin-tools</groupId>
223239
<artifactId>maven-plugin-annotations</artifactId>
240+
<scope>provided</scope>
224241
</dependency>
225242

226243
<dependency>
@@ -324,6 +341,17 @@ under the License.
324341
<build>
325342
<pluginManagement>
326343
<plugins>
344+
<!-- TODO check with next parent pom -->
345+
<plugin>
346+
<groupId>org.apache.maven.plugins</groupId>
347+
<artifactId>maven-pmd-plugin</artifactId>
348+
<version>3.16.0</version>
349+
</plugin>
350+
<plugin>
351+
<groupId>org.codehaus.mojo</groupId>
352+
<artifactId>taglist-maven-plugin</artifactId>
353+
<version>3.0.0</version>
354+
</plugin>
327355
<plugin>
328356
<groupId>org.apache.rat</groupId>
329357
<artifactId>apache-rat-plugin</artifactId>
@@ -353,29 +381,6 @@ under the License.
353381
</excludes>
354382
</configuration>
355383
</plugin>
356-
<plugin>
357-
<artifactId>maven-javadoc-plugin</artifactId>
358-
<version>3.3.1</version>
359-
<configuration> <!-- remove after MPOM-269 -->
360-
<tagletArtifacts combine.self="override"/>
361-
</configuration>
362-
</plugin>
363-
<plugin>
364-
<groupId>org.apache.maven.plugins</groupId>
365-
<artifactId>maven-project-info-reports-plugin</artifactId>
366-
<version>3.1.2</version>
367-
</plugin>
368-
<plugin>
369-
<groupId>org.apache.maven.plugins</groupId>
370-
<artifactId>maven-site-plugin</artifactId>
371-
<version>3.10.0</version>
372-
</plugin>
373-
<plugin>
374-
<!-- version should be removed after will be updated in parent pom -->
375-
<groupId>org.apache.maven.plugins</groupId>
376-
<artifactId>maven-invoker-plugin</artifactId>
377-
<version>3.2.2</version>
378-
</plugin>
379384
</plugins>
380385
</pluginManagement>
381386
<plugins>
@@ -401,12 +406,6 @@ under the License.
401406
</execution>
402407
</executions>
403408
</plugin>
404-
<plugin>
405-
<artifactId>maven-javadoc-plugin</artifactId>
406-
<configuration> <!-- remove after MPOM-269 -->
407-
<tagletArtifacts combine.self="override"/>
408-
</configuration>
409-
</plugin>
410409
<plugin>
411410
<groupId>org.apache.maven.plugins</groupId>
412411
<artifactId>maven-surefire-plugin</artifactId>
@@ -448,7 +447,6 @@ under the License.
448447
<repository.proxy.url>${repository.proxy.url}</repository.proxy.url>
449448
</filterProperties>
450449
<addTestClassPath>true</addTestClassPath>
451-
<streamLogsOnFailures>true</streamLogsOnFailures>
452450
</configuration>
453451
</plugin>
454452
<plugin>
@@ -481,24 +479,5 @@ under the License.
481479
</plugins>
482480
</build>
483481
</profile>
484-
<profile>
485-
<id>reporting</id>
486-
<reporting>
487-
<plugins>
488-
<plugin>
489-
<groupId>org.codehaus.mojo</groupId>
490-
<artifactId>l10n-maven-plugin</artifactId>
491-
<version>1.0-alpha-2</version>
492-
<configuration>
493-
<locales>
494-
<locale>de</locale>
495-
<locale>pt_BR</locale>
496-
<locale>sv</locale>
497-
</locales>
498-
</configuration>
499-
</plugin>
500-
</plugins>
501-
</reporting>
502-
</profile>
503482
</profiles>
504483
</project>

0 commit comments

Comments
 (0)