Skip to content

Commit cf6e5d7

Browse files
authored
RATIS-2354. Bump Apache parent POM to 35 (#1309)
1 parent 063ff07 commit cf6e5d7

File tree

1 file changed

+2
-68
lines changed

1 file changed

+2
-68
lines changed

pom.xml

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>org.apache</groupId>
2020
<artifactId>apache</artifactId>
21-
<version>25</version>
21+
<version>35</version>
2222
<relativePath /> <!-- resolve from repository -->
2323
</parent>
2424

@@ -168,17 +168,10 @@
168168

169169
<!-- Maven plugin versions -->
170170
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
171-
<maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
172-
<maven-clover2-plugin.version>4.0.6</maven-clover2-plugin.version>
173-
<maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
174-
<maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
175-
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
176-
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
177171
<wagon-ssh.version>3.5.3</wagon-ssh.version>
178172
<hadoop-maven-plugins.version>3.4.0</hadoop-maven-plugins.version>
179173
<sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
180174

181-
182175
<!-- org.codehaus.mojo -->
183176
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
184177
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
@@ -457,10 +450,6 @@
457450
<version>${license-maven-plugin.version}</version>
458451
</plugin>
459452

460-
<plugin>
461-
<groupId>org.apache.maven.plugins</groupId>
462-
<artifactId>maven-install-plugin</artifactId>
463-
</plugin>
464453
<plugin>
465454
<groupId>org.apache.maven.plugins</groupId>
466455
<artifactId>maven-javadoc-plugin</artifactId>
@@ -473,11 +462,6 @@
473462
</additionalJOptions>
474463
</configuration>
475464
</plugin>
476-
<plugin>
477-
<groupId>org.apache.maven.plugins</groupId>
478-
<artifactId>maven-shade-plugin</artifactId>
479-
<version>${maven-shade-plugin.version}</version>
480-
</plugin>
481465
<plugin>
482466
<groupId>com.github.spotbugs</groupId>
483467
<artifactId>spotbugs-maven-plugin</artifactId>
@@ -499,16 +483,10 @@
499483
<artifactId>exec-maven-plugin</artifactId>
500484
<version>${exec-maven-plugin.version}</version>
501485
</plugin>
502-
<plugin>
503-
<groupId>org.apache.maven.plugins</groupId>
504-
<artifactId>maven-pdf-plugin</artifactId>
505-
<version>${maven-pdf-plugin.version}</version>
506-
</plugin>
507486

508487
<plugin>
509488
<groupId>org.apache.maven.plugins</groupId>
510489
<artifactId>maven-enforcer-plugin</artifactId>
511-
<version>3.2.1</version>
512490
<configuration>
513491
<rules>
514492
<requireMavenVersion>
@@ -571,21 +549,6 @@
571549
</compilerArgs>
572550
</configuration>
573551
</plugin>
574-
<!-- Make a jar and put the sources in the jar.
575-
In the parent pom, so submodules will do the right thing. -->
576-
<plugin>
577-
<groupId>org.apache.maven.plugins</groupId>
578-
<artifactId>maven-source-plugin</artifactId>
579-
<executions>
580-
<execution>
581-
<id>attach-sources</id>
582-
<phase>prepare-package</phase>
583-
<goals>
584-
<goal>jar-no-fork</goal>
585-
</goals>
586-
</execution>
587-
</executions>
588-
</plugin>
589552

590553
<!-- General configuration for submodules who want to build a test jar -->
591554
<plugin>
@@ -614,7 +577,6 @@
614577
<plugin>
615578
<groupId>org.apache.maven.plugins</groupId>
616579
<artifactId>maven-surefire-plugin</artifactId>
617-
<version>${maven-surefire-plugin.version}</version>
618580
<configuration>
619581
<failIfNoTests>false</failIfNoTests>
620582
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
@@ -657,10 +619,6 @@
657619
</configuration>
658620
</plugin>
659621

660-
<plugin>
661-
<groupId>org.apache.maven.plugins</groupId>
662-
<artifactId>maven-deploy-plugin</artifactId>
663-
</plugin>
664622
<plugin>
665623
<groupId>org.apache.rat</groupId>
666624
<artifactId>apache-rat-plugin</artifactId>
@@ -673,15 +631,6 @@
673631
</excludes>
674632
</configuration>
675633
</plugin>
676-
<plugin>
677-
<groupId>org.apache.maven.plugins</groupId>
678-
<artifactId>maven-antrun-plugin</artifactId>
679-
</plugin>
680-
<plugin>
681-
<groupId>org.apache.maven.plugins</groupId>
682-
<artifactId>maven-remote-resources-plugin</artifactId>
683-
<version>${maven-remote-resources-plugin.version}</version>
684-
</plugin>
685634
<plugin>
686635
<groupId>org.apache.maven.plugins</groupId>
687636
<artifactId>maven-site-plugin</artifactId>
@@ -693,11 +642,6 @@
693642
</dependency>
694643
</dependencies>
695644
</plugin>
696-
<plugin>
697-
<groupId>com.atlassian.maven.plugins</groupId>
698-
<artifactId>maven-clover2-plugin</artifactId>
699-
<version>${maven-clover2-plugin.version}</version>
700-
</plugin>
701645
<plugin>
702646
<groupId>org.apache.felix</groupId>
703647
<artifactId>maven-bundle-plugin</artifactId>
@@ -801,7 +745,6 @@
801745
<plugin>
802746
<groupId>org.apache.maven.plugins</groupId>
803747
<artifactId>maven-checkstyle-plugin</artifactId>
804-
<version>${maven-checkstyle-plugin.version}</version>
805748
<configuration>
806749
<!-- We decide not to check style on test directory to focus more on code than format. -->
807750
<!--includeTestSourceDirectory>true</includeTestSourceDirectory-->
@@ -810,15 +753,6 @@
810753
<linkXRef>false</linkXRef>
811754
</configuration>
812755
</plugin>
813-
<plugin>
814-
<groupId>org.apache.maven.plugins</groupId>
815-
<artifactId>maven-pdf-plugin</artifactId>
816-
<configuration>
817-
<outputDirectory>${project.reporting.outputDirectory}
818-
</outputDirectory>
819-
<includeReports>false</includeReports>
820-
</configuration>
821-
</plugin>
822756
<plugin>
823757
<groupId>org.codehaus.mojo</groupId>
824758
<artifactId>build-helper-maven-plugin</artifactId>
@@ -974,7 +908,7 @@
974908
<executions>
975909
<execution>
976910
<!-- builds source jars and attaches them to the project for publishing -->
977-
<id>ratis-java-sources</id>
911+
<id>attach-sources</id> <!-- override execution from maven-apache-parent POM -->
978912
<phase>package</phase>
979913
<goals>
980914
<goal>jar-no-fork</goal>

0 commit comments

Comments
 (0)