From commits-return-5002-archive-asf-public=cust-asf.ponee.io@openwhisk.apache.org Tue Jun 19 19:19:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D6630180634 for ; Tue, 19 Jun 2018 19:19:15 +0200 (CEST) Received: (qmail 61693 invoked by uid 500); 19 Jun 2018 17:19:14 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 61684 invoked by uid 99); 19 Jun 2018 17:19:14 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2018 17:19:14 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 5E3F9857F3; Tue, 19 Jun 2018 17:19:14 +0000 (UTC) Date: Tue, 19 Jun 2018 17:19:13 +0000 To: "commits@openwhisk.apache.org" Subject: [incubator-openwhisk] branch master updated: Fixes for vagrant installation versus oracle jdk (#3783) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152942875379.22549.10160224165330713024@gitbox.apache.org> From: rabbah@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-openwhisk X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4b9fe25b80b2f1681ee2473cc7d6327b0c37edf8 X-Git-Newrev: df623d5cbe13076e36820f19f20a744713f32c84 X-Git-Rev: df623d5cbe13076e36820f19f20a744713f32c84 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. rabbah pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git The following commit(s) were added to refs/heads/master by this push: new df623d5 Fixes for vagrant installation versus oracle jdk (#3783) df623d5 is described below commit df623d5cbe13076e36820f19f20a744713f32c84 Author: Nick Mitchell AuthorDate: Tue Jun 19 13:19:09 2018 -0400 Fixes for vagrant installation versus oracle jdk (#3783) Fixes #3765 --- README.md | 2 +- tools/ubuntu-setup/java8.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e8269a..cb047b1 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ wsk action invoke /whisk.system/utils/echo -p message hello --result These steps were tested on Mac OS X El Capitan, Ubuntu 14.04.3 LTS and Windows using Vagrant. For more information about using OpenWhisk on Vagrant see the [tools/vagrant/README.md](tools/vagrant/README.md) -During the Vagrant setup, Open JDK 8 is used as the default Java environment. If you would like to use Oracle JDK 8, please change the line "su vagrant -c 'source all.sh'" into "su vagrant -c 'source all.sh oracle'" in tools/vagrant/Vagrantfile. +During the Vagrant setup, the Oracle JDK 8 is used as the default Java environment. If you would like to use OpenJDK 8, please change the line "su vagrant -c 'source all.sh oracle'" into "su vagrant -c 'source all.sh'" in tools/vagrant/Vagrantfile. ### Native development diff --git a/tools/ubuntu-setup/java8.sh b/tools/ubuntu-setup/java8.sh index bda7090..52c2298 100755 --- a/tools/ubuntu-setup/java8.sh +++ b/tools/ubuntu-setup/java8.sh @@ -34,5 +34,6 @@ else sudo add-apt-repository ppa:webupd8team/java -y sudo apt-get update + echo 'oracle-java8-installer shared/accepted-oracle-license-v1-1 boolean true' | sudo debconf-set-selections sudo apt-get install oracle-java8-installer -y fi