diff --git a/build.gradle b/build.gradle
index 75c23571..296bfbe3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,16 +13,18 @@
  */
 
 plugins {
-    id "com.github.hierynomus.license" version "0.11.0"
+    id "com.github.hierynomus.license" version "0.16.1"
+    id 'signing'
+    id 'maven-publish'
 }
 
 apply plugin: 'idea'
 apply plugin: 'java'
 apply plugin: 'groovy'
 
-plugins.withType(JavaPlugin) {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 ext.versions = [
@@ -32,7 +34,7 @@ ext.versions = [
         log4j        : '1.2.17',
         testng       : '7.5',
         junit        : '4.12',
-        spock        : '1.0-groovy-2.4',
+        spock        : '2.3-groovy-4.0',
         slf4j        : '1.7.12',
         hsqldb       : '2.3.2',
         dbutils      : '1.6',
@@ -48,7 +50,7 @@ ext.versions = [
         hive         : '3.0.0-2',
         presto       : '0.181',
         reflections  : '0.9.9',
-        bytebuddy    : '0.7-rc2',
+        bytebuddy    : '1.15.4',
         jsch         : '0.1.55',
         mina_sshd    : '0.14.0',
         freemarker   : '2.3.22',
@@ -113,7 +115,7 @@ ext.tempto_runner = project(':tempto-runner')
 ext.tempto_ldap = project(':tempto-ldap')
 ext.tempto_kafka = project(':tempto-kafka')
 ext.expected_result_generator = project(':expected-result-generator')
-ext.tempto_version = '1.53'
+ext.tempto_version = '1.54-SNAPSHOT'
 ext.tempto_group = "io.prestodb.tempto"
 ext.isReleaseVersion = !tempto_version.endsWith("SNAPSHOT")
 
@@ -141,23 +143,24 @@ subprojects {
 configure(subprojects - expected_result_generator - tempto_examples) {
     apply plugin: 'signing'
     apply plugin: 'java'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
 
     // plugins configuration
     javadoc {
         failOnError = true
     }
 
-    // javadoc.jar generation
+   // javadoc.jar generation
     task javadocJar(type: Jar) {
-        classifier = 'javadoc'
-        from javadoc
+        archiveClassifier.set('javadoc')
+        from(javadoc)
     }
 
+
     // sources.jar generation
     task sourcesJar(type: Jar) {
-        classifier = 'sources'
-        from sourceSets.main.allJava
+        archiveClassifier.set('sources')
+        from(sourceSets.main.allJava)
     }
 
     signing {
@@ -170,41 +173,37 @@ configure(subprojects - expected_result_generator - tempto_examples) {
     }
 
     // publishing to sonatype
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: nexusUsername, password: nexusPassword)
+    publishing {
+        publications {
+            maven(MavenPublication) {
+                group tempto_group
+                version tempto_version
+
+                from components.java
+
+                pom {
+                    packaging = 'jar'
+                    description = 'Tempto - test framework'
+                    url = 'https://github.com/prestodb/tempto'
                 }
+            }
+        }
 
-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                    authentication(userName: nexusUsername, password: nexusPassword)
+        repositories {
+            maven {
+                url = uri('https://oss.sonatype.org/service/local/staging/deploy/maven2/')
+                credentials {
+                    username = System.getenv('NEXUS_USERNAME')
+                    password = System.getenv('NEXUS_PASSWORD')
                 }
+            }
 
-                pom.project {
-                    packaging 'jar'
-                    description 'Tempto - test framework'
-                    url 'https://github.com/prestodb/tempto'
-                    scm {
-                        url 'git@github.com:prestodb/tempto.git'
-                        connection 'scm:git:git@github.com:prestodb/tempto.git'
-                        developerConnection 'scm:git:git@github.com:prestodb/tempto.git'
-                    }
-                    licenses {
-                        license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'http://www.apache.org/license/LICENSE-2.0.txt'
-                        }
-                    }
-                    developers {
-                        developer {
-                            id 'thc'
-                            name 'Teradata Hadoop Center'
-                            email 'EB230060 aat teradata doot com'
-                        }
-                    }
+            maven {
+                url = uri('https://oss.sonatype.org/content/repositories/snapshots/')
+                credentials {
+                    username = System.getenv('NEXUS_USERNAME')
+                    password = System.getenv('NEXUS_PASSWORD')
                 }
             }
         }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0087cd3b..a4b76b95 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f1dee261..e2847c82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,80 +15,116 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,87 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a14..9b42019c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +27,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -51,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/tempto-core/build.gradle b/tempto-core/build.gradle
index ffbc0bf2..2862ab66 100644
--- a/tempto-core/build.gradle
+++ b/tempto-core/build.gradle
@@ -14,62 +14,75 @@
 
 apply plugin: 'java'
 apply plugin: 'signing'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'groovy'
 
 dependencies {
-    compile libraries.assertj
-    compile libraries.guava
-    compile libraries.guice
-    compile libraries.testng
-    compile libraries.commons_lang3
-    compile libraries.commons_dbcp2
-    compile libraries.slf4j_api
-    compile libraries.snakeyaml
-    compile libraries.httpclient
-    compile libraries.ioutils
-    compile libraries.tpchgen
-    compile libraries.tpcdsgen
-    compile libraries.bytebuddy
-    compile libraries.reflections
-    compile libraries.jsch
-    compile libraries.freemarker
-    compile libraries.joda
-    compile libraries.jackson_databind
-    compile libraries.jackson_datatype_jdk8
-    compile libraries.cassandra_driver
-    compile libraries.hive
-    compile libraries.thrift
+    implementation libraries.assertj
+    implementation libraries.junit
+    implementation libraries.guava
+    implementation libraries.guice
+    implementation libraries.testng
+    implementation libraries.commons_lang3
+    implementation libraries.commons_dbcp2
+    implementation libraries.slf4j_api
+    implementation libraries.snakeyaml
+    implementation libraries.httpclient
+    implementation libraries.ioutils
+    implementation libraries.tpchgen
+    implementation libraries.tpcdsgen
+    implementation libraries.bytebuddy
+    implementation libraries.reflections
+    implementation libraries.jsch
+    implementation libraries.freemarker
+    implementation libraries.joda
+    implementation libraries.jackson_databind
+    implementation libraries.jackson_datatype_jdk8
+    implementation libraries.cassandra_driver
+    implementation libraries.hive
+    implementation libraries.thrift
+    implementation 'javax.xml.bind:jaxb-api:2.2.4'
 
-    runtime libraries.jcl_over_slf4j
+    runtimeOnly libraries.jcl_over_slf4j
 
-    testCompile libraries.spock
-    testCompile libraries.hsqldb
-    testCompile libraries.dbutils
-    testCompile libraries.mina_sshd
-    testRuntime libraries.objenesis
+    testImplementation libraries.spock
+    testImplementation libraries.hsqldb
+    testImplementation libraries.dbutils
+    testImplementation libraries.mina_sshd
+    testRuntimeOnly libraries.objenesis
 }
 
+// This does not work as expected - https://github.com/gradle/gradle/issues/1461
+// tasks.compileJava {
+//    options.forkOptions.jvmArgs += [
+//            '--add-opens java.base/sun.net.spi=ALL-UNNAMED'
+//    ]
+//    options.fork = true
+//}
+
 configurations {
     all*.exclude group: 'commons-logging', module: 'commons-logging'
 }
 
 // project information
 ext.artifactId = 'tempto-core'
-archivesBaseName = artifactId
 
 license {
     exclude "**/convention/sample-test/**/*.sql"
+    exclude "**/*.yaml"
 }
 
 // publishing to sonatype
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name artifactId
-                artifactId artifactId
-            }
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId artifactId
         }
     }
 }
+
+test {
+    useJUnitPlatform()
+
+    // Other test task configurations...
+}
diff --git a/tempto-core/src/main/java/io/prestodb/tempto/dns/MapBasedNameService.java b/tempto-core/src/main/java/io/prestodb/tempto/dns/MapBasedNameService.java
deleted file mode 100644
index 33139e5f..00000000
--- a/tempto-core/src/main/java/io/prestodb/tempto/dns/MapBasedNameService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.prestodb.tempto.dns;
-
-import sun.net.spi.nameservice.NameService;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Map;
-
-import static java.util.Objects.requireNonNull;
-
-public class MapBasedNameService
-        implements NameService
-{
-    private final Map<String, String> hosts;
-
-    public MapBasedNameService(Map<String, String> hosts)
-    {
-        this.hosts = requireNonNull(hosts, "hosts is null");
-    }
-
-    @Override
-    public InetAddress[] lookupAllHostAddr(String host)
-            throws UnknownHostException
-    {
-        if (hosts.containsKey(host)) {
-            return InetAddress.getAllByName(hosts.get(host));
-        }
-        throw new UnknownHostException();
-    }
-
-    @Override
-    public String getHostByAddr(byte[] bytes)
-            throws UnknownHostException
-    {
-        throw new UnknownHostException();
-    }
-}
diff --git a/tempto-core/src/main/java/io/prestodb/tempto/dns/TemptoNameServiceDescriptor.java b/tempto-core/src/main/java/io/prestodb/tempto/dns/TemptoNameServiceDescriptor.java
deleted file mode 100644
index ed6be03e..00000000
--- a/tempto-core/src/main/java/io/prestodb/tempto/dns/TemptoNameServiceDescriptor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.prestodb.tempto.dns;
-
-import io.prestodb.tempto.configuration.Configuration;
-import sun.net.spi.nameservice.NameService;
-import sun.net.spi.nameservice.NameServiceDescriptor;
-
-import java.util.Map;
-
-import static io.prestodb.tempto.internal.configuration.TestConfigurationFactory.testConfiguration;
-
-public class TemptoNameServiceDescriptor
-        implements NameServiceDescriptor
-{
-    public static final String PROVIDER_NAME = "map_based";
-    public static final String TYPE = "dns";
-
-    public static void enableHostMapping()
-    {
-        System.setProperty("sun.net.spi.nameservice.provider.1", TYPE + "," + PROVIDER_NAME);
-        System.setProperty("sun.net.spi.nameservice.provider.2", "default");
-    }
-
-    @Override
-    public NameService createNameService()
-            throws Exception
-    {
-        Configuration configuration = testConfiguration();
-        Map hosts = configuration.getSubconfiguration("hosts").asMap();
-        return new MapBasedNameService(hosts);
-    }
-
-    @Override
-    public String getProviderName()
-    {
-        return PROVIDER_NAME;
-    }
-
-    @Override
-    public String getType()
-    {
-        return TYPE;
-    }
-}
diff --git a/tempto-core/src/main/java/io/prestodb/tempto/internal/convention/ConventionBasedTestProxyGenerator.java b/tempto-core/src/main/java/io/prestodb/tempto/internal/convention/ConventionBasedTestProxyGenerator.java
index e01d22cc..cdb8ad8c 100644
--- a/tempto-core/src/main/java/io/prestodb/tempto/internal/convention/ConventionBasedTestProxyGenerator.java
+++ b/tempto-core/src/main/java/io/prestodb/tempto/internal/convention/ConventionBasedTestProxyGenerator.java
@@ -15,7 +15,6 @@
 package io.prestodb.tempto.internal.convention;
 
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import io.prestodb.tempto.Requirement;
 import io.prestodb.tempto.configuration.Configuration;
@@ -66,7 +65,7 @@ public ConventionBasedTest generateProxy(ConventionBasedTest conventionBasedTest
             DynamicType.Unloaded<ConventionBasedTestProxy> dynamicType = new ByteBuddy()
                     .subclass(ConventionBasedTestProxy.class)
                     .name(className)
-                    .defineMethod(methodName, void.class, ImmutableList.of(), Visibility.PUBLIC)
+                    .defineMethod(methodName, void.class, Visibility.PUBLIC)
                     .intercept(MethodCall.invoke(ConventionBasedTestProxy.class.getMethod("test")))
                     .annotateMethod(testAnnotationImpl)
                     .make();
@@ -87,7 +86,13 @@ public ConventionBasedTest generateProxy(ConventionBasedTest conventionBasedTest
     private String generatedClassName(ConventionBasedTest conventionBasedTest)
     {
         List<String> testNameParts = Splitter.on('.').splitToList(conventionBasedTest.getTestName());
-        return testPackage + "." + toJavaSymbol(testNameParts.get(testNameParts.size() - 2));
+        String javaSymbol = toJavaSymbol(testNameParts.get(testNameParts.size() - 2));
+        if (javaSymbol.isEmpty()) {
+            return testPackage;
+        }
+        else {
+            return testPackage + "." + javaSymbol;
+        }
     }
 
     private String generatedMethodName(ConventionBasedTest conventionBasedTest)
diff --git a/tempto-core/src/main/resources/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor b/tempto-core/src/main/resources/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
deleted file mode 100644
index 3ebae0ce..00000000
--- a/tempto-core/src/main/resources/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+++ /dev/null
@@ -1 +0,0 @@
-io.prestodb.tempto.dns.TemptoNameServiceDescriptor
diff --git a/tempto-core/src/test/groovy/io/prestodb/tempto/internal/convention/sql/SqlPathTestFactoryTest.groovy b/tempto-core/src/test/groovy/io/prestodb/tempto/internal/convention/sql/SqlPathTestFactoryTest.groovy
index 18d281d9..b5c0f71d 100644
--- a/tempto-core/src/test/groovy/io/prestodb/tempto/internal/convention/sql/SqlPathTestFactoryTest.groovy
+++ b/tempto-core/src/test/groovy/io/prestodb/tempto/internal/convention/sql/SqlPathTestFactoryTest.groovy
@@ -36,7 +36,7 @@ class SqlPathTestFactoryTest
         extends Specification
 {
     @Rule
-    TemporaryFolder temporaryFolder = new TemporaryFolder();
+    TemporaryFolder temporaryFolder = new TemporaryFolder()
 
     @Shared
     SqlPathTestFactory sqlPathTestFactory
@@ -46,6 +46,7 @@ class SqlPathTestFactoryTest
         TableDefinitionsRepository tableDefinitionsRepositoryMock = Mock()
         ConventionBasedTestProxyGenerator conventionBasedTestProxyGeneratorMock = new ConventionBasedTestProxyGenerator('test')
         sqlPathTestFactory = new SqlPathTestFactory(tableDefinitionsRepositoryMock, conventionBasedTestProxyGeneratorMock, emptyConfiguration())
+        temporaryFolder.create()
     }
 
     def shouldCreateConventionTestWithRequires()
diff --git a/tempto-examples/build.gradle b/tempto-examples/build.gradle
index 87384a97..db3757ff 100644
--- a/tempto-examples/build.gradle
+++ b/tempto-examples/build.gradle
@@ -14,23 +14,33 @@
 
 plugins {
     id 'java' // or 'groovy' Must be explicitly applied
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'java'
 
 dependencies {
-    compile tempto_runner
-    compile tempto_kafka
-    compile libraries.slf4j_api
-    compile libraries.junit
-
-    runtime tempto_logging_log4j
-    runtime libraries.slf4j_log4j
-    runtime libraries.postgresql_jdbc
-    runtime libraries.presto_jdbc
-    runtime libraries.hive_jdbc
+    implementation tempto_core
+    implementation tempto_runner
+    implementation tempto_kafka
+    implementation libraries.slf4j_api
+    implementation libraries.junit
+    implementation libraries.guava
+    implementation 'javax.xml.bind:jaxb-api:2.2.4'
+    implementation libraries.testng
+    implementation libraries.assertj
+    implementation libraries.guice
+
+    runtimeOnly tempto_logging_log4j
+    runtimeOnly libraries.slf4j_log4j
+    runtimeOnly libraries.postgresql_jdbc
+    runtimeOnly libraries.presto_jdbc
+    runtimeOnly libraries.hive_jdbc
+}
+
+license {
+    exclude "**/*.yaml"
 }
 
 jar {
@@ -41,6 +51,7 @@ jar {
 
 shadowJar {
     version = ''
+    zip64 true
 }
 
 build.dependsOn.add([shadowJar])
diff --git a/tempto-examples/src/main/java/io/prestodb/tempto/examples/HostNameMappingTest.java b/tempto-examples/src/main/java/io/prestodb/tempto/examples/HostNameMappingTest.java
deleted file mode 100644
index 3099c84d..00000000
--- a/tempto-examples/src/main/java/io/prestodb/tempto/examples/HostNameMappingTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.prestodb.tempto.examples;
-
-import io.prestodb.tempto.ProductTest;
-import org.testng.annotations.Test;
-
-import java.net.Inet4Address;
-import java.net.UnknownHostException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class HostNameMappingTest
-        extends ProductTest
-{
-    @Test(groups = "dns")
-    public void localhostAlias()
-            throws UnknownHostException
-    {
-        assertThat(Inet4Address.getAllByName("localhost_alias")).isEqualTo(Inet4Address.getAllByName("localhost"));
-        assertThat(Inet4Address.getAllByName("teradata_alias")).isEqualTo(Inet4Address.getAllByName("teradata.com"));
-    }
-}
diff --git a/tempto-kafka/build.gradle b/tempto-kafka/build.gradle
index c465aa72..688e0dd3 100644
--- a/tempto-kafka/build.gradle
+++ b/tempto-kafka/build.gradle
@@ -15,23 +15,21 @@
 apply plugin: 'java'
 
 dependencies {
-    compile tempto_core
-    compile libraries.kafka
-    compile libraries.zkclient
+    implementation tempto_core
+    implementation libraries.kafka
+    implementation libraries.zkclient
+    implementation libraries.guava
+    implementation libraries.guice
 }
 
 // project information
 ext.artifactId = 'tempto-kafka'
-archivesBaseName = artifactId
 
 // publishing to sonatype
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name artifactId
-                artifactId artifactId
-            }
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId artifactId
         }
     }
 }
diff --git a/tempto-ldap/build.gradle b/tempto-ldap/build.gradle
index b923915c..69a2ab90 100644
--- a/tempto-ldap/build.gradle
+++ b/tempto-ldap/build.gradle
@@ -15,21 +15,21 @@
 apply plugin: 'java'
 
 dependencies {
-    compile tempto_core
+    implementation tempto_core
+    implementation libraries.guava
+    implementation libraries.commons_lang3
+    implementation libraries.guice
+    implementation libraries.slf4j_api
 }
 
 // project information
 ext.artifactId = 'tempto-ldap'
-archivesBaseName = artifactId
 
 // publishing to sonatype
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name artifactId
-                artifactId artifactId
-            }
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId artifactId
         }
     }
 }
diff --git a/tempto-logging-log4j/build.gradle b/tempto-logging-log4j/build.gradle
index e8e5fb96..173d6196 100644
--- a/tempto-logging-log4j/build.gradle
+++ b/tempto-logging-log4j/build.gradle
@@ -16,25 +16,22 @@ apply plugin: 'java'
 apply plugin: 'groovy'
 
 dependencies {
-    compile tempto_core
-    compile libraries.ioutils
-    compile libraries.log4j
-    compile libraries.slf4j_api
-    compile libraries.reflections
+    implementation tempto_core
+    implementation libraries.ioutils
+    implementation libraries.log4j
+    implementation libraries.slf4j_api
+    implementation libraries.reflections
+    implementation libraries.guice
 }
 
 // project information
 ext.artifactId = 'tempto-logging-log4j'
-archivesBaseName = artifactId
 
 // publishing to sonatype
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name artifactId
-                artifactId artifactId
-            }
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId artifactId
         }
     }
 }
diff --git a/tempto-runner/build.gradle b/tempto-runner/build.gradle
index dd6e9294..fae135f8 100644
--- a/tempto-runner/build.gradle
+++ b/tempto-runner/build.gradle
@@ -13,12 +13,19 @@
  */
 apply plugin: 'java'
 apply plugin: 'signing'
-apply plugin: 'maven'
 apply plugin: 'groovy'
 
 dependencies {
-    compile tempto_core
-    compile libraries.commons_cli
+    implementation tempto_core
+    implementation libraries.commons_cli
+    implementation libraries.guava
+    implementation libraries.commons_lang3
+    implementation libraries.slf4j_api
+    implementation libraries.testng
+
+
+    runtimeOnly tempto_logging_log4j
+    runtimeOnly libraries.slf4j_log4j
 }
 
 configurations {
@@ -27,16 +34,12 @@ configurations {
 
 // project information
 ext.artifactId = 'tempto-runner'
-archivesBaseName = artifactId
 
 // publishing to sonatype
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name artifactId
+publishing {
+        publications {
+            maven(MavenPublication) {
                 artifactId artifactId
             }
         }
-    }
 }
diff --git a/tempto-runner/src/main/java/io/prestodb/tempto/runner/TemptoRunner.java b/tempto-runner/src/main/java/io/prestodb/tempto/runner/TemptoRunner.java
index 84330c1b..0dbfb99a 100644
--- a/tempto-runner/src/main/java/io/prestodb/tempto/runner/TemptoRunner.java
+++ b/tempto-runner/src/main/java/io/prestodb/tempto/runner/TemptoRunner.java
@@ -15,7 +15,6 @@
 package io.prestodb.tempto.runner;
 
 import com.google.common.base.Joiner;
-import io.prestodb.tempto.dns.TemptoNameServiceDescriptor;
 import io.prestodb.tempto.internal.listeners.TestNameGroupNameMethodSelector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,10 +37,6 @@
 
 public class TemptoRunner
 {
-    static {
-        TemptoNameServiceDescriptor.enableHostMapping();
-    }
-
     private static final Logger LOG = LoggerFactory.getLogger(TemptoRunner.class);
     private static final int METHOD_SELECTOR_PRIORITY = 20;
     private static final String METHOD_SELECTOR_CLASS_NAME = TestNameGroupNameMethodSelector.class.getName();