diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 259e2735cf0..4a712755517 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -11,14 +11,26 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
           java-version: '8.0.302'
 
+      - name: Setup gradle properties
+        run: |
+          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
+
       - name: Get Semver
         id: semver
         if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
@@ -58,11 +70,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup gradle properties
-        run: |
-          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
-
       - name: Create Dockerfile and context
         uses: burrunan/gradle-cache-action@v1
         with:
@@ -88,13 +95,26 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
           java-version: '8.0.302'
 
+      - name: Setup gradle properties
+        run: |
+          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
+
       - name: Get Semver
         id: semver
         if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
@@ -133,11 +153,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup gradle properties
-        run: |
-          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
-
       - name: Create Dockerfile and context
         uses: burrunan/gradle-cache-action@v1
         with:
@@ -160,13 +175,26 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
           java-version: '8.0.302'
 
+      - name: Setup gradle properties
+        run: |
+          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
+
       - name: Get Semver
         id: semver
         if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
@@ -205,11 +233,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup gradle properties
-        run: |
-          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
-
       - name: Create Dockerfile and context
         uses: burrunan/gradle-cache-action@v1
         with:
@@ -256,14 +279,26 @@ jobs:
             org.opencontainers.image.description=Deephaven web
             org.opencontainers.image.licenses=Deephaven Community License Agreement 1.0
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
           java-version: '8.0.302'
 
+      - name: Setup gradle properties
+        run: |
+          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1.3.0
@@ -279,11 +314,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup gradle properties
-        run: |
-          cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
-
       - name: Create Dockerfile and context
         uses: burrunan/gradle-cache-action@v1
         with:
diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
index 02ec6f1b5d1..2259da68a74 100644
--- a/.github/workflows/check-ci.yml
+++ b/.github/workflows/check-ci.yml
@@ -16,9 +16,16 @@ jobs:
       - name: Check gitignore rules
         run: .github/scripts/check-gitignore-rules.sh
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -27,7 +34,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Check
         uses: burrunan/gradle-cache-action@v1
diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml
index f6b85ee6368..1b5234ac962 100644
--- a/.github/workflows/docs-ci.yml
+++ b/.github/workflows/docs-ci.yml
@@ -13,24 +13,32 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup JDK 8
-        id: setup-java-8
+      - name: Setup JDK 15
+        id: setup-java-15
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
-          java-version: '8.0.302'
+          java-version: '15.0.4'
 
-      - name: Setup JDK 15
-        id: setup-java-15
+      - name: Setup JDK 17
+        id: setup-java-17
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
-          java-version: '15.0.4'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.302'
 
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }},${{ steps.setup-java-17.outputs.path }}" >> gradle.properties
 
       - name: All Javadoc
         uses: burrunan/gradle-cache-action@v1
@@ -64,12 +72,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup JDK 8
-        id: setup-java-8
-        uses: actions/setup-java@v2.2.0
-        with:
-          distribution: 'zulu'
-          java-version: '8.0.302'
       - name: Setup JDK 15
         id: setup-java-15
         uses: actions/setup-java@v2.2.0
@@ -77,10 +79,25 @@ jobs:
           distribution: 'zulu'
           java-version: '15.0.4'
 
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.302'
+
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-15.outputs.path }},${{ steps.setup-java-17.outputs.path }}" >> gradle.properties
 
       - name: Generate Python Docs
         uses: burrunan/gradle-cache-action@v1
diff --git a/.github/workflows/long-check-ci.yml b/.github/workflows/long-check-ci.yml
index 109b96e2fc7..6309ee9fd79 100644
--- a/.github/workflows/long-check-ci.yml
+++ b/.github/workflows/long-check-ci.yml
@@ -13,9 +13,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -24,7 +31,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Check
         uses: burrunan/gradle-cache-action@v1
diff --git a/.github/workflows/nightly-benchmarks.yml b/.github/workflows/nightly-benchmarks.yml
index cf90678fe78..8243cdde545 100644
--- a/.github/workflows/nightly-benchmarks.yml
+++ b/.github/workflows/nightly-benchmarks.yml
@@ -14,9 +14,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -25,7 +32,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Build
         uses: burrunan/gradle-cache-action@v1
diff --git a/.github/workflows/nightly-check-ci.yml b/.github/workflows/nightly-check-ci.yml
index bbdc48264fa..3421bd67449 100644
--- a/.github/workflows/nightly-check-ci.yml
+++ b/.github/workflows/nightly-check-ci.yml
@@ -17,9 +17,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -28,7 +35,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Run gradle
         uses: burrunan/gradle-cache-action@v1
@@ -76,9 +83,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -87,7 +101,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Run gradle
         uses: burrunan/gradle-cache-action@v1
@@ -135,9 +149,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -146,7 +167,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Run gradle
         uses: burrunan/gradle-cache-action@v1
@@ -194,9 +215,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -205,7 +233,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Run gradle
         uses: burrunan/gradle-cache-action@v1
diff --git a/.github/workflows/publish-ci.yml b/.github/workflows/publish-ci.yml
index 5b8c23b3499..95a8d4453f4 100644
--- a/.github/workflows/publish-ci.yml
+++ b/.github/workflows/publish-ci.yml
@@ -11,9 +11,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        id: setup-java
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'zulu'
+          java-version: '17.0.0'
+
+      # Note: setting up JDK 8 last, the current version of gradle can't be run off of 17 yet.
+      - name: Setup JDK 8
+        id: setup-java-8
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'zulu'
@@ -22,7 +29,7 @@ jobs:
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-17.outputs.path }}," >> gradle.properties
 
       - name: Publish
         uses: burrunan/gradle-cache-action@v1
diff --git a/Internals/gradle.properties b/Internals/gradle.properties
new file mode 100644
index 00000000000..b8a1ccfc231
--- /dev/null
+++ b/Internals/gradle.properties
@@ -0,0 +1,2 @@
+compilerVersion=8
+languageLevel=8
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle
index 9274992456e..5a8123b780e 100644
--- a/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle
@@ -4,11 +4,25 @@ plugins {
 
 def archivesBaseNamePrefix = 'deephaven-'
 
+def compilerVersion = Integer.parseInt((String)project.findProperty('compilerVersion') ?: '17')
+def languageLevel = Integer.parseInt((String)project.findProperty('languageLevel') ?: '8')
+def runtimeVersion = Integer.parseInt((String)project.findProperty('runtimeVersion') ?: '8')
+
+if (languageLevel > compilerVersion) {
+  throw new IllegalArgumentException("languageLevel must be less than or equal to compileVersion")
+}
+if (languageLevel < 8) {
+  throw new IllegalArgumentException("languageLevel must be greater than or equal to 8")
+}
+if (runtimeVersion < languageLevel) {
+  throw new IllegalArgumentException("runtimeVersion must be greater than or equal to languageLevel")
+}
+
 archivesBaseName = "${archivesBaseNamePrefix}${project.name}"
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(8)
+    languageVersion = JavaLanguageVersion.of(compilerVersion)
   }
 }
 
@@ -18,6 +32,32 @@ tasks.withType(JavaCompile).configureEach {
     javac.options.encoding = 'UTF-8'
     javac.options.incremental = true
     javac.options.compilerArgs << '-parameters'
+
+    if (compilerVersion != languageLevel) {
+      javac.options.release.set languageLevel
+    }
+}
+
+tasks.withType(GroovyCompile).configureEach {
+  // Note: the groovy compiler doesn't seem to like 17, or actually take into account the release option.
+  javaLauncher = javaToolchains.launcherFor {
+    languageVersion = JavaLanguageVersion.of(languageLevel)
+  }
+  //options.release = languageLevel
+}
+
+tasks.withType(JavaExec).configureEach {
+  JavaExec exec ->
+    exec.javaLauncher = javaToolchains.launcherFor {
+      languageVersion = JavaLanguageVersion.of(runtimeVersion)
+    }
+}
+
+tasks.withType(Test).configureEach {
+  Test test ->
+    test.javaLauncher = javaToolchains.launcherFor {
+      languageVersion = JavaLanguageVersion.of(runtimeVersion)
+    }
 }
 
 tasks.withType(Jar).configureEach {
diff --git a/gradle.properties b/gradle.properties
index 3ec39b4c591..13049b5c6c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,3 @@
-# We do not want gradle to auto-download a JDK - we are assuming that developers should be setting
-# up their JDK environments as a prerequisite.
-# See https://docs.gradle.org/6.8.3/userguide/toolchains.html#sec:provisioning
-org.gradle.java.installations.auto-download=false
-
 #org.gradle.debug
 ## Enable to attach debugger to port 5005 when running gradle
 ## Note, you can use -Dorg.gradle.debug=true as well.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8597a4d85c5..af18bba73bf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
-distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
+distributionSha256Sum=b13f5d97f08000996bf12d9dd70af3f2c6b694c2c663ab1b545e9695562ad1ee
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java-client/flight-dagger/gradle.properties b/java-client/flight-dagger/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/java-client/flight-dagger/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/java-client/flight/gradle.properties b/java-client/flight/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/java-client/flight/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/java-client/session-dagger/gradle.properties b/java-client/session-dagger/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/java-client/session-dagger/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/java-client/session/gradle.properties b/java-client/session/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/java-client/session/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerSerial.java b/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerSerial.java
index 91595c5b57b..dab904b8eea 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerSerial.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerSerial.java
@@ -49,7 +49,8 @@ public TableHandle execute(TableSpec table) throws TableHandleException, Interru
         final TableHandleManager manager = new TableHandleManagerSerial(session, tracker);
         final TableAdapterResults<TableHandle, TableHandle> results;
         try {
-            results = checked(() -> TableCreator.create(manager, i -> i, i -> i, table));
+            // noinspection RedundantTypeArguments
+            results = checked(() -> TableCreator.<TableHandle, TableHandle>create(manager, i -> i, i -> i, table));
         } catch (Throwable t) {
             tracker.closeAllExceptAndRemoveAll(Collections.emptySet());
             throw t;
@@ -65,7 +66,8 @@ public List<TableHandle> execute(Iterable<TableSpec> tables) throws TableHandleE
         final TableHandleManager manager = new TableHandleManagerSerial(session, tracker);
         final TableAdapterResults<TableHandle, TableHandle> results;
         try {
-            results = checked(() -> TableCreator.create(manager, i -> i, i -> i, tables));
+            // noinspection RedundantTypeArguments
+            results = checked(() -> TableCreator.<TableHandle, TableHandle>create(manager, i -> i, i -> i, tables));
         } catch (Throwable t) {
             tracker.closeAllExceptAndRemoveAll(Collections.emptySet());
             throw t;
diff --git a/proto/proto-backplane-grpc-flight/gradle.properties b/proto/proto-backplane-grpc-flight/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/proto/proto-backplane-grpc-flight/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/proto/proto-backplane-grpc/gradle.properties b/proto/proto-backplane-grpc/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/proto/proto-backplane-grpc/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/py/jpy-config/build.gradle b/py/jpy-config/build.gradle
index 8aef21a48f3..979a78cd1ec 100644
--- a/py/jpy-config/build.gradle
+++ b/py/jpy-config/build.gradle
@@ -1 +1 @@
-// empty on purpose - shouldn't have any dependencies
\ No newline at end of file
+// empty on purpose - shouldn't have any dependencies
diff --git a/qst/gradle.properties b/qst/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/qst/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8
diff --git a/table-api/gradle.properties b/table-api/gradle.properties
new file mode 100644
index 00000000000..9a835bc801b
--- /dev/null
+++ b/table-api/gradle.properties
@@ -0,0 +1 @@
+languageLevel=8