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

16946 Commits

Author SHA1 Message Date
Stephane Nicoll 41bcfad647 Merge pull request #13280 from dreis2211:assert-integration-autoconfiguration 
* pr/13280:
  Add assertion in IntegrationAutoConfigurationTests
 2018-05-29 09:04:22 +02:00
dreis2211 3ed31d60dc Add assertion in IntegrationAutoConfigurationTests 
Closes gh-13280
 2018-05-29 09:04:00 +02:00
Stephane Nicoll 6814b7f240 Merge branch '2.0.x' 2018-05-28 14:29:00 +02:00
Stephane Nicoll 8a9d0bd22a Merge branch '1.5.x' into 2.0.x 2018-05-28 14:28:45 +02:00
Stephane Nicoll 3118f14dbb Fix NPE when OnExpressionCondition is invoked with a null BeanFactory 
Closes gh-13249
 2018-05-28 14:22:38 +02:00
Stephane Nicoll ec65cb1753 Merge branch '2.0.x' 2018-05-28 10:52:42 +02:00
Stephane Nicoll 15ba50ab3e Merge branch '1.5.x' into 2.0.x 2018-05-28 10:52:21 +02:00
Stephane Nicoll 2140196f64 Merge pull request #13262 from lukaseder:master 
* pr/13262:
  Polish "Reference the latest version of the jOOQ manual"
  Reference the latest version of the jOOQ manual
 2018-05-28 10:44:36 +02:00
Stephane Nicoll fcd8e0fad3 Polish "Reference the latest version of the jOOQ manual" 
Closes gh-13262
 2018-05-28 10:44:07 +02:00
Lukas Eder cb1530d38e Reference the latest version of the jOOQ manual 
See gh-13262
 2018-05-28 10:20:54 +02: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
Stephane Nicoll 059b7e0327 Merge pull request #13243 from izeye:polish-20180523 
* pr/13243:
  Polish
 2018-05-28 09:41:24 +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
Stephane Nicoll 547fa9d5c6 Merge pull request #13274 from eddumelendez:fix_javadoc 
* pr/13274:
  Fix javadoc
 2018-05-28 09:26:54 +02:00
Eddú Meléndez 065eebfb4b Fix javadoc 
Closes gh-13274
 2018-05-28 09:26:16 +02:00
Stephane Nicoll be9a0ef65d Merge branch '2.0.x' 2018-05-27 18:04:38 +02:00
Stephane Nicoll 2c353762ab Merge pull request #13271 from hengyunabc:fix_maven 
* pr/13271:
  Add enforce-rule to ensure maven version >= 3.5.0
 2018-05-27 18:04:24 +02:00
hengyunabc b75e58b70f Add enforce-rule to ensure maven version >= 3.5.0 
Closes gh-13271
 2018-05-27 18:03:52 +02:00
Phillip Webb 3739699d79 Merge branch '2.0.x' 2018-05-26 08:44:13 -07:00
Phillip Webb dba73d76b8 Merge branch '1.5.x' into 2.0.x 2018-05-26 08:43:27 -07:00
Phillip Webb f45ed0e56c Don't validate HelpMojo formatting 
The `HelpMojo` class is always generated and it should not be checked
for formatting.

See gh-13255
 2018-05-26 08:41:21 -07:00
Stephane Nicoll 1bb53ff44c Merge branch '2.0.x' 2018-05-26 12:44:50 +02:00
Stephane Nicoll feee8b5db6 Merge pull request #13266 from aheritier:patch-2 
* pr/13266:
  Add missing semicolon in example
 2018-05-26 12:44:36 +02:00
Arnaud Heritier b60eadb10b Add missing semicolon in example 
Closes gh-13266
 2018-05-26 12:44:11 +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 2215709165 Merge branch '2.0.x' 2018-05-25 23:50:39 -07:00
Phillip Webb 6f0ccc64a5 Fix checkstyle violations 2018-05-25 23:03:17 -07:00
Phillip Webb 9fd3b9103a Format code 2018-05-25 23:02:45 -07:00
Phillip Webb e544922dd7 Merge branch '1.5.x' into 2.0.x 2018-05-25 23:02:08 -07:00
Phillip Webb e75d8eaf40 Switch to spring-javaformat plugin 
Use `spring-javaformat` to format and check code. Code formatting can
now be applied using the `spring-javaformat-maven-plugin` from the
command line. Existing checkstyle rules have also been replaced and
the CONTRIBUTING.adoc file has been updated.

Closes gh-13255
 2018-05-25 20:59:04 -07:00
Phillip Webb 5626b7a50d Merge branch '2.0.x' 2018-05-25 20:58:31 -07:00
Phillip Webb 9c5f207e22 Fix merge error 2018-05-25 20:57:46 -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 e69296d7d3 Fix checkstyle violations in samples 2018-05-25 18:18:00 -07:00
Phillip Webb 4853477081 Reformat code 2018-05-25 18:17:37 -07:00
Stephane Nicoll 75c10e615e Merge branch '2.0.x' 2018-05-25 16:45:57 +02:00
Stephane Nicoll 606eb9dda3 Merge pull request #13260 from torakiki:patch-1 
* pr/13260:
  Fix documentation error
 2018-05-25 16:45:45 +02:00
Andrea Vacondio aed118c410 Fix documentation error 
Closes gh-13260
 2018-05-25 16:43:35 +02:00
Madhura Bhave 940c3d1b75 Merge branch '2.0.x' 2018-05-25 10:39:22 +02:00
Madhura Bhave 552878c431 Fix javadoc 2018-05-25 10:37:39 +02:00
Stephane Nicoll 79967a482a Merge branch '2.0.x' 2018-05-24 11:44:10 +02:00
Stephane Nicoll a5b53b263e Merge branch '1.5.x' into 2.0.x 2018-05-24 11:43:48 +02:00
Stephane Nicoll 625f428aad Upgrade to gson 2.8.5 
Closes gh-13245
 2018-05-24 11:40:54 +02:00
Stephane Nicoll 8997143f31 Fix checkstyle violations 2018-05-24 11:40:54 +02:00
Stephane Nicoll 4464a5f5bd Remove code deprecated in 2.0 
Closes gh-12962
 2018-05-22 14:48:25 +02:00
Stephane Nicoll 1ea3e95ff6 Merge branch '2.0.x' 2018-05-22 13:40:51 +02:00