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
2cda3098
Commit
2cda3098
authored
Feb 11, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.1.x'
parents
9244f825
6fe9e3a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
GradleCompatibilitySuite.java
...framework/boot/gradle/junit/GradleCompatibilitySuite.java
+2
-2
KotlinPluginActionIntegrationTests.java
...oot/gradle/plugin/KotlinPluginActionIntegrationTests.java
+1
-1
GradleBuild.java
.../org/springframework/boot/gradle/testkit/GradleBuild.java
+2
-2
No files found.
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java
View file @
2cda3098
/*
* Copyright 2012-201
8
the original author or authors.
* Copyright 2012-201
9
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.
...
...
@@ -39,7 +39,7 @@ import org.springframework.boot.gradle.testkit.GradleBuild;
public
final
class
GradleCompatibilitySuite
extends
Suite
{
private
static
final
List
<
String
>
GRADLE_VERSIONS
=
Arrays
.
asList
(
"default"
,
"4.5.1"
,
"4.6"
,
"4.7"
,
"4.8.1"
,
"4.9"
,
"4.10.
2"
,
"5.0
"
);
"4.6"
,
"4.7"
,
"4.8.1"
,
"4.9"
,
"4.10.
3"
,
"5.0"
,
"5.1.1"
,
"5.2.1
"
);
public
GradleCompatibilitySuite
(
Class
<?>
clazz
)
throws
InitializationError
{
super
(
clazz
,
createRunners
(
clazz
));
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java
View file @
2cda3098
/*
* Copyright 2012-201
8
the original author or authors.
* Copyright 2012-201
9
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.
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View file @
2cda3098
/*
* Copyright 2012-201
8
the original author or authors.
* Copyright 2012-201
9
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.
...
...
@@ -193,7 +193,7 @@ public class GradleBuild implements TestRule {
gradleRunner
.
withGradleVersion
(
this
.
gradleVersion
);
}
else
if
(
this
.
dsl
==
Dsl
.
KOTLIN
)
{
gradleRunner
.
withGradleVersion
(
"4.10.
2
"
);
gradleRunner
.
withGradleVersion
(
"4.10.
3
"
);
}
List
<
String
>
allArguments
=
new
ArrayList
<>();
allArguments
.
add
(
"-PbootVersion="
+
getBootVersion
());
...
...
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