Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
560d272d
Commit
560d272d
authored
Jun 16, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.4.x' into 2.5.x
Closes gh-26933
parents
bc7004d9
6e43dd87
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
48 deletions
+7
-48
ConventionsPlugin.java
...ava/org/springframework/boot/build/ConventionsPlugin.java
+0
-1
EclipseConventions.java
...va/org/springframework/boot/build/EclipseConventions.java
+0
-40
JavaConventions.java
.../java/org/springframework/boot/build/JavaConventions.java
+7
-7
No files found.
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View file @
560d272d
...
...
@@ -47,7 +47,6 @@ public class ConventionsPlugin implements Plugin<Project> {
new
MavenPublishingConventions
().
apply
(
project
);
new
AsciidoctorConventions
().
apply
(
project
);
new
KotlinConventions
().
apply
(
project
);
new
EclipseConventions
().
apply
(
project
);
}
}
buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java
deleted
100644 → 0
View file @
bc7004d9
/*
* Copyright 2012-2021 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
build
;
import
org.gradle.api.Project
;
import
org.gradle.api.plugins.JavaBasePlugin
;
import
org.gradle.plugins.ide.eclipse.EclipsePlugin
;
import
org.gradle.plugins.ide.eclipse.model.EclipseModel
;
/**
* Conventions that are applied in the presence of the {@link JavaBasePlugin} in order to
* correctly configure Eclipse.
*
* @author Phillip Webb
*/
class
EclipseConventions
{
void
apply
(
Project
project
)
{
project
.
getPlugins
().
withType
(
JavaBasePlugin
.
class
,
(
java
)
->
{
project
.
getPlugins
().
apply
(
EclipsePlugin
.
class
);
EclipseModel
eclipse
=
project
.
getExtensions
().
getByType
(
EclipseModel
.
class
);
eclipse
.
getJdt
().
setJavaRuntimeName
(
"JavaSE-1.8"
);
});
}
}
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View file @
560d272d
...
...
@@ -43,6 +43,7 @@ import org.gradle.api.artifacts.Dependency;
import
org.gradle.api.artifacts.DependencySet
;
import
org.gradle.api.plugins.JavaBasePlugin
;
import
org.gradle.api.plugins.JavaPlugin
;
import
org.gradle.api.plugins.JavaPluginExtension
;
import
org.gradle.api.plugins.quality.Checkstyle
;
import
org.gradle.api.plugins.quality.CheckstyleExtension
;
import
org.gradle.api.plugins.quality.CheckstylePlugin
;
...
...
@@ -64,6 +65,7 @@ import org.springframework.boot.build.toolchain.ToolchainPlugin;
* plugin is applied:
*
* <ul>
* <li>The project is configered with source and target compatibility of 1.8
* <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin
* Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test
* Retry} plugins are applied
...
...
@@ -78,11 +80,7 @@ import org.springframework.boot.build.toolchain.ToolchainPlugin;
* {@link JavaPlugin} applied
* <li>{@link JavaCompile}, {@link Javadoc}, and {@link FormatTask} tasks are configured
* to use UTF-8 encoding
* <li>{@link JavaCompile} tasks are configured:
* <ul>
* <li>to use {@code -parameters}
* <li>with source and target compatibility of 1.8
* </ul>
* <li>{@link JavaCompile} tasks are configured to use {@code -parameters}.
* <li>When building with Java 8, {@link JavaCompile} tasks are also configured to:
* <ul>
* <li>Treat warnings as errors
...
...
@@ -116,7 +114,7 @@ class JavaConventions {
project
.
getPlugins
().
withType
(
JavaBasePlugin
.
class
,
(
java
)
->
{
project
.
getPlugins
().
apply
(
TestFailuresPlugin
.
class
);
configureSpringJavaFormat
(
project
);
configureJavaCo
mpileCo
nventions
(
project
);
configureJavaConventions
(
project
);
configureJavadocConventions
(
project
);
configureTestConventions
(
project
);
configureJarManifestConventions
(
project
);
...
...
@@ -195,7 +193,9 @@ class JavaConventions {
project
.
getTasks
().
withType
(
Javadoc
.
class
,
(
javadoc
)
->
javadoc
.
getOptions
().
source
(
"1.8"
).
encoding
(
"UTF-8"
));
}
private
void
configureJavaCompileConventions
(
Project
project
)
{
private
void
configureJavaConventions
(
Project
project
)
{
JavaPluginExtension
javaPluginExtension
=
project
.
getExtensions
().
getByType
(
JavaPluginExtension
.
class
);
javaPluginExtension
.
setSourceCompatibility
(
JavaVersion
.
toVersion
(
SOURCE_AND_TARGET_COMPATIBILITY
));
project
.
getTasks
().
withType
(
JavaCompile
.
class
,
(
compile
)
->
{
compile
.
getOptions
().
setEncoding
(
"UTF-8"
);
compile
.
setSourceCompatibility
(
SOURCE_AND_TARGET_COMPATIBILITY
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment