From bbeba4a016dd8adc6b1396af32004c48f7791f08 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 21 Sep 2017 08:42:25 +0900 Subject: [PATCH] Clean up Java 6 leftover See gh-10367 --- README.adoc | 3 +-- eclipse/org.eclipse.jdt.core.prefs | 6 +++--- spring-boot-cli/src/main/content/INSTALL.txt | 2 +- spring-boot-parent/pom.xml | 2 -- .../spring-boot-loader/src/it/executable-dir/pom.xml | 4 ++-- .../spring-boot-loader/src/it/executable-jar/pom.xml | 4 ++-- .../spring-boot-loader/src/it/executable-props-lib/pom.xml | 4 ++-- .../spring-boot-loader/src/it/executable-props/pom.xml | 4 ++-- .../spring-boot-loader/src/it/executable-war/pom.xml | 4 ++-- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/README.adoc b/README.adoc index 3a3e3a40bf..e420f5d3ec 100755 --- a/README.adoc +++ b/README.adoc @@ -95,8 +95,7 @@ requests. If you want to raise an issue, please follow the recommendations below You don't need to build from source to use Spring Boot (binaries in http://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Boot can be easily built with the -https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8 (although -Boot applications can run on Java 1.6). +https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8. [indent=0] ---- diff --git a/eclipse/org.eclipse.jdt.core.prefs b/eclipse/org.eclipse.jdt.core.prefs index 3ec70345df..0eefe22d8f 100644 --- a/eclipse/org.eclipse.jdt.core.prefs +++ b/eclipse/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -104,7 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/spring-boot-cli/src/main/content/INSTALL.txt b/spring-boot-cli/src/main/content/INSTALL.txt index ac01fde8bd..27e84acb1d 100644 --- a/spring-boot-cli/src/main/content/INSTALL.txt +++ b/spring-boot-cli/src/main/content/INSTALL.txt @@ -7,7 +7,7 @@ in order to complete your installation. Prerequisites ------------- -Spring Boot CLI requires Java JDK v1.6 or above in order to run. Groovy v${groovy.version} +Spring Boot CLI requires Java JDK v1.8 or above in order to run. Groovy v${groovy.version} is packaged as part of this distribution, and therefore does not need to be installed (any existing Groovy installation is ignored). diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index b9cc0f3167..afc33641cd 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -736,8 +736,6 @@ - org.apache.maven.plugins maven-compiler-plugin diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml index 2454461ce0..49e8046c1b 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml @@ -15,8 +15,8 @@ maven-compiler-plugin @maven-compiler-plugin.version@ - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml index e094f31b5b..bc2bdc0674 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml @@ -15,8 +15,8 @@ maven-compiler-plugin @maven-compiler-plugin.version@ - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml index eeb46ffe33..7fa97fd45b 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml @@ -15,8 +15,8 @@ maven-compiler-plugin @maven-compiler-plugin.version@ - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml index 86b1e0d401..e2871bdc20 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml @@ -15,8 +15,8 @@ maven-compiler-plugin @maven-compiler-plugin.version@ - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml index b9e92cbf6f..09077520d3 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml @@ -16,8 +16,8 @@ maven-compiler-plugin @maven-compiler-plugin.version@ - 1.6 - 1.6 + 1.8 + 1.8