diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
index 75b42920509..08ce4baa991 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
@@ -46,7 +46,7 @@ public class HintCommand extends AbstractCommand {
 	@Override
 	public ExitStatus run(String... args) throws Exception {
 		try {
-			int index = (args.length != 0) ? Integer.valueOf(args[0]) - 1 : 0;
+			int index = (args.length != 0) ? Integer.parseInt(args[0]) - 1 : 0;
 			List<String> arguments = new ArrayList<>(args.length);
 			for (int i = 2; i < args.length; i++) {
 				arguments.add(args[i]);
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
index 4b4a9e3c586..cf96a510a40 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
@@ -103,7 +103,7 @@ class Installer {
 		if (countString == null) {
 			return 0;
 		}
-		return Integer.valueOf(countString);
+		return Integer.parseInt(countString);
 	}
 
 	private void setInstallCount(File file, int count) {
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java
index dc07b31aefc..45655930d75 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.cli.compiler.grape;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.aether.repository.Proxy;
@@ -31,7 +30,7 @@ import org.eclipse.aether.repository.RemoteRepository;
  */
 public class CompositeProxySelector implements ProxySelector {
 
-	private List<ProxySelector> selectors = new ArrayList<>();
+	private final List<ProxySelector> selectors;
 
 	public CompositeProxySelector(List<ProxySelector> selectors) {
 		this.selectors = selectors;
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java
index 523f375251d..808e1548084 100644
--- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java
+++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java
@@ -198,7 +198,7 @@ final class ResolveDependencyCoordinatesTransformationTests {
 		declarationExpression.addAnnotation(this.grabAnnotation);
 
 		BlockStatement code = new BlockStatement(
-				Arrays.asList((Statement) new ExpressionStatement(declarationExpression)), new VariableScope());
+				Arrays.asList(new ExpressionStatement(declarationExpression)), new VariableScope());
 
 		MethodNode methodNode = new MethodNode("test", 0, new ClassNode(Void.class), new Parameter[0], new ClassNode[0],
 				code);
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
index b575c6f4290..4bd12c08ad1 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
@@ -123,7 +123,7 @@ public class HttpTunnelPayload {
 				body.read(payload);
 			}
 			payload.flip();
-			return new HttpTunnelPayload(Long.valueOf(seqHeader), payload);
+			return new HttpTunnelPayload(Long.parseLong(seqHeader), payload);
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java
index dbbd0614439..52aae26fd7f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java
@@ -104,7 +104,7 @@ public class StopMojo extends AbstractMojo {
 			return this.fork;
 		}
 		String property = this.project.getProperties().getProperty("_spring.boot.fork.enabled");
-		return Boolean.valueOf(property);
+		return Boolean.parseBoolean(property);
 	}
 
 	private void stopForkedProcess() throws IOException, MojoFailureException, MojoExecutionException {