diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 259db167..a8cd0049 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -18,13 +18,13 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [23.0.0.6, 23.0.0.9]
-        java: [17, 11, 8]
+        RUNTIME_VERSION: [23.0.0.10]
+        java: [21, 17, 11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 23.0.0.6
-        - java: 17
-          RUNTIME_VERSION: 23.0.0.6
+          RUNTIME: wlp
+        - java: 11
+          RUNTIME: ol
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
     steps:
     # Checkout repos
@@ -65,8 +65,8 @@ jobs:
     # Install dependencies
     - name: Install ci.ant and ci.common
       run: |
-        mvn -V clean install -f ci.ant --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
-        mvn -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+        mvn -V clean install -f ci.ant --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
+        mvn -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
     # Run tests
     - name: Run tests with Gradle on Ubuntu
       run:
@@ -95,15 +95,13 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [23.0.0.6, 23.0.0.9]
-        java: [17, 11, 8]
+        RUNTIME_VERSION: [23.0.0.10]
+        java: [21, 17, 11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 23.0.0.6
-        - java: 8
+          RUNTIME: ol
+        - java: 11
           RUNTIME: wlp
-        - java: 17
-          RUNTIME_VERSION: 23.0.0.6
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
     steps:
     # Checkout repos
@@ -140,11 +138,11 @@ jobs:
     # Install ci.ant
     - name: Install ci.ant
       working-directory: C:/ci.ant
-      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
     # Install ci.common
     - name: Install ci.common
       working-directory: C:/ci.common
-      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
     # Run tests
     - name: Run tests with Gradle on Windows
       working-directory: C:/ci.gradle
diff --git a/build.gradle b/build.gradle
index 98f1f045..7e38bbe7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,27 +40,27 @@ configurations {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileTestGroovy {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-def libertyAntVersion = "1.9.13"
-def libertyCommonVersion = "1.8.29"
+def libertyAntVersion = "1.9.14-SNAPSHOT"
+def libertyCommonVersion = "1.8.30-SNAPSHOT"
 
 dependencies {
     implementation gradleApi()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..c1962a79 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 fae08049..744c64d1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..aeb74cbb 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ 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=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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         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.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 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%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :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/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy
index 237419b0..b29d9ab5 100644
--- a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy
+++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy
@@ -16,6 +16,7 @@
 package io.openliberty.tools.gradle.tasks
 
 
+import io.openliberty.tools.common.plugins.util.AbstractContainerSupportUtil
 import io.openliberty.tools.common.plugins.util.InstallFeatureUtil
 import io.openliberty.tools.common.plugins.util.InstallFeatureUtil.ProductProperties
 import io.openliberty.tools.common.plugins.util.PluginExecutionException
@@ -109,6 +110,7 @@ public class AbstractFeatureTask extends AbstractServerTask {
     private class InstallFeatureTaskUtil extends InstallFeatureUtil {
         public InstallFeatureTaskUtil(File installDir, File buildDir, String from, String to, Set<String> pluginListedEsas, List<ProductProperties> propertiesList, String openLibertyVerion, String containerName, List<String> additionalJsons)  throws PluginScenarioException, PluginExecutionException {
             super(installDir, buildDir, from, to, pluginListedEsas, propertiesList, openLibertyVerion, containerName, additionalJsons)
+            setContainerEngine(this);
         }
 
         @Override
@@ -291,5 +293,16 @@ public class AbstractFeatureTask extends AbstractServerTask {
         return util
     }
 
+    protected void setContainerEngine(AbstractContainerSupportUtil util) throws PluginExecutionException {
+        String LIBERTY_DEV_PODMAN = "liberty.dev.podman";
+        Map<String, Object> projectProperties = project.getProperties();
+        if (!projectProperties.isEmpty() && projectProperties.containsKey(LIBERTY_DEV_PODMAN)) {
+            Object isPodman = projectProperties.get(LIBERTY_DEV_PODMAN);
+            if (isPodman != null) {
+                util.setIsDocker(!(Boolean.parseBoolean(isPodman.toString())));
+                logger.debug("liberty.dev.podman was set to: " + (Boolean.parseBoolean(isPodman.toString())));
+            }
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy
index 263bb3c9..fa4bd519 100644
--- a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy
+++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy
@@ -15,6 +15,7 @@
  */
 package io.openliberty.tools.gradle.tasks
 
+import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.internal.file.DefaultFilePropertyFactory
@@ -360,7 +361,7 @@ class DevTask extends AbstractFeatureTask {
                     boolean libertyDebug, boolean pollingTest, boolean container, File containerfile, File containerBuildContext,
                     String containerRunOpts, int containerBuildTimeout, boolean skipDefaultPorts, boolean keepTempContainerfile, 
                     String mavenCacheLocation, String packagingType, File buildFile, boolean generateFeatures
-        ) throws IOException {
+        ) throws IOException, PluginExecutionException {
             super(buildDir, serverDirectory, sourceDirectory, testSourceDirectory, configDirectory, projectDirectory, /* multi module project directory */ projectDirectory,
                     resourceDirs, hotTests, skipTests, false /* skipUTs */, false /* skipITs */, skipInstallFeature, artifactId,  serverStartTimeout,
                     verifyAppStartTimeout, appUpdateTimeout, ((long) (compileWait * 1000L)), libertyDebug,
@@ -378,6 +379,8 @@ class DevTask extends AbstractFeatureTask {
             project.configurations.getByName('libertyFeature').dependencies.each {
                 dep -> this.existingLibertyFeatureDependencies.add(dep.name)
             }
+
+            setContainerEngine(this)
         }
 
         @Override
@@ -1171,14 +1174,18 @@ class DevTask extends AbstractFeatureTask {
         File buildFile = project.getBuildFile();
 
         // Instantiate util before any child gradle tasks launched so it can help find available port if needed
-        this.util = new DevTaskUtil(project.buildDir, serverInstallDir, getUserDir(project, serverInstallDir),
+        try {
+            this.util = new DevTaskUtil(project.buildDir, serverInstallDir, getUserDir(project, serverInstallDir),
                 serverDirectory, sourceDirectory, testSourceDirectory, configDirectory, project.getRootDir(),
                 resourceDirs, hotTests.booleanValue(), skipTests.booleanValue(), skipInstallFeature.booleanValue(), artifactId, serverStartTimeout.intValue(),
                 verifyAppStartTimeout.intValue(), verifyAppStartTimeout.intValue(), compileWait.doubleValue(),
                 libertyDebug.booleanValue(), pollingTest.booleanValue(), container.booleanValue(), containerfile, containerBuildContext, containerRunOpts,
                 containerBuildTimeout, skipDefaultPorts.booleanValue(), keepTempContainerfile.booleanValue(), localMavenRepoForFeatureUtility,
                 getPackagingType(), buildFile, generateFeatures.booleanValue()
-        );
+            );
+        } catch (IOException | PluginExecutionException e) {
+            throw new GradleException("Error initializing dev mode.", e)
+        }
 
         ProjectConnection gradleConnection = initGradleProjectConnection();
         BuildLauncher gradleBuildLauncher = gradleConnection.newBuild();
diff --git a/src/test/groovy/io/openliberty/tools/gradle/BaseDevTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/BaseDevTest.groovy
index 0183f849..c3ad287b 100644
--- a/src/test/groovy/io/openliberty/tools/gradle/BaseDevTest.groovy
+++ b/src/test/groovy/io/openliberty/tools/gradle/BaseDevTest.groovy
@@ -83,7 +83,7 @@ class BaseDevTest extends AbstractIntegrationTest {
             gradlew = new File("gradlew")
         }
 
-        StringBuilder command = new StringBuilder(gradlew.getAbsolutePath() + " libertyDev");
+        StringBuilder command = new StringBuilder(gradlew.getAbsolutePath() + " --warning-mode none libertyDev");
         if (params != null) {
             command.append(" " + params);
         }
diff --git a/src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy
index 6bb5611d..38b512a7 100644
--- a/src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy
+++ b/src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy
@@ -125,7 +125,7 @@ class BaseGenerateFeaturesTest extends AbstractIntegrationTest {
             gradlew = new File("gradlew");
         }
 
-        StringBuilder command = new StringBuilder(gradlew.getAbsolutePath() + " " + processCommand);
+        StringBuilder command = new StringBuilder(gradlew.getAbsolutePath() + " --warning-mode none " + processCommand);
 
         System.out.println("Running command: " + command.toString());
         ProcessBuilder builder = buildProcess(command.toString());
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestEclipseFacetsWar.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestEclipseFacetsWar.groovy
index edcf15cb..f7f50494 100644
--- a/src/test/groovy/io/openliberty/tools/gradle/TestEclipseFacetsWar.groovy
+++ b/src/test/groovy/io/openliberty/tools/gradle/TestEclipseFacetsWar.groovy
@@ -57,7 +57,7 @@ public class TestEclipseFacetsWar extends AbstractIntegrationTest{
             if (attributes.getAt('facet').equals('jst.web') && attributes.getAt('version').equals('3.0')) {
                 hasJstWebFacet = true
             }
-            if (attributes.getAt('facet').equals('jst.java') && attributes.getAt('version').equals('1.7')) {
+            if (attributes.getAt('facet').equals('jst.java') && attributes.getAt('version').equals('1.8')) {
                 hasJavaFacet = true
             }
         }
diff --git a/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle b/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle
index 6e4d32e5..03f094e9 100644
--- a/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle
+++ b/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle b/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle
index 714b7284..f1d8fb3b 100644
--- a/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle
+++ b/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle b/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle
index 05504a5f..b91d75dd 100644
--- a/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle
+++ b/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle b/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle
index 8621fe83..4c1b4959 100644
--- a/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle
+++ b/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/TestStripVersion.gradle b/src/test/resources/sample.servlet/TestStripVersion.gradle
index 289e6669..c2e5e085 100644
--- a/src/test/resources/sample.servlet/TestStripVersion.gradle
+++ b/src/test/resources/sample.servlet/TestStripVersion.gradle
@@ -22,8 +22,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testAppConfig.gradle b/src/test/resources/sample.servlet/testAppConfig.gradle
index 92e6d606..7e551fcf 100644
--- a/src/test/resources/sample.servlet/testAppConfig.gradle
+++ b/src/test/resources/sample.servlet/testAppConfig.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testAppConfigFail.gradle b/src/test/resources/sample.servlet/testAppConfigFail.gradle
index 8dbf7cab..f8f40b2d 100644
--- a/src/test/resources/sample.servlet/testAppConfigFail.gradle
+++ b/src/test/resources/sample.servlet/testAppConfigFail.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle
index 2e351e22..32ddbd55 100644
--- a/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle
+++ b/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle
@@ -22,8 +22,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle
index 128196d9..d5635c14 100644
--- a/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle
+++ b/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle
@@ -22,8 +22,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle
index c9e40e1d..e7d01451 100644
--- a/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle
+++ b/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle
@@ -22,8 +22,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle
index 5987ae0a..8302475e 100644
--- a/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle
+++ b/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle
@@ -22,8 +22,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testConfigDropinsApp.gradle b/src/test/resources/sample.servlet/testConfigDropinsApp.gradle
index d2fadd23..2923349f 100644
--- a/src/test/resources/sample.servlet/testConfigDropinsApp.gradle
+++ b/src/test/resources/sample.servlet/testConfigDropinsApp.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testEtcOutputDir.gradle b/src/test/resources/sample.servlet/testEtcOutputDir.gradle
index 29f3c807..1a739e80 100644
--- a/src/test/resources/sample.servlet/testEtcOutputDir.gradle
+++ b/src/test/resources/sample.servlet/testEtcOutputDir.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testLooseApplication.gradle b/src/test/resources/sample.servlet/testLooseApplication.gradle
index d98637a0..730e8787 100644
--- a/src/test/resources/sample.servlet/testLooseApplication.gradle
+++ b/src/test/resources/sample.servlet/testLooseApplication.gradle
@@ -22,8 +22,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle b/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle
index 025f1ab0..c064ffdc 100644
--- a/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle
+++ b/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle
@@ -23,8 +23,8 @@ apply plugin: 'java'
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testOutputDirs.gradle b/src/test/resources/sample.servlet/testOutputDirs.gradle
index 4f474372..1adc20cf 100644
--- a/src/test/resources/sample.servlet/testOutputDirs.gradle
+++ b/src/test/resources/sample.servlet/testOutputDirs.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/testPluginConfigFile.gradle b/src/test/resources/sample.servlet/testPluginConfigFile.gradle
index e21b17e6..f2d4195d 100644
--- a/src/test/resources/sample.servlet/testPluginConfigFile.gradle
+++ b/src/test/resources/sample.servlet/testPluginConfigFile.gradle
@@ -21,8 +21,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle b/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle
index 0c53a7ca..d041aacc 100644
--- a/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle
+++ b/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle b/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle
index 96338e76..68df5281 100644
--- a/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle
+++ b/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'liberty'
 apply plugin: 'war'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle b/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle
index 9d72ebb4..e11b56a7 100644
--- a/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle
+++ b/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle b/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle
index bbaf305b..5ea1ce95 100644
--- a/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle
+++ b/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle
@@ -21,8 +21,8 @@ buildscript {
 apply plugin: 'war'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/server-config-files/testCreateLibertyFiles.gradle b/src/test/resources/server-config-files/testCreateLibertyFiles.gradle
index 72e179e1..c00bf6c7 100644
--- a/src/test/resources/server-config-files/testCreateLibertyFiles.gradle
+++ b/src/test/resources/server-config-files/testCreateLibertyFiles.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle b/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle
index d414d7ef..0b158f68 100644
--- a/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle
+++ b/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'
 
diff --git a/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle b/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle
index 2e4e42c0..5a29e739 100644
--- a/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle
+++ b/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle
@@ -18,8 +18,8 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'liberty'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava.options.encoding = 'UTF-8'