HADOOP-14474. Use OpenJDK 7 instead of Oracle JDK 7 to avoid oracle-j…

…ava7-installer failures. Contributed by Akira Ajisaka. (cherry picked from commit 5e40efe) (cherry picked from commit d946387) Conflicts: dev-support/docker/Dockerfile
kunpengcompute · Jun 2, 2017 · 67e87c9 · 67e87c9
1 parent d3b8623
commit 67e87c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/dev-support/docker/Dockerfile b/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

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/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