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
468eca91
Commit
468eca91
authored
Jan 19, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply Java conventions to projects that only apply Java base plugin
Fixes gh-19806
parent
bfdb49f2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
ConventionsPlugin.java
...ava/org/springframework/boot/build/ConventionsPlugin.java
+3
-2
No files found.
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View file @
468eca91
...
@@ -26,6 +26,7 @@ import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin;
...
@@ -26,6 +26,7 @@ import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin;
import
org.gradle.api.Plugin
;
import
org.gradle.api.Plugin
;
import
org.gradle.api.Project
;
import
org.gradle.api.Project
;
import
org.gradle.api.artifacts.DependencySet
;
import
org.gradle.api.artifacts.DependencySet
;
import
org.gradle.api.plugins.JavaBasePlugin
;
import
org.gradle.api.plugins.JavaPlugin
;
import
org.gradle.api.plugins.JavaPlugin
;
import
org.gradle.api.plugins.JavaPluginExtension
;
import
org.gradle.api.plugins.JavaPluginExtension
;
import
org.gradle.api.plugins.quality.CheckstyleExtension
;
import
org.gradle.api.plugins.quality.CheckstyleExtension
;
...
@@ -53,7 +54,7 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
...
@@ -53,7 +54,7 @@ import org.springframework.boot.build.testing.TestFailuresPlugin;
*
*
* <p/>
* <p/>
*
*
* When the {@link Java
Plugin Java
plugin} is applied:
* When the {@link Java
BasePlugin Java base
plugin} is applied:
*
*
* <ul>
* <ul>
* <li>{@code sourceCompatibility} is set to {@code 1.8}
* <li>{@code sourceCompatibility} is set to {@code 1.8}
...
@@ -106,7 +107,7 @@ public class ConventionsPlugin implements Plugin<Project> {
...
@@ -106,7 +107,7 @@ public class ConventionsPlugin implements Plugin<Project> {
}
}
private
void
applyJavaConventions
(
Project
project
)
{
private
void
applyJavaConventions
(
Project
project
)
{
project
.
getPlugins
().
withType
(
JavaPlugin
.
class
,
(
java
)
->
{
project
.
getPlugins
().
withType
(
Java
Base
Plugin
.
class
,
(
java
)
->
{
project
.
getPlugins
().
apply
(
TestFailuresPlugin
.
class
);
project
.
getPlugins
().
apply
(
TestFailuresPlugin
.
class
);
configureSpringJavaFormat
(
project
);
configureSpringJavaFormat
(
project
);
project
.
setProperty
(
"sourceCompatibility"
,
"1.8"
);
project
.
setProperty
(
"sourceCompatibility"
,
"1.8"
);
...
...
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