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

323 Commits

Author SHA1 Message Date
Stephane Nicoll
f91b53747a Merge branch '2.0.x' 2018-05-28 09:41:41 +02:00
Johnny Lim
f385a1cb11 Polish 
Closes gh-13243
 2018-05-28 09:36:15 +02:00
Stephane Nicoll
7462401291 Merge branch '2.0.x' 2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b Fix javadoc 
Closes gh-13274
 2018-05-28 09:26:16 +02:00
Phillip Webb
68ffbafbae Fix checkstyle violations 2018-05-26 00:01:45 -07:00
Phillip Webb
3702da4573 Formatting 2018-05-25 23:52:38 -07:00
Phillip Webb
d8157c94f3 Merge branch '2.0.x' 2018-05-25 19:48:37 -07:00
Phillip Webb
21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Phillip Webb
40e68a6427 Merge branch '2.0.x' 2018-05-21 17:20:04 -07:00
Phillip Webb
6d8b4710d7 Merge branch '1.5.x' into 2.0.x 2018-05-21 17:18:49 -07:00
Stephane Nicoll
afe6abb20d Merge branch '2.0.x' 2018-05-17 15:31:02 +02:00
Johnny Lim
75639aa682 Polish 
Closes gh-13192
 2018-05-17 15:29:50 +02:00
Stephane Nicoll
ffdcdc0dc6 Merge branch '2.0.x' 2018-05-16 13:17:15 +02:00
Stephane Nicoll
7b7e802129 Merge branch '1.5.x' into 2.0.x 2018-05-16 13:16:54 +02:00
Stephane Nicoll
ed02d02d19 Polish "Allow repackage maven goal to take a source classifier" 
Closes gh-11061
 2018-05-15 15:02:22 +02:00
Björn
3c8e012411 Allow repackage maven goal to take a source classifier 
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.

This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.

If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.

See gh-11061
 2018-05-15 15:02:22 +02:00
Johnny Lim
fb2ab67f4f Polish 
Closes gh-13148
 2018-05-14 08:24:01 +02:00
Stephane Nicoll
b17c58b114 Merge branch '2.0.x' 2018-05-14 08:23:36 +02:00
Johnny Lim
3dd2f5bb05 Polish 
See gh-13148
 2018-05-14 08:19:10 +02:00
Stephane Nicoll
ae74ce9b39 Merge branch '2.0.x' 2018-05-11 14:28:38 +02:00
Vedran Pavic
a08fa27c39 Add .gitignore for Gradle Plugin module 
Closes gh-13137
 2018-05-11 14:28:02 +02:00
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