Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java update to jdk-11 #199

Closed
wants to merge 4 commits into from
Closed

Java update to jdk-11 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfaa49e
java: use jdk-11 by default since it is available in ubuntu 18-04
mishaschwartz Jun 5, 2019
26d6e4a
Revert "java: use jdk-11 by default since it is available in ubuntu 1…
mishaschwartz Jun 5, 2019
1dcd36e
java: use jdk-11 by default since it is available in ubuntu 18-04
mishaschwartz Jun 5, 2019
6ba4df8
java: update sourceCompatibility for java 11
mishaschwartz Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion testers/testers/java/bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

install_packages() {
echo "[JAVA-INSTALL] Installing system packages"
sudo apt-get install python3 openjdk-8-jdk jq
sudo apt-get install python3 openjdk-11-jdk jq
}

compile_tester() {
Expand Down
2 changes: 1 addition & 1 deletion testers/testers/java/bin/uninstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ JAVADIR=${TESTERDIR}/lib
# main
remove_tester
reset_specs
echo "[JAVA-UNINSTALL] The following system packages have not been uninstalled: python3 openjdk-12-jdk jq. You may uninstall them if you wish."
echo "[JAVA-UNINSTALL] The following system packages have not been uninstalled: python3 openjdk-11-jdk jq. You may uninstall them if you wish."
rm -f ${SPECSDIR}/.installed
2 changes: 1 addition & 1 deletion testers/testers/java/lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'application'

group = 'edu.toronto.cs.teach'
version = '1.7.1'
sourceCompatibility = 1.8
sourceCompatibility = 11.0
mainClassName = 'edu.toronto.cs.teach.MarkusJavaTester'

repositories {
Expand Down
2 changes: 1 addition & 1 deletion testers/testers/jdbc/bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

install_packages() {
echo "[JDBC-INSTALL] Installing system packages"
sudo apt-get install python3 openjdk-8-jdk jq
sudo apt-get install python3 openjdk-11-jdk jq
}

install_sql_tester() {
Expand Down
2 changes: 1 addition & 1 deletion testers/testers/jdbc/bin/uninstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ SPECSDIR=${TESTERDIR}/specs

# main
reset_specs
echo "[JDBC-UNINSTALL] The following system packages have not been uninstalled: python3 openjdk-12-jdk. You may uninstall them if you wish."
echo "[JDBC-UNINSTALL] The following system packages have not been uninstalled: python3 openjdk-11-jdk. You may uninstall them if you wish."
echo "[JDBC-UNINSTALL] The JDBC tester also installs the SQL tester. To remove the SQL tester as well run the uninstall.sh script in the sql/bin directory."
rm -f ${SPECSDIR}/.installed