This is an automated email from the ASF dual-hosted git repository.
jeagles pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 1bb3116 TEZ-4266: Make Tez Inherit From Apache POM (#89)
1bb3116 is described below
commit 1bb3116147bf52c842daa46db8077f499829f63b
Author: belugabehr <[email protected]>
AuthorDate: Thu Jan 28 16:53:24 2021 -0500
TEZ-4266: Make Tez Inherit From Apache POM (#89)
(cherry picked from commit 0d3b428ecbd5b3c240191a6d1907010aa549c189)
---
pom.xml | 119 +++++-------------------
tez-dist/src/main/assembly/tez-dist-minimal.xml | 1 +
2 files changed, 24 insertions(+), 96 deletions(-)
diff --git a/pom.xml b/pom.xml
index fadbf2d..58f062c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ </parent>
<groupId>org.apache.tez</groupId>
<artifactId>tez</artifactId>
<packaging>pom</packaging>
@@ -35,31 +40,33 @@
</organization>
<properties>
+ <!-- Build Properties -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <clover.license>${user.home}/clover.license</clover.license>
- <hadoop.version>2.7.2</hadoop.version>
- <netty.version>3.6.2.Final</netty.version>
- <pig.version>0.13.0</pig.version>
- <javac.version>1.8</javac.version>
- <slf4j.version>1.7.10</slf4j.version>
- <enforced.java.version>[${javac.version},)</enforced.java.version>
+ <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>
+
<distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<distMgmtStagingId>apache.staging.https</distMgmtStagingId>
<distMgmtStagingName>Apache Release Distribution
Repository</distMgmtStagingName>
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
- <failIfNoTests>false</failIfNoTests>
+
+ <clover.license>${user.home}/clover.license</clover.license>
+ <hadoop.version>2.7.2</hadoop.version>
+ <netty.version>3.6.2.Final</netty.version>
+ <pig.version>0.13.0</pig.version>
+ <slf4j.version>1.7.10</slf4j.version>
<protobuf.version>2.5.0</protobuf.version>
<protoc.path>${env.PROTOC_PATH}</protoc.path>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
- <build.time>${maven.build.timestamp}</build.time>
<frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
- <javadoc-maven-plugin.version>2.10.4</javadoc-maven-plugin.version>
- <shade-maven-plugin.version>2.4.3</shade-maven-plugin.version>
- <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<checkstyle.version>8.35</checkstyle.version>
<dependency-check-maven.version>1.3.6</dependency-check-maven.version>
<test.build.data>${project.build.directory}/tmp</test.build.data>
@@ -739,22 +746,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>${javac.version}</source>
- <target>${javac.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
@@ -784,15 +776,9 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-maven-plugin.version}</version>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <doclint>none</doclint>
</configuration>
</plugin>
<plugin>
@@ -801,11 +787,6 @@
<version>${hadoop.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version>
@@ -816,19 +797,8 @@
<version>1.3.2</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${shade-maven-plugin.version}</version>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes>
<exclude>CHANGES.txt</exclude>
@@ -858,7 +828,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
@@ -912,29 +881,6 @@
<version>${findbugs-maven-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
@@ -989,20 +935,7 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
+ <plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>1.7.9</version>
@@ -1014,7 +947,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -1028,7 +960,7 @@
<version>[3.0.2,)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>${enforced.java.version}</version>
+ <version>[${maven.compiler.target},)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -1075,7 +1007,6 @@
-->
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>${dependency-check-maven.version}</version>
</plugin>
</plugins>
</build>
@@ -1227,7 +1158,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-maven-plugin.version}</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
</configuration>
@@ -1255,8 +1185,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<fork>true</fork>
- <source>${javac.version}</source>
- <target>${javac.version}</target>
<compilerArguments>
<Xlint/>
<Xmaxwarns>9999</Xmaxwarns>
@@ -1317,7 +1245,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-maven-plugin.version}</version>
<reportSets>
<reportSet>
<id>aggregate</id>
diff --git a/tez-dist/src/main/assembly/tez-dist-minimal.xml
b/tez-dist/src/main/assembly/tez-dist-minimal.xml
index 35f9be7..4c95d37 100644
--- a/tez-dist/src/main/assembly/tez-dist-minimal.xml
+++ b/tez-dist/src/main/assembly/tez-dist-minimal.xml
@@ -26,6 +26,7 @@
<exclude>org.apache.tez:tez-aux-services</exclude>
<exclude>org.apache.tez:tez-ext-service-tests</exclude>
<exclude>org.apache.tez:tez-ui</exclude>
+ <exclude>org.apache.tez:tez-docs</exclude>
</excludes>
<binaries>
<outputDirectory>/</outputDirectory>
