diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
index eb552651f5..ceec007e31 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
@@ -296,7 +296,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
 
 	}
 
-	protected static enum ManagementServerPort {
+	protected enum ManagementServerPort {
 
 		DISABLE, SAME, DIFFERENT;
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DataSourceHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DataSourceHealthIndicator.java
index 889f342e92..ffe2c81a33 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DataSourceHealthIndicator.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DataSourceHealthIndicator.java
@@ -184,7 +184,7 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator implement
 
 	}
 
-	protected static enum Product {
+	protected enum Product {
 
 		HSQLDB("HSQL Database Engine",
 				"SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_USERS"),
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
index 1d6fe7b9fc..ec722975e2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
@@ -107,7 +107,7 @@ class OnClassCondition extends SpringBootCondition {
 		}
 	}
 
-	private static enum MatchType {
+	private enum MatchType {
 
 		PRESENT {
 			@Override
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
index d9498c12f6..fb93153669 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -150,7 +150,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 
 	public static class Headers {
 
-		public static enum HSTS {
+		public enum HSTS {
 			NONE, DOMAIN, ALL
 		}
 
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
index 1fce92fd54..bf2b9f7125 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
@@ -90,7 +90,7 @@ public class CommandException extends RuntimeException {
 	/**
 	 * Specific options understood by the {@link CommandRunner}.
 	 */
-	public static enum Option {
+	public enum Option {
 
 		/**
 		 * Hide the exception message.
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
index 541f5289b3..4c1fcc61a3 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
@@ -203,7 +203,7 @@ public class CommandRunnerTests {
 		this.commandRunner.run("help", "missing");
 	}
 
-	private static enum Call {
+	private enum Call {
 		SHOW_USAGE, ERROR_MESSAGE, PRINT_STACK_TRACE
 	}
 }
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java
index 1b722b8a5f..c60114e372 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java
@@ -109,7 +109,7 @@ public final class ChangedFile {
 	/**
 	 * Change types.
 	 */
-	public static enum Type {
+	public enum Type {
 
 		/**
 		 * A new file has been added.
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java
index 03bbbba7ce..da6024d517 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java
@@ -107,7 +107,7 @@ class Frame {
 		return new Frame(Type.forCode(firstByte & 0x0F), payload);
 	}
 
-	public static enum Type {
+	public enum Type {
 
 		/**
 		 * Continuation frame.
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java
index 53333fedad..650c50ee81 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java
@@ -47,7 +47,7 @@ public interface FailureHandler {
 	/**
 	 * Various outcomes for the handler.
 	 */
-	public static enum Outcome {
+	enum Outcome {
 
 		/**
 		 * Abort the relaunch.
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java
index e81725a1ee..395f60b4da 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java
@@ -90,7 +90,7 @@ public class ClassLoaderFile implements Serializable {
 	/**
 	 * The kinds of class load files.
 	 */
-	public static enum Kind {
+	public enum Kind {
 
 		/**
 		 * The file has been added since the original JAR was created.
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemMetadata.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemMetadata.java
index 1a465dfad7..e2f749c662 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemMetadata.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemMetadata.java
@@ -139,7 +139,7 @@ public class ItemMetadata implements Comparable<ItemMetadata> {
 	/**
 	 * The item type.
 	 */
-	public static enum ItemType {
+	public enum ItemType {
 		GROUP, PROPERTY
 	}
 
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java
index 9c163ae0a7..292504a261 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java
@@ -93,7 +93,7 @@ public class InnerClassProperties {
 
 	}
 
-	public static enum Fourth {
+	public enum Fourth {
 		YES, NO
 	}
 
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy
index 196887f502..a54ecc48ba 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy
@@ -41,7 +41,7 @@ import org.springframework.boot.loader.tools.Layouts
  */
 public class SpringBootPluginExtension {
 
-	static enum LayoutType {
+	enum LayoutType {
 
 		JAR(new Layouts.Jar()),
 
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
index 4f2c7f11a4..c4414653f0 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
@@ -53,7 +53,7 @@ public interface RandomAccessData {
 	/**
 	 * Lock modes for accessing the underlying resource.
 	 */
-	public static enum ResourceAccess {
+	enum ResourceAccess {
 
 		/**
 		 * Obtain access to the underlying resource once and keep it until the stream is
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
index 8108f44f13..8199e5f754 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
@@ -232,7 +232,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 		return null;
 	}
 
-	public static enum LayoutType {
+	public enum LayoutType {
 
 		/**
 		 * Jar Layout
diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
index fdbab1b80a..16ff534367 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
@@ -155,7 +155,7 @@ public abstract class AnsiOutput {
 	 * Possible values to pass to {@link AnsiOutput#setEnabled}. Determines when to output
 	 * ANSI escape sequences for coloring application output.
 	 */
-	public static enum Enabled {
+	public enum Enabled {
 
 		/**
 		 * Try to detect whether ANSI coloring capabilities are available. The default
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
index 444acfc367..f239eeb14c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
@@ -70,7 +70,7 @@ public final class RelaxedNames implements Iterable<String> {
 		}
 	}
 
-	static enum Variation {
+	enum Variation {
 
 		NONE {
 			@Override
@@ -97,7 +97,7 @@ public final class RelaxedNames implements Iterable<String> {
 
 	}
 
-	static enum Manipulation {
+	enum Manipulation {
 
 		NONE {
 			@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java b/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java
index f85de7498c..cf0e3547a3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java
@@ -94,7 +94,7 @@ public class TestRestTemplate extends RestTemplate {
 	/**
 	 * Options used to customize the Apache Http Client if it is used.
 	 */
-	public static enum HttpClientOption {
+	public enum HttpClientOption {
 
 		/**
 		 * Enable cookies.
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
index d6ed5d2a7f..1c29151aea 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
@@ -950,7 +950,7 @@ public class RelaxedDataBinderTests {
 
 	}
 
-	static enum Bingo {
+	enum Bingo {
 		THIS, or, THAT, THE_OTHER
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
index 37b97a963c..3e7e57fcd7 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java
@@ -424,7 +424,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
 
 	}
 
-	static enum FooEnum {
+	enum FooEnum {
 		FOO, BAZ, BAR
 	}