Repository: tez Updated Branches: refs/heads/master d5e65e207 -> 0ee044c0e
TEZ-3745. Change master to required java 8 (Siddharth Seth via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/0ee044c0 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0ee044c0 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0ee044c0 Branch: refs/heads/master Commit: 0ee044c0e61b6cc3ad48437ea4bb3f661419484d Parents: d5e65e2 Author: Jonathan Eagles <[email protected]> Authored: Fri Jun 2 11:05:28 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Fri Jun 2 11:05:28 2017 -0500 ---------------------------------------------------------------------- docs/src/site/markdown/install.md | 2 +- pom.xml | 22 +++++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/0ee044c0/docs/src/site/markdown/install.md ---------------------------------------------------------------------- diff --git a/docs/src/site/markdown/install.md b/docs/src/site/markdown/install.md index aadfa29..b1cdcf9 100644 --- a/docs/src/site/markdown/install.md +++ b/docs/src/site/markdown/install.md @@ -33,7 +33,7 @@ or higher. ``` 2. Build tez using `mvn clean package -DskipTests=true -Dmaven.javadoc.skip=true` - - This assumes that you have already installed JDK6 or later and Maven 3 or later. + - This assumes that you have already installed JDK8 or later and Maven 3 or later. - Tez also requires Protocol Buffers 2.5.0, including the protoc-compiler. * This can be downloaded from https://github.com/google/protobuf/tags/. * On Mac OS X with the homebrew package manager `brew install protobuf250` http://git-wip-us.apache.org/repos/asf/tez/blob/0ee044c0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7f3ad2e..9e20218 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ <jetty.version>6.1.26</jetty.version> <netty.version>3.6.2.Final</netty.version> <pig.version>0.13.0</pig.version> - <javac.version>1.7</javac.version> + <javac.version>1.8</javac.version> <slf4j.version>1.7.10</slf4j.version> <enforced.java.version>[${javac.version},)</enforced.java.version> <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId> @@ -58,7 +58,7 @@ <build.time>${maven.build.timestamp}</build.time> <frontend-maven-plugin.version>1.2</frontend-maven-plugin.version> <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version> - <javadoc-maven-plugin.version>2.9.1</javadoc-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> </properties> <scm> @@ -809,6 +809,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc-maven-plugin.version}</version> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> </plugin> <plugin> <groupId>org.apache.hadoop</groupId> @@ -1239,21 +1242,6 @@ </build> </profile> <profile> - <id>jdk1.7</id> - <activation> - <jdk>1.7</jdk> - </activation> - <dependencies> - <dependency> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - <version>1.7</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </profile> - <profile> <id>jdk1.8</id> <activation> <jdk>1.8</jdk>
