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

252 Commits

Author SHA1 Message Date
Stephane Nicoll
b0433d66c1 Merge branch '2.0.x' 2018-05-11 14:24:13 +02:00
dreis2211
e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson
079b67c53b Merge branch '2.0.x' 2018-05-11 11:16:11 +01: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
07251a09d1 Merge branch '2.0.x' 2018-05-11 10:32:05 +01:00
Andy Wilkinson
d9d7499ae6 Merge branch '1.5.x' into 2.0.x 2018-05-11 10:31:52 +01:00
Stephane Nicoll
00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim
75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll
3ad8f3fcbf Merge branch '2.0.x' 2018-05-07 14:53:58 +02:00
Stephane Nicoll
9dccf5b895 Polish 
See gh-13078
 2018-05-07 14:48:56 +02:00
Stephane Nicoll
7f50d49251 Merge branch '2.0.x' 2018-05-07 14:42:39 +02:00
dreis2211
15d67d6b12 Remove MockServletWebServer.emptyEnumeration() 
Closes gh-13084
 2018-05-07 14:41:06 +02:00
Phillip Webb
7b120c1c97 Formatting 2018-05-04 16:36:35 -07:00
Phillip Webb
42c053cf1b Merge branch '2.0.x' 2018-05-04 16:31:46 -07: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
65e6011b7f Merge branch '2.0.x' 2018-05-04 11:45:35 +01: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
b6a2a46f78 Merge branch '2.0.x' 2018-05-03 23:54:42 -07: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
8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Andy Wilkinson
4ea7d3a767 Merge branch '2.0.x' 2018-05-03 11:35:58 +01: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
4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +02: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
44fd7d953e Merge branch '2.0.x' 2018-05-02 16:00:25 +02:00
Stephane Nicoll
782d8c63da Merge branch '1.5.x' into 2.0.x 2018-05-02 15:59:56 +02:00
Andy Wilkinson
0526594a3c Merge branch '2.0.x' 2018-05-02 12:26:23 +01:00
Andy Wilkinson
f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Madhura Bhave
a193c89c6d Merge branch '2.0.x' 2018-05-01 16:42:24 -07:00
Madhura Bhave
aad279208e Throw exception if RandomAccessData tries to read beyond EOF 
Fixes gh-12986
 2018-05-01 16:35:43 -07:00
Stephane Nicoll
335ca62239 Merge branch '2.0.x' 2018-04-30 16:45:30 +02:00
Johnny Lim
a723ac95a9 Polish 
Closes gh-12999
 2018-04-30 16:44:46 +02:00
Stephane Nicoll
080e189d06 Fix broken syntax 2018-04-25 10:40:23 +02:00
Stephane Nicoll
fd47b728c1 Properly handle values with spaces 
Closes gh-10741
 2018-04-24 16:26:51 +02:00
Stephane Nicoll
d4729f5389 Polish 2018-04-24 15:52:47 +02:00
Stephane Nicoll
40b7e02793 Polish "Add support for environment variables" 
Closes gh-12800
 2018-04-24 15:48:54 +02:00
Dmytro Nosan
95f7e3ca37 Add support for environment variables 
See gh-12800
 2018-04-24 14:48:54 +02:00
Stephane Nicoll
5dd4a7e91e Merge branch '2.0.x' 2018-04-24 13:31:36 +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
099f61ae6d Merge branch '2.0.x' 2018-04-24 11:04:23 +01:00
Andy Wilkinson
c9f04c3977 Avoid race between container starting and getting mapped port 2018-04-24 11:03:54 +01:00
Stephane Nicoll
03539d8e16 Polish "Add system properties support using explicit configuration tag" 
Closes gh-10741
 2018-04-24 11:46:20 +02:00
Vadeg
ba34bf6470 Add system properties support using explicit configuration tag 
See gh-10741
 2018-04-24 11:46:20 +02:00
Andy Wilkinson
fe497d70b8 Merge branch '2.0.x' 2018-04-24 10:39:11 +01:00
Andy Wilkinson
f6cc1cbd76 Make Testcontainer wait strategies final 2018-04-24 10:38:57 +01:00
Andy Wilkinson
c9b2afbd1e Merge branch '2.0.x' 2018-04-24 10:27:32 +01:00
Andy Wilkinson
f39cea0428 Try to stabilize build by giving Cassandra longer to start 2018-04-24 10:27:11 +01:00