fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,022 Commits 22 Branches 339 Tags
Commit Graph

300 Commits

Author SHA1 Message Date
Phillip Webb
7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb
ec1100a896 Upgrade to spring-javaformat 0.0.6 
Closes gh-13932
 2018-07-28 01:11:48 +01:00
Phillip Webb
cddd794a07 Polish 2018-07-28 00:05:25 +01:00
Andy Wilkinson
de7899fba4 Improve reliability by give Cassandra more time and attempts to start 2018-07-19 19:57:54 +01:00
Andy Wilkinson
b9ad0d9992 Test the Gradle plugin against Gradle 4.8.1 instead of 4.8 
Closes gh-13809
 2018-07-18 13:34:27 +01:00
Andy Wilkinson
8deea933b9 Test the Gradle plugin against Gradle 4.9 
Closes gh-13808
 2018-07-18 13:33:39 +01:00
Stephane Nicoll
ffe994335e Merge branch '1.5.x' into 2.0.x 2018-07-16 14:12:16 +02:00
Stephane Nicoll
174cc2bc4e Merge branch '1.5.x' into 2.0.x 2018-07-13 09:25:42 +02:00
dreis2211
ac8eebfbad Fix typos 
Closes gh-13762
 2018-07-13 07:54:03 +02:00
Andy Wilkinson
9eb5c9bd18 Merge branch '1.5.x' into 2.0.x 2018-07-09 13:39:11 +01:00
Stephane Nicoll
9e9e746554 Merge branch '1.5.x' into 2.0.x 2018-06-21 09:17:05 +02:00
Andy Wilkinson
814e90805e Merge branch '1.5.x' into 2.0.x 2018-06-19 20:06:44 +01:00
Johnny Lim
f34fb5f1ee Reduce object creation in findMatchingItemMetadata() 
Closes gh-13473
 2018-06-15 13:36:55 +02:00
Andy Wilkinson
6f2171c282 Improve error message when BootJar or BootWar has no known main class 
Closes gh-12712
 2018-06-08 18:07:24 +01:00
Andy Wilkinson
70c0d6a005 Test the Gradle plugin against Gradle 4.8 
Closes gh-13359
 2018-06-04 17:53:34 +01:00
Andy Wilkinson
00449bef6a Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts 
Closes gh-12631
 2018-06-04 17:53:34 +01:00
Andy Wilkinson
d54072e0a8 More accurately document buildInfo's effect on up-to-date checking 
Closes gh-13152
 2018-06-04 16:39:59 +01:00
Johnny Lim
6b0ce46491 Polish 
Closes gh-13320
 2018-06-01 09:22:20 +02:00
Phillip Webb
3751968ecd Add missing ExpectedException rule 
Add ExpectedException rule which was missed from the 1.5.x merge.
 2018-05-30 22:52:25 -07:00
Phillip Webb
bdd541b2cc Merge branch '1.5.x' into 2.0.x 2018-05-30 20:29:03 -07:00
Phillip Webb
5ae061f491 Merge branch '1.5.x' into 2.0.x 2018-05-30 20:27:19 -07:00
Phillip Webb
09fa1e7e11 Polish 2018-05-30 12:12:01 -07:00
Johnny Lim
f385a1cb11 Polish 
Closes gh-13243
 2018-05-28 09:36:15 +02:00
Eddú Meléndez
065eebfb4b Fix javadoc 
Closes gh-13274
 2018-05-28 09:26:16 +02:00
Phillip Webb
21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Phillip Webb
6d8b4710d7 Merge branch '1.5.x' into 2.0.x 2018-05-21 17:18:49 -07:00
Johnny Lim
75639aa682 Polish 
Closes gh-13192
 2018-05-17 15:29:50 +02:00
Stephane Nicoll
7b7e802129 Merge branch '1.5.x' into 2.0.x 2018-05-16 13:16:54 +02:00
Johnny Lim
3dd2f5bb05 Polish 
See gh-13148
 2018-05-14 08:19:10 +02:00
Vedran Pavic
a08fa27c39 Add .gitignore for Gradle Plugin module 
Closes gh-13137
 2018-05-11 14:28:02 +02:00
dreis2211
e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson
7913d9b599 Add methods to BootJar for adding content to BOOT-INF 
Closes gh-13000
 2018-05-11 11:14:14 +01:00
Andy Wilkinson
d9d7499ae6 Merge branch '1.5.x' into 2.0.x 2018-05-11 10:31:52 +01:00
Johnny Lim
75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll
9dccf5b895 Polish 
See gh-13078
 2018-05-07 14:48:56 +02:00
dreis2211
15d67d6b12 Remove MockServletWebServer.emptyEnumeration() 
Closes gh-13084
 2018-05-07 14:41:06 +02:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Andy Wilkinson
2bcf29913d Skip building the Gradle plugin on Java 9 as well as 10 
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.

This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
 2018-05-04 11:40:35 +01:00
Phillip Webb
2d70a7ae5e Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 22:43:12 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Andy Wilkinson
f5fabbc1b9 Remove the use of internal API from Gradle Plugin's BootJar 
Closes gh-13037
 2018-05-03 11:34:42 +01:00
Stephane Nicoll
79c222da78 Allow to provide manual metadata for keys that are not unique 
Closes gh-12193
 2018-05-02 16:04:02 +02:00
Stephane Nicoll
782d8c63da Merge branch '1.5.x' into 2.0.x 2018-05-02 15:59:56 +02:00
Andy Wilkinson
f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Madhura Bhave
aad279208e Throw exception if RandomAccessData tries to read beyond EOF 
Fixes gh-12986
 2018-05-01 16:35:43 -07:00
Johnny Lim
a723ac95a9 Polish 
Closes gh-12999
 2018-04-30 16:44:46 +02:00
Stephane Nicoll
55ef9e6dc9 Deprecate excludeArtifactIds 
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.

Closes gh-12885
 2018-04-24 13:25:58 +02:00
Andy Wilkinson
c9f04c3977 Avoid race between container starting and getting mapped port 2018-04-24 11:03:54 +01:00