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
0186fb2e
Commit
0186fb2e
authored
Apr 06, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fail fast when plugin is used with an unsupported version of Gradle
Closes gh-8820
parent
874b1f48
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
98 additions
and
0 deletions
+98
-0
SpringBootPlugin.java
.../springframework/boot/gradle/plugin/SpringBootPlugin.java
+27
-0
SpringBootPluginIntegrationTests.java
.../boot/gradle/plugin/SpringBootPluginIntegrationTests.java
+54
-0
GradleBuild.java
.../org/springframework/boot/gradle/testkit/GradleBuild.java
+10
-0
SpringBootPluginIntegrationTests.gradle
...oot/gradle/plugin/SpringBootPluginIntegrationTests.gradle
+7
-0
No files found.
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
View file @
0186fb2e
...
...
@@ -19,10 +19,12 @@ package org.springframework.boot.gradle.plugin;
import
java.util.Arrays
;
import
java.util.List
;
import
org.gradle.api.GradleException
;
import
org.gradle.api.Plugin
;
import
org.gradle.api.Project
;
import
org.gradle.api.artifacts.Configuration
;
import
org.gradle.api.component.SoftwareComponent
;
import
org.gradle.util.GradleVersion
;
import
org.springframework.boot.gradle.dsl.SpringBootExtension
;
import
org.springframework.boot.gradle.tasks.bundling.BootJar
;
...
...
@@ -74,9 +76,31 @@ public class SpringBootPlugin implements Plugin<Project> {
@Override
public
void
apply
(
Project
project
)
{
verifyGradleVersion
();
createExtension
(
project
);
Configuration
bootArchives
=
createBootArchivesConfiguration
(
project
);
registerPluginActions
(
project
,
bootArchives
);
unregisterUnresolvedDependenciesAnalyzer
(
project
);
}
private
void
verifyGradleVersion
()
{
if
(
GradleVersion
.
current
().
compareTo
(
GradleVersion
.
version
(
"3.4"
))
<
0
)
{
throw
new
GradleException
(
"Spring Boot plugin requires Gradle 3.4 or later."
+
" The current version is "
+
GradleVersion
.
current
());
}
}
private
void
createExtension
(
Project
project
)
{
project
.
getExtensions
().
create
(
"springBoot"
,
SpringBootExtension
.
class
,
project
);
}
private
Configuration
createBootArchivesConfiguration
(
Project
project
)
{
Configuration
bootArchives
=
project
.
getConfigurations
()
.
create
(
BOOT_ARCHIVES_CONFIGURATION_NAME
);
return
bootArchives
;
}
private
void
registerPluginActions
(
Project
project
,
Configuration
bootArchives
)
{
SinglePublishedArtifact
singlePublishedArtifact
=
new
SinglePublishedArtifact
(
bootArchives
.
getArtifacts
());
List
<
PluginApplicationAction
>
actions
=
Arrays
.
asList
(
...
...
@@ -88,6 +112,9 @@ public class SpringBootPlugin implements Plugin<Project> {
project
.
getPlugins
().
withType
(
action
.
getPluginClass
(),
plugin
->
action
.
execute
(
project
));
}
}
private
void
unregisterUnresolvedDependenciesAnalyzer
(
Project
project
)
{
UnresolvedDependenciesAnalyzer
unresolvedDependenciesAnalyzer
=
new
UnresolvedDependenciesAnalyzer
();
project
.
getConfigurations
().
all
(
configuration
->
configuration
.
getIncoming
()
.
afterResolve
(
resolvableDependencies
->
unresolvedDependenciesAnalyzer
...
...
spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.java
0 → 100644
View file @
0186fb2e
/*
* Copyright 2012-2017 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
*
* http://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
.
gradle
.
plugin
;
import
org.gradle.testkit.runner.BuildResult
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.springframework.boot.gradle.testkit.GradleBuild
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Integration tests for {@link SpringBootPlugin}.
*
* @author Andy Wilkinson
*/
public
class
SpringBootPluginIntegrationTests
{
@Rule
public
final
GradleBuild
gradleBuild
=
new
GradleBuild
();
@Test
public
void
failFastWithVersionOfGradleLowerThanRequired
()
{
BuildResult
result
=
this
.
gradleBuild
.
gradleVersion
(
"3.3"
).
buildAndFail
();
assertThat
(
result
.
getOutput
()).
contains
(
"Spring Boot plugin requires Gradle 3.4"
+
" or later. The current version is Gradle 3.3"
);
}
@Test
public
void
succeedWithVersionOfGradleHigherThanRequired
()
{
this
.
gradleBuild
.
gradleVersion
(
"3.5-rc-3"
).
build
();
}
@Test
public
void
succeedWithVersionOfGradleMatchingWhatIsRequired
()
{
this
.
gradleBuild
.
gradleVersion
(
"3.4"
).
build
();
}
}
spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View file @
0186fb2e
...
...
@@ -55,6 +55,8 @@ public class GradleBuild implements TestRule {
private
String
script
;
private
String
gradleVersion
;
@Override
public
Statement
apply
(
Statement
base
,
Description
description
)
{
URL
scriptUrl
=
findDefaultScript
(
description
);
...
...
@@ -149,6 +151,9 @@ public class GradleBuild implements TestRule {
new
FileWriter
(
new
File
(
this
.
projectDir
,
"build.gradle"
)));
GradleRunner
gradleRunner
=
GradleRunner
.
create
().
withProjectDir
(
this
.
projectDir
)
.
forwardOutput
();
if
(
this
.
gradleVersion
!=
null
)
{
gradleRunner
.
withGradleVersion
(
this
.
gradleVersion
);
}
List
<
String
>
allArguments
=
new
ArrayList
<
String
>();
allArguments
.
add
(
"-PpluginClasspath="
+
pluginClasspath
());
allArguments
.
add
(
"-PbootVersion="
+
getBootVersion
());
...
...
@@ -164,6 +169,11 @@ public class GradleBuild implements TestRule {
this
.
projectDir
=
projectDir
;
}
public
GradleBuild
gradleVersion
(
String
version
)
{
this
.
gradleVersion
=
version
;
return
this
;
}
private
static
String
getBootVersion
()
{
return
evaluateExpression
(
"/*[local-name()='project']/*[local-name()='parent']/*[local-name()='version']"
...
...
spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests.gradle
0 → 100644
View file @
0186fb2e
buildscript
{
dependencies
{
classpath
files
(
pluginClasspath
.
split
(
','
))
}
}
apply
plugin:
'org.springframework.boot'
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