From 1e289456d6f044c063175642c94a7536cb8e2721 Mon Sep 17 00:00:00 2001 From: Stephen Von Worley Date: Thu, 2 Sep 2021 11:31:18 -0700 Subject: [PATCH 1/3] Overhauled quick start MacOS Java installation instructions (#1342) (#1344) https://github.com/dockstore/dockstore/issues/4417 --- .../downloadcliclient.component.ts | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts index ec5e60de81..c518502951 100644 --- a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts +++ b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts @@ -89,19 +89,25 @@ exec newgrp docker `; this.textDataMacOs = ` #### Part 1 - Install dependencies -1. We'll cover two ways to install Java 11. One way is to download the JDK for MacOS from [OpenJDK](https://jdk.java.net/archive/) and executing the following commands. -\`\`\` -// put the JDK in its standard location -sudo mv jdk-11.0.2.jdk /Library/Java/JavaVirtualMachines/ \n\n // List the JDKs that are installed; you should see version 11 -/usr/libexec/java_home -V \n\n // If you need to switch to Java 11, run the following -/usr/libexec/java_home -v 11.0.2 \n\n // Check that if $JAVA_HOME is set to the correct JDK. Should look similar to /Library/Java/JavaVirtualMachines/jdk-11.0.2.jdk/Contents/Home/ -echo $JAVA_HOME/ \n \n // If it is not check your .bashrc or .bash_profile to find out where it is being set. Fix it and/or source the correct one. -/usr/libexec/java_home \n\n // Use the output from the above command and run -export JAVA_HOME={OUTPUT FROM ABOVE COMMAND} \n\n // Check that the default version is JDK 11 +1. We'll cover two ways to install Java 11. One way is to download the JDK for MacOS from [OpenJDK](https://jdk.java.net/archive/) and executing the following commands. First, unpack the downloaded tar archive, then move the resulting JDK directory to its standard location and check the Java version: +\`\`\` +sudo mv jdk-11.0.2.jdk /Library/Java/JavaVirtualMachines/ +java -version +\`\`\` +If the reported version is JDK 11, you've correctly installed Java! If not, check the list of the JDKs that are installed; you should see version 11: +\`\`\` +/usr/libexec/java_home -V +\`\`\` +Next, set the \`JAVA_HOME\` environment variable to the correct JDK system path +and confirm the Java version: +\`\`\` +unset JAVA_HOME +export JAVA_HOME=\`/usr/libexec/java_home -v 11\` java -version \`\`\` +Add the above export line to your \`.bashrc\` or \`.bash_profile\` to set \`JAVA_HOME\` properly every time you invoke a shell. -2. Or to install using Homebrew, execute the following commands: +2. Or to install Java 11 using Homebrew, execute the following commands: \`\`\` brew tap AdoptOpenJDK/openjdk brew cask install adoptopenjdk11 From 95d792a62dc2b00890156bcbea612122eb67f683 Mon Sep 17 00:00:00 2001 From: Walt Shands Date: Tue, 7 Sep 2021 15:21:16 -0700 Subject: [PATCH 2/3] bump webservice version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec3190ce8c..6161f0f324 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "2.8.0", "license": "Apache License 2.0", "config": { - "webservice_version": "1.11.6" + "webservice_version": "1.11.7" }, "scripts": { "ng": "npx ng", From 6d550cdcecc8bd2f0e6c26aedcb207467ccb931c Mon Sep 17 00:00:00 2001 From: Walter Shands Date: Fri, 10 Sep 2021 09:16:13 -0700 Subject: [PATCH 3/3] bump webservice to 1.11.8 (#1353) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6161f0f324..5f63c99211 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "2.8.0", "license": "Apache License 2.0", "config": { - "webservice_version": "1.11.7" + "webservice_version": "1.11.8" }, "scripts": { "ng": "npx ng",