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
eee07a84
Commit
eee07a84
authored
Sep 24, 2018
by
jnizet
Committed by
Andy Wilkinson
Sep 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move away from deprecated Gradle configurations
Closes gh-14593
parent
1d493527
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
18 deletions
+17
-18
build.gradle
.../spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+6
-6
dependencies.gradle
...src/main/gradle/managing-dependencies/dependencies.gradle
+2
-2
boot-jar-requires-unpack.gradle
...src/main/gradle/packaging/boot-jar-requires-unpack.gradle
+1
-1
war-container-dependency.gradle
...src/main/gradle/packaging/war-container-dependency.gradle
+1
-1
KotlinPluginActionIntegrationTests.java
...oot/gradle/plugin/KotlinPluginActionIntegrationTests.java
+2
-3
DependencyManagementPluginActionIntegrationTests-helpfulErrorWhenVersionlessDependencyFailsToResolve.gradle
...elpfulErrorWhenVersionlessDependencyFailsToResolve.gradle
+1
-1
JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
...lMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
+1
-1
KotlinPluginActionIntegrationTests-kotlinVersionMatchesKotlinPluginVersion.gradle
...ationTests-kotlinVersionMatchesKotlinPluginVersion.gradle
+1
-1
SpringBootPluginIntegrationTests-unresolvedDependenciesAreAnalyzedWhenDependencyResolutionFails.gradle
...pendenciesAreAnalyzedWhenDependencyResolutionFails.gradle
+1
-1
BootJarIntegrationTests-duplicatesAreHandledGracefully.gradle
...JarIntegrationTests-duplicatesAreHandledGracefully.gradle
+1
-1
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View file @
eee07a84
...
@@ -21,12 +21,12 @@ repositories {
...
@@ -21,12 +21,12 @@ repositories {
}
}
dependencies
{
dependencies
{
compile
localGroovy
()
implementation
localGroovy
()
compile
gradleApi
()
implementation
gradleApi
()
compile
fileTree
(
dir:
'target/dependencies/compile'
,
include:
'*.jar'
)
implementation
fileTree
(
dir:
'target/dependencies/compile'
,
include:
'*.jar'
)
test
Compile
gradleTestKit
()
test
Implementation
gradleTestKit
()
testCompile
'org.apache.commons:commons-compress:1.13'
testImplementation
'org.apache.commons:commons-compress:1.13'
testCompile
fileTree
(
dir:
'target/dependencies/test'
,
include:
'*.jar'
)
testImplementation
fileTree
(
dir:
'target/dependencies/test'
,
include:
'*.jar'
)
}
}
jar
{
jar
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/managing-dependencies/dependencies.gradle
View file @
eee07a84
...
@@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
...
@@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
// tag::dependencies[]
// tag::dependencies[]
dependencies
{
dependencies
{
compile
'org.springframework.boot:spring-boot-starter-web'
implementation
'org.springframework.boot:spring-boot-starter-web'
compile
'org.springframework.boot:spring-boot-starter-data-jpa'
implementation
'org.springframework.boot:spring-boot-starter-data-jpa'
}
}
// end::dependencies[]
// end::dependencies[]
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-requires-unpack.gradle
View file @
eee07a84
...
@@ -12,7 +12,7 @@ repositories {
...
@@ -12,7 +12,7 @@ repositories {
}
}
dependencies
{
dependencies
{
runtime
'org.jruby:jruby-complete:1.7.25'
runtime
Only
'org.jruby:jruby-complete:1.7.25'
}
}
bootJar
{
bootJar
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/war-container-dependency.gradle
View file @
eee07a84
...
@@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
...
@@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
// tag::dependencies[]
// tag::dependencies[]
dependencies
{
dependencies
{
compile
'org.springframework.boot:spring-boot-starter-web'
implementation
'org.springframework.boot:spring-boot-starter-web'
providedRuntime
'org.springframework.boot:spring-boot-starter-tomcat'
providedRuntime
'org.springframework.boot:spring-boot-starter-tomcat'
}
}
// end::dependencies[]
// end::dependencies[]
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
View file @
eee07a84
...
@@ -44,9 +44,8 @@ public class KotlinPluginActionIntegrationTests {
...
@@ -44,9 +44,8 @@ public class KotlinPluginActionIntegrationTests {
@Test
@Test
public
void
kotlinVersionMatchesKotlinPluginVersion
()
{
public
void
kotlinVersionMatchesKotlinPluginVersion
()
{
String
output
=
this
.
gradleBuild
String
output
=
this
.
gradleBuild
.
build
(
"kotlinVersion"
,
"dependencies"
,
.
build
(
"kotlinVersion"
,
"dependencies"
,
"--configuration"
,
"compile"
)
"--configuration"
,
"compileClasspath"
).
getOutput
();
.
getOutput
();
assertThat
(
output
).
contains
(
"Kotlin version: 1.2.10"
);
assertThat
(
output
).
contains
(
"Kotlin version: 1.2.10"
);
assertThat
(
output
)
assertThat
(
output
)
.
containsPattern
(
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10"
);
.
containsPattern
(
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10"
);
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests-helpfulErrorWhenVersionlessDependencyFailsToResolve.gradle
View file @
eee07a84
...
@@ -12,5 +12,5 @@ repositories {
...
@@ -12,5 +12,5 @@ repositories {
}
}
dependencies
{
dependencies
{
compile
'org.springframework.boot:spring-boot-starter-web'
implementation
'org.springframework.boot:spring-boot-starter-web'
}
}
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle
View file @
eee07a84
...
@@ -12,7 +12,7 @@ repositories {
...
@@ -12,7 +12,7 @@ repositories {
}
}
dependencies
{
dependencies
{
def
configurationName
=
GradleVersion
.
current
().
compareTo
(
GradleVersion
.
version
(
"4.6"
))
>=
0
?
'annotationProcessor'
:
'
compile
'
def
configurationName
=
GradleVersion
.
current
().
compareTo
(
GradleVersion
.
version
(
"4.6"
))
>=
0
?
'annotationProcessor'
:
'
implementation
'
add
(
configurationName
,
[
name:
'spring-boot-configuration-processor-1.2.3'
])
add
(
configurationName
,
[
name:
'spring-boot-configuration-processor-1.2.3'
])
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionMatchesKotlinPluginVersion.gradle
View file @
eee07a84
...
@@ -28,7 +28,7 @@ repositories {
...
@@ -28,7 +28,7 @@ repositories {
}
}
dependencies
{
dependencies
{
compile
'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
implementation
'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
}
}
task
kotlinVersion
{
task
kotlinVersion
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests-unresolvedDependenciesAreAnalyzedWhenDependencyResolutionFails.gradle
View file @
eee07a84
...
@@ -12,5 +12,5 @@ repositories {
...
@@ -12,5 +12,5 @@ repositories {
}
}
dependencies
{
dependencies
{
compile
'org.springframework.boot:spring-boot-starter'
implementation
'org.springframework.boot:spring-boot-starter'
}
}
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-duplicatesAreHandledGracefully.gradle
View file @
eee07a84
...
@@ -26,6 +26,6 @@ repositories {
...
@@ -26,6 +26,6 @@ repositories {
}
}
dependencies
{
dependencies
{
compile
"org.apache.commons:commons-lang3:3.6"
implementation
"org.apache.commons:commons-lang3:3.6"
provided
"org.apache.commons:commons-lang3:3.6"
provided
"org.apache.commons:commons-lang3:3.6"
}
}
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