diff --git a/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle
index 57dd7dec15a..464259a2b6d 100644
--- a/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle
@@ -74,6 +74,13 @@ def groovyCompilerLauncher = javaToolchains.launcherFor {
   }
 } as Provider<JavaLauncher>
 
+def javadocTool_ = javaToolchains.javadocToolFor {
+    languageVersion = JavaLanguageVersion.of(compilerVersion)
+    if (compilerVendor != null) {
+        vendor = compilerVendor
+    }
+} as Provider<JavadocTool>
+
 tasks.withType(JavaCompile).configureEach {
   javaCompiler.set compiler
 
@@ -126,6 +133,9 @@ tasks.withType(GroovyCompile).configureEach {
   }
 }
 
+tasks.withType(Javadoc).configureEach {
+    javadocTool.set javadocTool_
+}
 
 def createCompilerDirectives = tasks.register('createCompilerDirectives') {
   def compilerDirectivesFile = project.layout.buildDirectory.file('dh-compiler-directives.txt')
diff --git a/buildSrc/src/main/groovy/io.deephaven.javadoc-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.javadoc-conventions.gradle
index 7495463132d..3b39e9931c8 100644
--- a/buildSrc/src/main/groovy/io.deephaven.javadoc-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.javadoc-conventions.gradle
@@ -1,12 +1,11 @@
+plugins {
+    id 'java'
+    id 'io.deephaven.java-toolchain-conventions'
+}
+
 // Neither plain withType(Javadoc) {..} nor withType(Javadoc).all {..} will work here, somehow
 // this breaks sourcesets in some projects.
 tasks.withType(Javadoc).configureEach {
-    javadocTool = javaToolchains.javadocToolFor{javadocSpec ->
-        // Javadoc version >=11 is needed for search
-        // Javadoc version >12 is needed to avoid javadoc bugs in linking with modules
-        javadocSpec.languageVersion = JavaLanguageVersion.of(17)
-    }
-
     options.encoding = 'UTF-8'
 
     doFirst {
@@ -19,5 +18,5 @@ tasks.withType(Javadoc).configureEach {
     }
 
     // Don't fail on warnings, let specific projects enable this if desired
-//  options.addBooleanOption('Xwerror', true)
+    //options.addBooleanOption('Werror', true)
 }
diff --git a/combined-javadoc/build.gradle b/combined-javadoc/build.gradle
index f3001c6702e..112829acfe0 100644
--- a/combined-javadoc/build.gradle
+++ b/combined-javadoc/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'io.deephaven.project.register'
     id 'java'
+    id 'io.deephaven.javadoc-conventions'
 }
 
 configurations {
@@ -30,7 +31,7 @@ def allJavadoc = tasks.register 'allJavadoc', Javadoc, {
         jdoc.options.overview = new File(javaDocOverviewLocation)
 
         // Fail on warnings to ensure correctness for our published docs
-        jdoc.options.addBooleanOption('Xwerror', true)
+        jdoc.options.addBooleanOption('Werror', true)
 
         def isForJavadocs = { Project p -> return io.deephaven.project.util.CombinedJavadoc.includeProject(p) }
 
@@ -53,8 +54,6 @@ def allJavadoc = tasks.register 'allJavadoc', Javadoc, {
         jdoc.dependsOn(writeJavadocVersion)
 }
 
-apply plugin: 'io.deephaven.javadoc-conventions'
-
 artifacts {
     combinedJavadoc allJavadoc
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteAsBooleanColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteAsBooleanColumnSource.java
index 05c92792f61..31f5aca9b40 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteAsBooleanColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteAsBooleanColumnSource.java
@@ -15,7 +15,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Reinterpret result {@link ColumnSource} implementations that translates {@link byte} to {@code Boolean} values.
+ * Reinterpret result {@link ColumnSource} implementations that translates {@code byte} to {@code Boolean} values.
  */
 public class ByteAsBooleanColumnSource extends AbstractColumnSource<Boolean>
         implements MutableColumnSourceGetDefaults.ForBoolean, FillUnordered<Values> {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/WritableByteAsBooleanColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/WritableByteAsBooleanColumnSource.java
index ad7e0c99f29..28d03932ed9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/WritableByteAsBooleanColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/WritableByteAsBooleanColumnSource.java
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Reinterpret result {@link ColumnSource} implementations that translates {@link byte} to {@code Boolean} values.
+ * Reinterpret result {@link ColumnSource} implementations that translates {@code byte} to {@code Boolean} values.
  */
 public class WritableByteAsBooleanColumnSource extends ByteAsBooleanColumnSource
         implements MutableColumnSourceGetDefaults.ForBoolean, WritableColumnSource<Boolean> {
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/SessionImpl.java b/java-client/session/src/main/java/io/deephaven/client/impl/SessionImpl.java
index fc5bd574b82..8f43de16088 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/SessionImpl.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/SessionImpl.java
@@ -54,9 +54,6 @@
 /**
  * A {@link Session} implementation that uses {@link io.deephaven.proto.backplane.grpc.BatchTableRequest batch requests}
  * and memoizes based on {@link io.deephaven.qst.table.TableSpec} equality.
- *
- * <p>
- * {@inheritDoc}
  */
 public final class SessionImpl extends SessionBase {
     private static final Logger log = LoggerFactory.getLogger(SessionImpl.class);
diff --git a/qst/type/src/main/java/io/deephaven/qst/type/CharType.java b/qst/type/src/main/java/io/deephaven/qst/type/CharType.java
index 239bc1acb25..d9611d6d9df 100644
--- a/qst/type/src/main/java/io/deephaven/qst/type/CharType.java
+++ b/qst/type/src/main/java/io/deephaven/qst/type/CharType.java
@@ -7,7 +7,7 @@
 import org.immutables.value.Value.Immutable;
 
 /**
- * The primitive {@link char} type.
+ * The primitive {@code char} type.
  */
 @Immutable
 @SingletonStyle
diff --git a/qst/type/src/main/java/io/deephaven/qst/type/DoubleType.java b/qst/type/src/main/java/io/deephaven/qst/type/DoubleType.java
index cb00e192370..1a7489db956 100644
--- a/qst/type/src/main/java/io/deephaven/qst/type/DoubleType.java
+++ b/qst/type/src/main/java/io/deephaven/qst/type/DoubleType.java
@@ -7,7 +7,7 @@
 import org.immutables.value.Value.Immutable;
 
 /**
- * The primitive {@link double} type.
+ * The primitive {@code double} type.
  */
 @Immutable
 @SingletonStyle
diff --git a/qst/type/src/main/java/io/deephaven/qst/type/FloatType.java b/qst/type/src/main/java/io/deephaven/qst/type/FloatType.java
index 2852bbe91f4..72ed5c0fbc7 100644
--- a/qst/type/src/main/java/io/deephaven/qst/type/FloatType.java
+++ b/qst/type/src/main/java/io/deephaven/qst/type/FloatType.java
@@ -7,7 +7,7 @@
 import org.immutables.value.Value.Immutable;
 
 /**
- * The primitive {@link float} type.
+ * The primitive {@code float} type.
  */
 @Immutable
 @SingletonStyle
diff --git a/qst/type/src/main/java/io/deephaven/qst/type/IntType.java b/qst/type/src/main/java/io/deephaven/qst/type/IntType.java
index f20c9ccb21b..dffaba0203a 100644
--- a/qst/type/src/main/java/io/deephaven/qst/type/IntType.java
+++ b/qst/type/src/main/java/io/deephaven/qst/type/IntType.java
@@ -7,7 +7,7 @@
 import org.immutables.value.Value.Immutable;
 
 /**
- * The primitive {@link int} type.
+ * The primitive {@code int} type.
  */
 @Immutable
 @SingletonStyle
diff --git a/qst/type/src/main/java/io/deephaven/qst/type/LongType.java b/qst/type/src/main/java/io/deephaven/qst/type/LongType.java
index 42448c81bd8..9e32ab7188f 100644
--- a/qst/type/src/main/java/io/deephaven/qst/type/LongType.java
+++ b/qst/type/src/main/java/io/deephaven/qst/type/LongType.java
@@ -7,7 +7,7 @@
 import org.immutables.value.Value.Immutable;
 
 /**
- * The primitive {@link long} type.
+ * The primitive {@code long} type.
  */
 @Immutable
 @SingletonStyle
diff --git a/qst/type/src/main/java/io/deephaven/qst/type/ShortType.java b/qst/type/src/main/java/io/deephaven/qst/type/ShortType.java
index 8dd5dce9425..35fbb2ab640 100644
--- a/qst/type/src/main/java/io/deephaven/qst/type/ShortType.java
+++ b/qst/type/src/main/java/io/deephaven/qst/type/ShortType.java
@@ -7,7 +7,7 @@
 import org.immutables.value.Value.Immutable;
 
 /**
- * The primitive {@link short} type.
+ * The primitive {@code short} type.
  */
 @Immutable
 @SingletonStyle