Skip to content

Commit

Permalink
Merge branch 'hotfix/2.8.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Walt Shands committed Sep 10, 2021
2 parents 6c9756c + 6d550cd commit fce0433
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "2.8.0",
"license": "Apache License 2.0",
"config": {
"webservice_version": "1.11.6"
"webservice_version": "1.11.8"
},
"scripts": {
"ng": "npx ng",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fce0433

Please sign in to comment.