hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From x...@apache.org
Subject hadoop git commit: HADOOP-14474. Use OpenJDK 7 instead of Oracle JDK 7 to avoid oracle-java7-installer failures. Contributed by Akira Ajisaka.
Date Fri, 02 Jun 2017 16:38:51 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 d3b86234b -> 67e87c9af


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


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

Branch: refs/heads/branch-2.7
Commit: 67e87c9aff508f21760745ad677b937663d2bcba
Parents: d3b8623
Author: Xiao Chen <xiao@apache.org>
Authored: Fri Jun 2 09:28:31 2017 -0700
Committer: Xiao Chen <xiao@apache.org>
Committed: Fri Jun 2 09:36:08 2017 -0700

----------------------------------------------------------------------
 dev-support/docker/Dockerfile                   | 4 ----
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/67e87c9a/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 1de092f..e1fff8a 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -54,10 +54,6 @@ 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
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/67e87c9a/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 18f30a1..724299a 100644
--- 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


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message