Skip to content

Commit 70f07fe

Browse files
Aggarwal-RaghavAggarwal-Raghav
committed
TEZ-4575: Upgrade Apache parent pom version from 23 to 37
1 parent 9725e38 commit 70f07fe

7 files changed

Lines changed: 37 additions & 143 deletions

File tree

‎build-tools/docker/Dockerfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,15 @@ RUN mkdir -p /opt/spotbugs \
186186
ENV SPOTBUGS_HOME /opt/spotbugs
187187

188188
######
189-
# Install maven
189+
# Install Maven 3.9.14
190190
######
191-
# hadolint ignore=DL3008
192-
RUN apt-get -q update && apt-get -q install --no-install-recommends -y maven \
193-
&& apt-get clean \
194-
&& rm -rf /var/lib/apt/lists/*
191+
RUN mkdir -p /opt/maven \
192+
&& curl -L -s -S https://dlcdn.apache.org/maven/maven-3/3.9.14/binaries/apache-maven-3.9.14-bin.tar.gz \
193+
-o /opt/maven.tar.gz \
194+
&& tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven \
195+
&& ln -s /opt/maven/bin/mvn /usr/bin/mvn \
196+
&& rm /opt/maven.tar.gz
197+
ENV MAVEN_HOME /opt/maven
195198

196199
######
197200
# Install python3 and pylint4

‎docs/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@
467467
<plugin>
468468
<groupId>org.apache.maven.plugins</groupId>
469469
<artifactId>maven-site-plugin</artifactId>
470-
<version>${maven-site-plugin.version}</version>
471470
<configuration>
472471
<outputDirectory>./target</outputDirectory>
473472
</configuration>
@@ -488,7 +487,6 @@
488487
<plugin>
489488
<groupId>org.apache.maven.plugins</groupId>
490489
<artifactId>maven-project-info-reports-plugin</artifactId>
491-
<version>${maven-project-info-reports-plugin.version}</version>
492490
<configuration>
493491
<customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle>
494492
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>

‎pom.xml‎

Lines changed: 23 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.apache</groupId>
2121
<artifactId>apache</artifactId>
22-
<version>23</version>
22+
<version>37</version>
2323
</parent>
2424
<groupId>org.apache.tez</groupId>
2525
<artifactId>tez</artifactId>
@@ -30,21 +30,20 @@
3030
<licenses>
3131
<license>
3232
<name>The Apache Software License, Version 2.0</name>
33-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
33+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
3434
</license>
3535
</licenses>
3636

3737
<organization>
3838
<name>Apache Software Foundation</name>
39-
<url>http://www.apache.org</url>
39+
<url>https://www.apache.org</url>
4040
</organization>
4141

4242
<properties>
4343
<!-- Build Properties -->
44-
<maven.compiler.source>21</maven.compiler.source>
45-
<maven.compiler.target>21</maven.compiler.target>
44+
<javaVersion>21</javaVersion>
45+
<maven.compiler.release>21</maven.compiler.release>
4646
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
47-
<surefire.version>3.0.0-M4</surefire.version>
4847
<failIfNoTests>false</failIfNoTests>
4948
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5049
<build.time>${maven.build.timestamp}</build.time>
@@ -71,25 +70,18 @@
7170
<clover.license>${user.home}/clover.license</clover.license>
7271
<curator.version>5.9.0</curator.version>
7372
<dependency-check-maven.version>3.2.0</dependency-check-maven.version>
74-
<dependency-maven-plugin.version>3.8.1</dependency-maven-plugin.version>
7573
<spotbugs.version>4.9.3</spotbugs.version>
7674
<spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
7775
<plexus-velocity.version>2.3.0</plexus-velocity.version>
7876
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
7977
<guava.version>32.0.1-jre</guava.version>
8078
<hadoop.version>3.4.2</hadoop.version>
81-
<jdk.tools.version>1.8</jdk.tools.version>
8279
<jersey.version>1.19.4</jersey.version>
8380
<jettison.version>1.5.4</jettison.version>
8481
<jsr305.version>3.0.0</jsr305.version>
8582
<junit.version>4.13.2</junit.version>
8683
<leveldbjni-all.version>1.8</leveldbjni-all.version>
8784
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
88-
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
89-
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
90-
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
91-
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
92-
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
9385
<metrics-core.version>3.1.0</metrics-core.version>
9486
<mockito-core.version>4.8.1</mockito-core.version>
9587
<netty.version>4.1.130.Final</netty.version>
@@ -112,7 +104,6 @@
112104
--add-opens java.base/java.io=ALL-UNNAMED
113105
-Dnet.bytebuddy.experimental=true
114106
</test.jvm.args>
115-
116107
<maven.javadoc.skip>true</maven.javadoc.skip> <!-- enabled only in relevant modules separately -->
117108
</properties>
118109
<scm>
@@ -788,9 +779,9 @@
788779
<scope>test</scope>
789780
</dependency>
790781
<dependency>
791-
<groupId>com.google.protobuf</groupId>
792-
<artifactId>protobuf-java</artifactId>
793-
<version>${protobuf.version}</version>
782+
<groupId>com.google.protobuf</groupId>
783+
<artifactId>protobuf-java</artifactId>
784+
<version>${protobuf.version}</version>
794785
</dependency>
795786
<dependency>
796787
<groupId>com.google.guava</groupId>
@@ -805,7 +796,7 @@
805796
<dependency>
806797
<groupId>com.sun.jersey</groupId>
807798
<artifactId>jersey-client</artifactId>
808-
<version>${jersey.version}</version>
799+
<version>${jersey.version}</version>
809800
</dependency>
810801
<dependency>
811802
<groupId>com.sun.jersey</groupId>
@@ -859,11 +850,6 @@
859850
<build>
860851
<pluginManagement>
861852
<plugins>
862-
<plugin>
863-
<groupId>org.apache.maven.plugins</groupId>
864-
<artifactId>maven-dependency-plugin</artifactId>
865-
<version>${dependency-maven-plugin.version}</version>
866-
</plugin>
867853
<plugin>
868854
<groupId>org.apache.maven.plugins</groupId>
869855
<artifactId>maven-jar-plugin</artifactId>
@@ -975,7 +961,6 @@
975961
<plugin>
976962
<groupId>org.apache.maven.plugins</groupId>
977963
<artifactId>maven-checkstyle-plugin</artifactId>
978-
<version>${maven-checkstyle-plugin.version}</version>
979964
<dependencies>
980965
<dependency>
981966
<groupId>org.apache.tez</groupId>
@@ -1099,18 +1084,18 @@
10991084
</lifecycleMappingMetadata>
11001085
</configuration>
11011086
</plugin>
1102-
<plugin>
1087+
<plugin>
11031088
<groupId>ro.isdc.wro4j</groupId>
11041089
<artifactId>wro4j-maven-plugin</artifactId>
11051090
<version>${wro4j-maven-plugin.version}</version>
1106-
<dependencies>
1107-
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
1108-
<dependency>
1109-
<groupId>org.mockito</groupId>
1110-
<artifactId>mockito-core</artifactId>
1111-
<version>2.18.0</version>
1112-
</dependency>
1113-
</dependencies>
1091+
<dependencies>
1092+
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
1093+
<dependency>
1094+
<groupId>org.mockito</groupId>
1095+
<artifactId>mockito-core</artifactId>
1096+
<version>2.18.0</version>
1097+
</dependency>
1098+
</dependencies>
11141099
</plugin>
11151100
</plugins>
11161101
</pluginManagement>
@@ -1119,7 +1104,6 @@
11191104
<plugin>
11201105
<groupId>org.apache.maven.plugins</groupId>
11211106
<artifactId>maven-enforcer-plugin</artifactId>
1122-
<version>${maven-enforcer-plugin.version}</version>
11231107
<dependencies>
11241108
<dependency>
11251109
<groupId>de.skuzzle.enforcer</groupId>
@@ -1128,22 +1112,6 @@
11281112
</dependency>
11291113
</dependencies>
11301114
<executions>
1131-
<execution>
1132-
<id>clean</id>
1133-
<goals>
1134-
<goal>enforce</goal>
1135-
</goals>
1136-
<configuration>
1137-
<rules>
1138-
<requireMavenVersion>
1139-
<version>[3.6.3,)</version>
1140-
</requireMavenVersion>
1141-
<requireJavaVersion>
1142-
<version>[${maven.compiler.target},)</version>
1143-
</requireJavaVersion>
1144-
</rules>
1145-
</configuration>
1146-
</execution>
11471115
<execution>
11481116
<id>banned-illegal-imports</id>
11491117
<phase>process-sources</phase>
@@ -1168,34 +1136,14 @@
11681136
<groupId>org.apache.rat</groupId>
11691137
<artifactId>apache-rat-plugin</artifactId>
11701138
</plugin>
1171-
<plugin>
1172-
<groupId>org.apache.maven.plugins</groupId>
1173-
<artifactId>maven-deploy-plugin</artifactId>
1174-
</plugin>
1175-
<plugin>
1176-
<groupId>org.apache.maven.plugins</groupId>
1177-
<artifactId>maven-gpg-plugin</artifactId>
1178-
</plugin>
11791139
<plugin>
11801140
<groupId>org.codehaus.mojo</groupId>
11811141
<artifactId>buildnumber-maven-plugin</artifactId>
11821142
</plugin>
1183-
<plugin>
1184-
<groupId>org.apache.maven.plugins</groupId>
1185-
<artifactId>maven-jar-plugin</artifactId>
1186-
</plugin>
11871143
<plugin>
11881144
<groupId>org.codehaus.mojo</groupId>
11891145
<artifactId>build-helper-maven-plugin</artifactId>
11901146
</plugin>
1191-
<plugin>
1192-
<groupId>com.github.spotbugs</groupId>
1193-
<artifactId>spotbugs-maven-plugin</artifactId>
1194-
<configuration>
1195-
<excludeFilterFile>${basedir}/findbugs-exclude.xml</excludeFilterFile>
1196-
<failOnError>false</failOnError>
1197-
</configuration>
1198-
</plugin>
11991147
<plugin>
12001148
<groupId>com.diffplug.spotless</groupId>
12011149
<artifactId>spotless-maven-plugin</artifactId>
@@ -1210,39 +1158,19 @@
12101158
</executions>
12111159
</plugin>
12121160
<plugin>
1213-
<!-- OWASP's dependency-check plugin will scan the third party
1161+
<!-- OWASP's dependency-check plugin will scan the third party
12141162
dependencies of this project for known CVEs (security
12151163
vulnerabilities against them). It will produce a report
12161164
in target/dependency-check-report.html. To invoke, run
12171165
'mvn dependency-check:aggregate'
12181166
-->
1219-
<groupId>org.owasp</groupId>
1220-
<artifactId>dependency-check-maven</artifactId>
1221-
</plugin>
1222-
</plugins>
1167+
<groupId>org.owasp</groupId>
1168+
<artifactId>dependency-check-maven</artifactId>
1169+
</plugin>
1170+
</plugins>
12231171
</build>
12241172

12251173
<profiles>
1226-
<profile>
1227-
<id>sign</id>
1228-
<build>
1229-
<plugins>
1230-
<plugin>
1231-
<groupId>org.apache.maven.plugins</groupId>
1232-
<artifactId>maven-gpg-plugin</artifactId>
1233-
<executions>
1234-
<execution>
1235-
<id>sign-artifacts</id>
1236-
<phase>verify</phase>
1237-
<goals>
1238-
<goal>sign</goal>
1239-
</goals>
1240-
</execution>
1241-
</executions>
1242-
</plugin>
1243-
</plugins>
1244-
</build>
1245-
</profile>
12461174
<profile>
12471175
<id>clover</id>
12481176
<activation>
@@ -1298,25 +1226,6 @@
12981226
</plugins>
12991227
</build>
13001228
</profile>
1301-
<profile>
1302-
<id>sources</id>
1303-
<build>
1304-
<plugins>
1305-
<plugin>
1306-
<groupId>org.apache.maven.plugins</groupId>
1307-
<artifactId>maven-source-plugin</artifactId>
1308-
<executions>
1309-
<execution>
1310-
<id>attach-sources</id>
1311-
<goals>
1312-
<goal>jar</goal>
1313-
</goals>
1314-
</execution>
1315-
</executions>
1316-
</plugin>
1317-
</plugins>
1318-
</build>
1319-
</profile>
13201229
<profile>
13211230
<id>javadoc</id>
13221231
<build>
@@ -1360,21 +1269,6 @@
13601269
</plugins>
13611270
</build>
13621271
</profile>
1363-
<profile>
1364-
<id>jdk1.8</id>
1365-
<activation>
1366-
<jdk>1.8</jdk>
1367-
</activation>
1368-
<dependencies>
1369-
<dependency>
1370-
<groupId>jdk.tools</groupId>
1371-
<artifactId>jdk.tools</artifactId>
1372-
<version>${jdk.tools.version}</version>
1373-
<scope>system</scope>
1374-
<systemPath>${java.home}/../lib/tools.jar</systemPath>
1375-
</dependency>
1376-
</dependencies>
1377-
</profile>
13781272

13791273
<profile>
13801274
<activation>

‎tez-dag/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@
194194
<id>generate-sources</id>
195195
<phase>generate-sources</phase>
196196
<configuration>
197-
<tasks>
197+
<target>
198198
<delete dir="${test.log.dir}" />
199199
<mkdir dir="${test.log.dir}" />
200-
</tasks>
200+
</target>
201201
</configuration>
202202
<goals>
203203
<goal>run</goal>

‎tez-ext-service-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@
146146
<id>generate-sources</id>
147147
<phase>generate-sources</phase>
148148
<configuration>
149-
<tasks>
149+
<target>
150150
<delete dir="${test.log.dir}" />
151151
<mkdir dir="${test.log.dir}" />
152-
</tasks>
152+
</target>
153153
</configuration>
154154
<goals>
155155
<goal>run</goal>

‎tez-plugins/tez-aux-services/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
<plugin>
196196
<groupId>org.apache.maven.plugins</groupId>
197197
<artifactId>maven-shade-plugin</artifactId>
198-
<version>${maven-shade-plugin.version}</version>
199198
<executions>
200199
<execution>
201200
<phase>package</phase>

‎tez-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145
<id>generate-sources</id>
146146
<phase>generate-sources</phase>
147147
<configuration>
148-
<tasks>
148+
<target>
149149
<delete dir="${test.log.dir}" />
150150
<mkdir dir="${test.log.dir}" />
151-
</tasks>
151+
</target>
152152
</configuration>
153153
<goals>
154154
<goal>run</goal>

0 commit comments

Comments
 (0)