From cfaa49ef164ccfac46e8f048d7ad8a30e239fdb4 Mon Sep 17 00:00:00 2001 From: mishaschwartz Date: Wed, 5 Jun 2019 10:01:33 -0400 Subject: [PATCH 1/4] java: use jdk-11 by default since it is available in ubuntu 18-04 --- testers/testers/java/bin/install.sh | 2 +- testers/testers/java/bin/uninstall.sh | 2 +- testers/testers/jdbc/bin/install.sh | 2 +- testers/testers/jdbc/bin/uninstall.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testers/testers/java/bin/install.sh b/testers/testers/java/bin/install.sh index af6fe57b..452afaf1 100755 --- a/testers/testers/java/bin/install.sh +++ b/testers/testers/java/bin/install.sh @@ -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() { diff --git a/testers/testers/java/bin/uninstall.sh b/testers/testers/java/bin/uninstall.sh index 148be4a6..0c916c9f 100755 --- a/testers/testers/java/bin/uninstall.sh +++ b/testers/testers/java/bin/uninstall.sh @@ -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 diff --git a/testers/testers/jdbc/bin/install.sh b/testers/testers/jdbc/bin/install.sh index a5d34e26..cd59faef 100755 --- a/testers/testers/jdbc/bin/install.sh +++ b/testers/testers/jdbc/bin/install.sh @@ -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() { diff --git a/testers/testers/jdbc/bin/uninstall.sh b/testers/testers/jdbc/bin/uninstall.sh index 7f6a93cb..243c35ec 100755 --- a/testers/testers/jdbc/bin/uninstall.sh +++ b/testers/testers/jdbc/bin/uninstall.sh @@ -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 From 26d6e4aa2d3ce205bea3ef423d30b771f0cbfab0 Mon Sep 17 00:00:00 2001 From: mishaschwartz Date: Wed, 5 Jun 2019 10:13:43 -0400 Subject: [PATCH 2/4] Revert "java: use jdk-11 by default since it is available in ubuntu 18-04" This reverts commit 4b86410e6a8bf3c91b10452b3e2578fcd28a6ff3. --- testers/testers/java/bin/install.sh | 2 +- testers/testers/java/bin/uninstall.sh | 2 +- testers/testers/jdbc/bin/install.sh | 2 +- testers/testers/jdbc/bin/uninstall.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testers/testers/java/bin/install.sh b/testers/testers/java/bin/install.sh index 452afaf1..af6fe57b 100755 --- a/testers/testers/java/bin/install.sh +++ b/testers/testers/java/bin/install.sh @@ -4,7 +4,7 @@ set -e install_packages() { echo "[JAVA-INSTALL] Installing system packages" - sudo apt-get install python3 openjdk-11-jdk jq + sudo apt-get install python3 openjdk-8-jdk jq } compile_tester() { diff --git a/testers/testers/java/bin/uninstall.sh b/testers/testers/java/bin/uninstall.sh index 0c916c9f..148be4a6 100755 --- a/testers/testers/java/bin/uninstall.sh +++ b/testers/testers/java/bin/uninstall.sh @@ -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-11-jdk jq. You may uninstall them if you wish." +echo "[JAVA-UNINSTALL] The following system packages have not been uninstalled: python3 openjdk-12-jdk jq. You may uninstall them if you wish." rm -f ${SPECSDIR}/.installed diff --git a/testers/testers/jdbc/bin/install.sh b/testers/testers/jdbc/bin/install.sh index cd59faef..a5d34e26 100755 --- a/testers/testers/jdbc/bin/install.sh +++ b/testers/testers/jdbc/bin/install.sh @@ -4,7 +4,7 @@ set -e install_packages() { echo "[JDBC-INSTALL] Installing system packages" - sudo apt-get install python3 openjdk-11-jdk jq + sudo apt-get install python3 openjdk-8-jdk jq } install_sql_tester() { diff --git a/testers/testers/jdbc/bin/uninstall.sh b/testers/testers/jdbc/bin/uninstall.sh index 243c35ec..7f6a93cb 100755 --- a/testers/testers/jdbc/bin/uninstall.sh +++ b/testers/testers/jdbc/bin/uninstall.sh @@ -18,6 +18,6 @@ SPECSDIR=${TESTERDIR}/specs # main reset_specs -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 following system packages have not been uninstalled: python3 openjdk-12-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 From 1dcd36e4bc997c36cf002c058ea090917e9f4fe0 Mon Sep 17 00:00:00 2001 From: mishaschwartz Date: Wed, 5 Jun 2019 10:01:33 -0400 Subject: [PATCH 3/4] java: use jdk-11 by default since it is available in ubuntu 18-04 --- testers/testers/java/bin/install.sh | 2 +- testers/testers/java/bin/uninstall.sh | 2 +- testers/testers/jdbc/bin/install.sh | 2 +- testers/testers/jdbc/bin/uninstall.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testers/testers/java/bin/install.sh b/testers/testers/java/bin/install.sh index af6fe57b..452afaf1 100755 --- a/testers/testers/java/bin/install.sh +++ b/testers/testers/java/bin/install.sh @@ -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() { diff --git a/testers/testers/java/bin/uninstall.sh b/testers/testers/java/bin/uninstall.sh index 148be4a6..0c916c9f 100755 --- a/testers/testers/java/bin/uninstall.sh +++ b/testers/testers/java/bin/uninstall.sh @@ -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 diff --git a/testers/testers/jdbc/bin/install.sh b/testers/testers/jdbc/bin/install.sh index a5d34e26..cd59faef 100755 --- a/testers/testers/jdbc/bin/install.sh +++ b/testers/testers/jdbc/bin/install.sh @@ -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() { diff --git a/testers/testers/jdbc/bin/uninstall.sh b/testers/testers/jdbc/bin/uninstall.sh index 7f6a93cb..243c35ec 100755 --- a/testers/testers/jdbc/bin/uninstall.sh +++ b/testers/testers/jdbc/bin/uninstall.sh @@ -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 From 6ba4df8e3b9d1f726c93ba872c8101e6aff23238 Mon Sep 17 00:00:00 2001 From: mishaschwartz Date: Wed, 5 Jun 2019 17:24:46 -0400 Subject: [PATCH 4/4] java: update sourceCompatibility for java 11 --- testers/testers/java/lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testers/testers/java/lib/build.gradle b/testers/testers/java/lib/build.gradle index 02faefb6..6111e8dc 100644 --- a/testers/testers/java/lib/build.gradle +++ b/testers/testers/java/lib/build.gradle @@ -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 {