root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
17,169 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

293 Commits

Author SHA1 Message Date
Stephane Nicoll 60b109cf0c Merge branch '2.0.x' 2018-06-15 13:38:29 +02:00
Johnny Lim f34fb5f1ee Reduce object creation in findMatchingItemMetadata() 
Closes gh-13473
 2018-06-15 13:36:55 +02:00
Andy Wilkinson 5bd9a445ae Merge branch '2.0.x' 2018-06-08 18:09:00 +01: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
Phillip Webb e0ae805924 Update copyright header 2018-06-05 17:45:09 -07:00
Andy Wilkinson 0f321abe66 Merge branch '2.0.x' 2018-06-04 17:53:50 +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 b38f60a631 Merge branch '2.0.x' 2018-06-04 16:40:06 +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
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 2018-06-01 09:26:29 +02:00
Johnny Lim 6b0ce46491 Polish 
Closes gh-13320
 2018-06-01 09:22:20 +02:00
Phillip Webb 92b9b234f1 Merge branch '2.0.x' 2018-05-30 22:53:33 -07: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 cf27917e86 Merge branch '2.0.x' 2018-05-30 20:30:38 -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 40800355c7 Merge branch '2.0.x' 2018-05-30 12:41:48 -07:00
Phillip Webb 09fa1e7e11 Polish 2018-05-30 12:12:01 -07:00
Johnny Lim de01e7aad4 Polish 
See gh-13243
 2018-05-28 09:46:40 +02:00
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