diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/JavaConventions.java b/buildSrc/src/main/java/org/springframework/shell/gradle/JavaConventions.java
new file mode 100644
index 00000000..2eb59c35
--- /dev/null
+++ b/buildSrc/src/main/java/org/springframework/shell/gradle/JavaConventions.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * 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
+ *
+ *      https://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 org.springframework.shell.gradle;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.gradle.api.JavaVersion;
+import org.gradle.api.Project;
+import org.gradle.api.plugins.JavaBasePlugin;
+import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.api.tasks.javadoc.Javadoc;
+import org.gradle.api.tasks.testing.Test;
+import org.gradle.external.javadoc.CoreJavadocOptions;
+
+/**
+ * @author Janne Valkealahti
+ */
+class JavaConventions {
+
+	private static final String SOURCE_AND_TARGET_COMPATIBILITY = "17";
+
+	void apply(Project project) {
+		project.getPlugins().withType(JavaBasePlugin.class, java -> {
+			configureJavaConventions(project);
+			configureJavadocConventions(project);
+			configureTestConventions(project);
+		});
+	}
+
+	private void configureJavadocConventions(Project project) {
+		project.getTasks().withType(Javadoc.class, (javadoc) -> {
+			CoreJavadocOptions options = (CoreJavadocOptions) javadoc.getOptions();
+			options.source("17");
+			options.encoding("UTF-8");
+			options.addStringOption("Xdoclint:none", "-quiet");
+		});
+	}
+
+	private void configureJavaConventions(Project project) {
+		project.getTasks().withType(JavaCompile.class, (compile) -> {
+			compile.getOptions().setEncoding("UTF-8");
+			List<String> args = compile.getOptions().getCompilerArgs();
+			if (!args.contains("-parameters")) {
+				args.add("-parameters");
+			}
+			if (project.hasProperty("toolchainVersion")) {
+				compile.setSourceCompatibility(SOURCE_AND_TARGET_COMPATIBILITY);
+				compile.setTargetCompatibility(SOURCE_AND_TARGET_COMPATIBILITY);
+			}
+			else if (buildingWithJava17(project)) {
+				args.addAll(Arrays.asList("-Xdoclint:none"));
+				// TODO: When we're without javadoc errors
+				// args.addAll(Arrays.asList("-Werror", "-Xlint:unchecked", "-Xlint:deprecation", "-Xlint:rawtypes",
+				// 		"-Xlint:varargs"));
+			}
+		});
+	}
+
+	private boolean buildingWithJava17(Project project) {
+		return JavaVersion.current() == JavaVersion.VERSION_17;
+	}
+
+	private void configureTestConventions(Project project) {
+		project.getTasks().withType(Test.class, test -> {
+			test.useJUnitPlatform();
+		});
+	}
+}
diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java
index 51a601d2..1b6804f9 100644
--- a/buildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java
+++ b/buildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java
@@ -17,13 +17,9 @@ package org.springframework.shell.gradle;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.PluginManager;
-import org.gradle.api.tasks.javadoc.Javadoc;
-import org.gradle.api.tasks.testing.Test;
-import org.gradle.external.javadoc.CoreJavadocOptions;
 
 /**
  * @author Janne Valkealahti
@@ -38,18 +34,6 @@ class ModulePlugin implements Plugin<Project> {
 		pluginManager.apply(JavaLibraryPlugin.class);
 		pluginManager.apply(SpringMavenPlugin.class);
 		new ArtifactoryConventions().apply(project);
-
-		project.getPlugins().withType(JavaBasePlugin.class, java -> {
-			project.getTasks().withType(Javadoc.class, (javadoc) -> {
-				CoreJavadocOptions options = (CoreJavadocOptions) javadoc.getOptions();
-				options.source("17");
-				options.encoding("UTF-8");
-				options.addStringOption("Xdoclint:none", "-quiet");
-			});
-
-			project.getTasks().withType(Test.class, test -> {
-				test.useJUnitPlatform();
-			});
-		});
+		new JavaConventions().apply(project);
 	}
 }
diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java
index 1504aee8..b319e31c 100644
--- a/buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java
+++ b/buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java
@@ -30,5 +30,6 @@ class SamplePlugin implements Plugin<Project> {
 		PluginManager pluginManager = project.getPluginManager();
 		pluginManager.apply(JavaPlugin.class);
 		pluginManager.apply(ManagementConfigurationPlugin.class);
+		new JavaConventions().apply(project);
 	}
 }