Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions build-tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,15 @@ RUN mkdir -p /opt/spotbugs \
ENV SPOTBUGS_HOME /opt/spotbugs

######
# Install maven
# Install Maven 3.9.14
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrading maven version as apache parent 37 uses maven 3.9 minimum

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

######
# Install python3 and pylint4
Expand Down
2 changes: 0 additions & 2 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
<outputDirectory>./target</outputDirectory>
</configuration>
Expand All @@ -488,7 +487,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
<configuration>
<customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
Expand Down
176 changes: 24 additions & 152 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
<version>37</version>
</parent>
<groupId>org.apache.tez</groupId>
<artifactId>tez</artifactId>
Expand All @@ -30,23 +30,22 @@
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
<url>https://www.apache.org</url>
</organization>

<properties>
<!-- Build Properties -->
<!-- Default empty argLine to prevent Surefire crashes when the 'jacoco' profile is inactive -->
<argLine/>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<javaVersion>21</javaVersion>
<maven.compiler.release>21</maven.compiler.release>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<surefire.version>3.0.0-M4</surefire.version>
<failIfNoTests>false</failIfNoTests>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build.time>${maven.build.timestamp}</build.time>
Expand All @@ -72,26 +71,18 @@
<commons-lang3.version>3.19.0</commons-lang3.version>
<curator.version>5.9.0</curator.version>
<dependency-check-maven.version>3.2.0</dependency-check-maven.version>
<dependency-maven-plugin.version>3.8.1</dependency-maven-plugin.version>
<spotbugs.version>4.9.3</spotbugs.version>
<spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
<plexus-velocity.version>2.3.0</plexus-velocity.version>
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
<guava.version>32.0.1-jre</guava.version>
<hadoop.version>3.4.2</hadoop.version>
<jdk.tools.version>1.8</jdk.tools.version>
<jersey.version>1.19.4</jersey.version>
<jettison.version>1.5.4</jettison.version>
<jsr305.version>3.0.0</jsr305.version>
<junit.version>4.13.2</junit.version>
<leveldbjni-all.version>1.8</leveldbjni-all.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
<metrics-core.version>3.1.0</metrics-core.version>
<mockito-core.version>4.8.1</mockito-core.version>
<netty.version>4.1.130.Final</netty.version>
Expand Down Expand Up @@ -778,9 +769,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -795,7 +786,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Expand Down Expand Up @@ -849,11 +840,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${dependency-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -887,9 +873,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<doclint>none</doclint>
<docfilessubdirs>true</docfilessubdirs>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -975,7 +961,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.tez</groupId>
Expand Down Expand Up @@ -1099,18 +1084,18 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>${wro4j-maven-plugin.version}</version>
<dependencies>
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.18.0</version>
</dependency>
</dependencies>
<dependencies>
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.18.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -1119,7 +1104,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
<dependencies>
<dependency>
<groupId>de.skuzzle.enforcer</groupId>
Expand All @@ -1128,22 +1112,6 @@
</dependency>
</dependencies>
<executions>
<execution>
<id>clean</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.6.3,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[${maven.compiler.target},)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
<execution>
<id>banned-illegal-imports</id>
<phase>process-sources</phase>
Expand All @@ -1168,34 +1136,14 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>${basedir}/findbugs-exclude.xml</excludeFilterFile>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
Expand All @@ -1210,39 +1158,19 @@
</executions>
</plugin>
<plugin>
<!-- OWASP's dependency-check plugin will scan the third party
<!-- OWASP's dependency-check plugin will scan the third party
dependencies of this project for known CVEs (security
vulnerabilities against them). It will produce a report
in target/dependency-check-report.html. To invoke, run
'mvn dependency-check:aggregate'
-->
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
</plugin>
</plugins>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>sign</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jacoco</id>
<activation>
Expand Down Expand Up @@ -1302,47 +1230,6 @@
</plugins>
</build>
</profile>
<profile>
<id>sources</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing gpg and sources profiles as they are run in -Papache-release profile present in apace parent 37 pom https://maven.apache.org/pom/asf/

<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>javadoc</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>test-patch</id>
<activation>
Expand All @@ -1364,21 +1251,6 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk1.8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<dependencies>
<dependency>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
<version>${jdk.tools.version}</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>

<profile>
<activation>
Expand Down
4 changes: 2 additions & 2 deletions tez-dag/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
<target>
<delete dir="${test.log.dir}" />
<mkdir dir="${test.log.dir}" />
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down
4 changes: 2 additions & 2 deletions tez-ext-service-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
<target>
<delete dir="${test.log.dir}" />
<mkdir dir="${test.log.dir}" />
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down
1 change: 0 additions & 1 deletion tez-plugins/tez-aux-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
Loading
Loading