diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java
index c1fd1108668..4144cde12e7 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java
@@ -50,7 +50,7 @@ public class BomExtension {
 
 	private final Map<String, String> artifactVersionProperties = new HashMap<>();
 
-	private final List<Library> libraries = new ArrayList<Library>();
+	private final List<Library> libraries = new ArrayList<>();
 
 	private final UpgradeHandler upgradeHandler = new UpgradeHandler();
 
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java
index cde5d53513b..f41bbc66b79 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java
@@ -71,7 +71,7 @@ public class CheckBom extends DefaultTask {
 		for (String exclusion : exclusions) {
 			if (!resolved.contains(exclusion) && exclusion.endsWith(":*")) {
 				String group = exclusion.substring(0, exclusion.indexOf(':') + 1);
-				if (!resolved.stream().filter((candidate) -> candidate.startsWith(group)).findFirst().isPresent()) {
+				if (resolved.stream().noneMatch((candidate) -> candidate.startsWith(group))) {
 					unused.add(exclusion);
 				}
 			}
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java
index d29f6b07593..40b9f70c95e 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java
@@ -62,7 +62,7 @@ final class MavenMetadataVersionResolver implements VersionResolver {
 
 	@Override
 	public SortedSet<DependencyVersion> resolveVersions(String groupId, String artifactId) {
-		Set<String> versions = new HashSet<String>();
+		Set<String> versions = new HashSet<>();
 		for (String repositoryUrl : this.repositoryUrls) {
 			versions.addAll(resolveVersions(groupId, artifactId, repositoryUrl));
 		}
@@ -70,7 +70,7 @@ final class MavenMetadataVersionResolver implements VersionResolver {
 	}
 
 	private Set<String> resolveVersions(String groupId, String artifactId, String repositoryUrl) {
-		Set<String> versions = new HashSet<String>();
+		Set<String> versions = new HashSet<>();
 		String url = repositoryUrl + "/" + groupId.replace('.', '/') + "/" + artifactId + "/maven-metadata.xml";
 		try {
 			String metadata = this.rest.getForObject(url, String.class);
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java b/buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java
index 5592d306175..9b75f4ad29b 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java
@@ -18,10 +18,11 @@ package org.springframework.boot.build.cli;
 
 import java.util.Collections;
 
+import org.gradle.api.Task;
 import org.gradle.api.tasks.TaskAction;
 
 /**
- * A {@Task} for creating a Homebrew formula manifest.
+ * A {@link Task} for creating a Homebrew formula manifest.
  *
  * @author Andy Wilkinson
  */
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/cli/ScoopManifest.java b/buildSrc/src/main/java/org/springframework/boot/build/cli/ScoopManifest.java
index de671c8da14..0fba7f3313c 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/cli/ScoopManifest.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/cli/ScoopManifest.java
@@ -18,10 +18,11 @@ package org.springframework.boot.build.cli;
 
 import java.util.Collections;
 
+import org.gradle.api.Task;
 import org.gradle.api.tasks.TaskAction;
 
 /**
- * A {@Task} for creating a Scoop manifest.
+ * A {@link Task} for creating a Scoop manifest.
  *
  * @author Andy Wilkinson
  */
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java b/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java
index 23f368b3dae..e279c3b336d 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/constraints/ExtractVersionConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -55,7 +55,7 @@ public class ExtractVersionConstraints extends AbstractTask {
 
 	private final Set<VersionProperty> versionProperties = new TreeSet<>();
 
-	private final List<String> projectPaths = new ArrayList<String>();
+	private final List<String> projectPaths = new ArrayList<>();
 
 	public ExtractVersionConstraints() {
 		DependencyHandler dependencies = getProject().getDependencies();
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/log4j2/ReproducibleLog4j2PluginsDatAction.java b/buildSrc/src/main/java/org/springframework/boot/build/log4j2/ReproducibleLog4j2PluginsDatAction.java
index 0414fb1cbb7..a22939d626d 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/log4j2/ReproducibleLog4j2PluginsDatAction.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/log4j2/ReproducibleLog4j2PluginsDatAction.java
@@ -32,8 +32,8 @@ import org.gradle.api.tasks.TaskExecutionException;
 import org.gradle.api.tasks.compile.JavaCompile;
 
 /**
- * An {@Action} to post-process a {@code Log4j2Plugins.dat} and re-order its content so
- * that it is reproducible.
+ * An {@link Action} to post-process a {@code Log4j2Plugins.dat} and re-order its content
+ * so that it is reproducible.
  *
  * @author Andy Wilkinson
  */
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PluginXmlParser.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PluginXmlParser.java
index b0d6fc9d443..688d77b89d2 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PluginXmlParser.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PluginXmlParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -63,7 +63,7 @@ class PluginXmlParser {
 	}
 
 	private List<Mojo> parseMojos(Node plugin) throws XPathExpressionException {
-		List<Mojo> mojos = new ArrayList<Mojo>();
+		List<Mojo> mojos = new ArrayList<>();
 		for (Node mojoNode : nodesAt("//plugin/mojos/mojo", plugin)) {
 			mojos.add(new Mojo(textAt("goal", mojoNode), format(textAt("description", mojoNode)),
 					parseParameters(mojoNode)));
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java
index 58ac2fb33f1..5bae3a88093 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java
@@ -28,7 +28,7 @@ import org.gradle.plugins.ide.eclipse.EclipsePlugin;
 import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 
 /**
- * A {@Plugin} to configure integration testing support in a {@link Project}.
+ * A {@link Plugin} to configure integration testing support in a {@link Project}.
  *
  * @author Andy Wilkinson
  */