diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
index 84ec79c9fb..2f72a0981e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -50,6 +50,7 @@ javadoc {
 			'https://docs.oracle.com/javase/8/docs/api/',
 			'https://docs.gradle.org/current/javadoc/'
 		]
+		source = '8'
 	}
 	title = "${project.description} $version API"
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
index 050f728fbf..20bec57c29 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -15,7 +15,6 @@
 		<main.basedir>${basedir}/../../..</main.basedir>
 		<gradle.executable>./gradlew</gradle.executable>
 		<gradle.task>build</gradle.task>
-		<skip.gradle.build>false</skip.gradle.build>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
 	</properties>
 	<dependencies>
@@ -142,7 +141,6 @@
 								<argument>-Pdescription=${project.description}</argument>
 								<argument>-S</argument>
 							</arguments>
-							<skip>${skip.gradle.build}</skip>
 						</configuration>
 						<goals>
 							<goal>exec</goal>
@@ -177,7 +175,6 @@
 									<classifier>sources</classifier>
 								</artifact>
 							</artifacts>
-							<skipAttach>${skip.gradle.build}</skipAttach>
 						</configuration>
 					</execution>
 				</executions>
@@ -250,9 +247,6 @@
 								<version>3.2.10</version>
 							</dependency>
 						</dependencies>
-						<configuration>
-							<skip>${skip.gradle.build}</skip>
-						</configuration>
 						<executions>
 							<execution>
 								<id>set-up-maven-properties</id>
@@ -391,7 +385,6 @@
 											<classifier>docs</classifier>
 										</artifact>
 									</artifacts>
-									<skipAttach>${skip.gradle.build}</skipAttach>
 								</configuration>
 							</execution>
 						</executions>
@@ -399,14 +392,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>java9</id>
-			<activation>
-				<jdk>[9,)</jdk>
-			</activation>
-			<properties>
-				<skip.gradle.build>true</skip.gradle.build>
-			</properties>
-		</profile>
 	</profiles>
 </project>