浏览代码

HADOOP-14474. Use OpenJDK 7 instead of Oracle JDK 7 to avoid oracle-java7-installer failures. Contributed by Akira Ajisaka.

(cherry picked from commit 5e40efe0ec38f1e1228846a5448d93bf040868ff)
(cherry picked from commit d946387850ae2fe383df90dd2722560986236e31)

Conflicts:
	dev-support/docker/Dockerfile
Xiao Chen 8 年之前
父节点
当前提交
67e87c9aff
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 0 4
      dev-support/docker/Dockerfile
  2. 3 0
      hadoop-common-project/hadoop-common/CHANGES.txt

+ 0 - 4
dev-support/docker/Dockerfile

@@ -53,10 +53,6 @@ RUN apt-get install -y software-properties-common
 RUN add-apt-repository -y ppa:webupd8team/java
 RUN apt-get update
 
-# Auto-accept the Oracle JDK license
-RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-RUN apt-get install -y oracle-java7-installer
-
 # Auto-accept the Oracle JDK license
 RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
 RUN apt-get install -y oracle-java8-installer

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -154,6 +154,9 @@ Release 2.7.4 - UNRELEASED
     HADOOP-7851. Configuration.getClasses() never returns the default value. 
     (Uma Maheswara Rao G via amarrk)
 
+    HADOOP-14474. Use OpenJDK 7 instead of Oracle JDK 7 to avoid
+    oracle-java7-installer failures. (Akira Ajisaka via xiao)
+
 Release 2.7.3 - 2016-08-25
 
   INCOMPATIBLE CHANGES