[47/50] [abbrv] hadoop git commit: HADOOP-14670. Increase minimum cmake version for all platforms

2017-08-31 Thread stevel 
HADOOP-14670. Increase minimum cmake version for all platforms

Signed-off-by: Chris Douglas 


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71bbb86d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71bbb86d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71bbb86d

Branch: refs/heads/HADOOP-13345
Commit: 71bbb86d69ac474596f5619d22718e9f7ff5f9dc
Parents: ce79f7b
Author: Allen Wittenauer 
Authored: Wed Jul 19 17:51:14 2017 -0700
Committer: Allen Wittenauer 
Committed: Wed Aug 30 21:47:24 2017 -0700

--
 BUILDING.txt|  4 +--
 dev-support/docker/Dockerfile   | 17 ++---
 .../hadoop-common/HadoopCommon.cmake| 26 
 .../hadoop-common/src/CMakeLists.txt|  2 +-
 .../bzip2/org_apache_hadoop_io_compress_bzip2.h |  2 ++
 .../src/CMakeLists.txt  |  2 +-
 .../src/main/native/fuse-dfs/CMakeLists.txt |  2 ++
 .../main/native/libhdfs-tests/CMakeLists.txt|  2 ++
 .../src/main/native/libhdfs/CMakeLists.txt  |  3 +++
 .../src/CMakeLists.txt  |  2 +-
 .../maven/plugin/cmakebuilder/CompileMojo.java  |  2 --
 hadoop-tools/hadoop-pipes/src/CMakeLists.txt|  2 +-
 .../src/CMakeLists.txt  | 22 ++---
 start-build-env.sh  |  2 ++
 14 files changed, 49 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/71bbb86d/BUILDING.txt
--
diff --git a/BUILDING.txt b/BUILDING.txt
index f9cc842..14deec8 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -7,7 +7,7 @@ Requirements:
 * JDK 1.8+
 * Maven 3.3 or later
 * ProtocolBuffer 2.5.0
-* CMake 2.6 or newer (if compiling native code), must be 3.0 or newer on Mac
+* CMake 3.1 or newer (if compiling native code)
 * Zlib devel (if compiling native code)
 * openssl devel (if compiling native hadoop-pipes and to get the best HDFS 
encryption performance)
 * Linux FUSE (Filesystem in Userspace) version 2.6 or above (if compiling 
fuse_dfs)
@@ -345,7 +345,7 @@ Requirements:
 * JDK 1.8+
 * Maven 3.0 or later
 * ProtocolBuffer 2.5.0
-* CMake 2.6 or newer
+* CMake 3.1 or newer
 * Windows SDK 7.1 or Visual Studio 2010 Professional
 * Windows SDK 8.1 (if building CPU rate control for the container executor)
 * zlib headers (if building native code bindings for zlib)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/71bbb86d/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 1775323..31ac611 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -35,7 +35,6 @@ ENV DEBCONF_TERSE true
 RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
 build-essential \
 bzip2 \
-cmake \
 curl \
 doxygen \
 fuse \
@@ -89,11 +88,22 @@ RUN apt-get -q update && apt-get -q install 
--no-install-recommends -y ant
 ##
 RUN mkdir -p /opt/maven && \
 curl -L -s -S \
- 
http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 \
+ 
https://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 \
  -o /opt/maven.tar.gz && \
 tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven
 ENV MAVEN_HOME /opt/maven
-ENV PATH "$PATH:/opt/maven/bin"
+ENV PATH "${PATH}:/opt/maven/bin"
+
+##
+# Install cmake
+##
+RUN mkdir -p /opt/cmake && \
+curl -L -s -S \
+ https://cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz \
+ -o /opt/cmake.tar.gz && \
+tar xzf /opt/cmake.tar.gz --strip-components 1 -C /opt/cmake
+ENV CMAKE_HOME /opt/cmake
+ENV PATH "${PATH}:/opt/cmake/bin"
 
 ##
 # Install findbugs
@@ -104,6 +114,7 @@ RUN mkdir -p /opt/findbugs && \
  -o /opt/findbugs.tar.gz && \
 tar xzf /opt/findbugs.tar.gz --strip-components 1 -C /opt/findbugs
 ENV FINDBUGS_HOME /opt/findbugs
+ENV PATH "${PATH}:/opt/findbugs/bin"
 
 
 # Install shellcheck

http://git-wip-us.apache.org/repos/asf/hadoop/blob/71bbb86d/hadoop-common-project/hadoop-common/HadoopCommon.cmake
--
diff --git a/hadoop-common-project/hadoop-common/HadoopCommon.cmake 
b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
index c46d9e5..faabeed 100644
--- a/hadoop-common-project/hadoop-common/HadoopCommon.cmake
+++ b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
@@ -117,19 +117,25 @@ macro(hadoop_set_find_shared_library_without_version)
 endif()
 endmacro()
 
-#
-# Configuration.
-#
 
-# Initialise the shared gc

hadoop git commit: HADOOP-14670. Increase minimum cmake version for all platforms

2017-08-30 Thread aw 
Repository: hadoop
Updated Branches:
  refs/heads/trunk ce79f7be2 -> 71bbb86d6


HADOOP-14670. Increase minimum cmake version for all platforms

Signed-off-by: Chris Douglas 


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71bbb86d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71bbb86d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71bbb86d

Branch: refs/heads/trunk
Commit: 71bbb86d69ac474596f5619d22718e9f7ff5f9dc
Parents: ce79f7b
Author: Allen Wittenauer 
Authored: Wed Jul 19 17:51:14 2017 -0700
Committer: Allen Wittenauer 
Committed: Wed Aug 30 21:47:24 2017 -0700

--
 BUILDING.txt|  4 +--
 dev-support/docker/Dockerfile   | 17 ++---
 .../hadoop-common/HadoopCommon.cmake| 26 
 .../hadoop-common/src/CMakeLists.txt|  2 +-
 .../bzip2/org_apache_hadoop_io_compress_bzip2.h |  2 ++
 .../src/CMakeLists.txt  |  2 +-
 .../src/main/native/fuse-dfs/CMakeLists.txt |  2 ++
 .../main/native/libhdfs-tests/CMakeLists.txt|  2 ++
 .../src/main/native/libhdfs/CMakeLists.txt  |  3 +++
 .../src/CMakeLists.txt  |  2 +-
 .../maven/plugin/cmakebuilder/CompileMojo.java  |  2 --
 hadoop-tools/hadoop-pipes/src/CMakeLists.txt|  2 +-
 .../src/CMakeLists.txt  | 22 ++---
 start-build-env.sh  |  2 ++
 14 files changed, 49 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/71bbb86d/BUILDING.txt
--
diff --git a/BUILDING.txt b/BUILDING.txt
index f9cc842..14deec8 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -7,7 +7,7 @@ Requirements:
 * JDK 1.8+
 * Maven 3.3 or later
 * ProtocolBuffer 2.5.0
-* CMake 2.6 or newer (if compiling native code), must be 3.0 or newer on Mac
+* CMake 3.1 or newer (if compiling native code)
 * Zlib devel (if compiling native code)
 * openssl devel (if compiling native hadoop-pipes and to get the best HDFS 
encryption performance)
 * Linux FUSE (Filesystem in Userspace) version 2.6 or above (if compiling 
fuse_dfs)
@@ -345,7 +345,7 @@ Requirements:
 * JDK 1.8+
 * Maven 3.0 or later
 * ProtocolBuffer 2.5.0
-* CMake 2.6 or newer
+* CMake 3.1 or newer
 * Windows SDK 7.1 or Visual Studio 2010 Professional
 * Windows SDK 8.1 (if building CPU rate control for the container executor)
 * zlib headers (if building native code bindings for zlib)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/71bbb86d/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 1775323..31ac611 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -35,7 +35,6 @@ ENV DEBCONF_TERSE true
 RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
 build-essential \
 bzip2 \
-cmake \
 curl \
 doxygen \
 fuse \
@@ -89,11 +88,22 @@ RUN apt-get -q update && apt-get -q install 
--no-install-recommends -y ant
 ##
 RUN mkdir -p /opt/maven && \
 curl -L -s -S \
- 
http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 \
+ 
https://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 \
  -o /opt/maven.tar.gz && \
 tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven
 ENV MAVEN_HOME /opt/maven
-ENV PATH "$PATH:/opt/maven/bin"
+ENV PATH "${PATH}:/opt/maven/bin"
+
+##
+# Install cmake
+##
+RUN mkdir -p /opt/cmake && \
+curl -L -s -S \
+ https://cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz \
+ -o /opt/cmake.tar.gz && \
+tar xzf /opt/cmake.tar.gz --strip-components 1 -C /opt/cmake
+ENV CMAKE_HOME /opt/cmake
+ENV PATH "${PATH}:/opt/cmake/bin"
 
 ##
 # Install findbugs
@@ -104,6 +114,7 @@ RUN mkdir -p /opt/findbugs && \
  -o /opt/findbugs.tar.gz && \
 tar xzf /opt/findbugs.tar.gz --strip-components 1 -C /opt/findbugs
 ENV FINDBUGS_HOME /opt/findbugs
+ENV PATH "${PATH}:/opt/findbugs/bin"
 
 
 # Install shellcheck

http://git-wip-us.apache.org/repos/asf/hadoop/blob/71bbb86d/hadoop-common-project/hadoop-common/HadoopCommon.cmake
--
diff --git a/hadoop-common-project/hadoop-common/HadoopCommon.cmake 
b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
index c46d9e5..faabeed 100644
--- a/hadoop-common-project/hadoop-common/HadoopCommon.cmake
+++ b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
@@ -117,19 +117,25 @@ macro(hadoop_set_find_shared_library_without_version)
 e