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

17750 Commits

Author SHA1 Message Date
Stephane Nicoll f1e2abce2d Merge branch '2.0.x' 2018-07-31 14:29:52 +02:00
Stephane Nicoll be2c7bf6ea Merge pull request #13933 from mhewedy:patch-1 
* pr/13933:
  Add classpath prefix to the flyway location
 2018-07-31 14:29:40 +02:00
Muhammad Hewedy 2f69785c6a Add classpath prefix to the flyway location 
Closes gh-13933
 2018-07-31 14:28:59 +02:00
Stephane Nicoll 3a3e7e31e1 Merge pull request #13937 from dreis2211:fix-deprecation-kafka-tests 
* pr/13937:
  Fix deprecation in KafkaAutoConfigurationIntegrationTests
 2018-07-31 14:28:19 +02:00
dreis2211 fe4b3e493d Fix deprecation in KafkaAutoConfigurationIntegrationTests 
Closes gh-13937
 2018-07-31 14:26:42 +02:00
Stephane Nicoll c58b228e03 Merge pull request #13941 from dreis2211:avoid-annotation-attributes-lookup 
* pr/13941:
  Avoid annotation attribute lookup in OnBeanCondition
 2018-07-31 11:06:45 +02:00
dreis2211 449e1cce9f Avoid annotation attribute lookup in OnBeanCondition 
Close gh-13941
 2018-07-31 11:05:50 +02:00
Stephane Nicoll 5341b4fb1f Merge pull request #13943 from izeye:polish-select-imports 
* pr/13943:
  Polish AutoConfigurationGroup.selectImports()
 2018-07-31 08:48:33 +02:00
Johnny Lim daf3f82006 Polish AutoConfigurationGroup.selectImports() 
Closes gh-13943
 2018-07-31 08:40:15 +02:00
Stephane Nicoll d12a099a6d Merge branch '2.0.x' 2018-07-31 08:17:46 +02:00
Stephane Nicoll 2c4e451fde Merge pull request #13952 from izeye:remove-print-stack-trace 
* pr/13952:
  Remove ex.printStackTrace() in tests
 2018-07-31 08:17:36 +02:00
Johnny Lim d4fba783fb Remove ex.printStackTrace() in tests 
Closes gh-13952
 2018-07-31 08:16:40 +02:00
Stephane Nicoll 0dfbb3d48c Merge branch '2.0.x' 2018-07-30 19:42:25 +02:00
Stephane Nicoll 3d85873a8a Merge branch '1.5.x' into 2.0.x 2018-07-30 19:41:09 +02:00
Stephane Nicoll e51c26efdc Fixup version numbers following release 2018-07-30 19:40:55 +02:00
Spring Buildmaster b4afcd652c Next development version (v2.0.5.BUILD-SNAPSHOT) 2018-07-30 15:09:18 +00:00
Spring Buildmaster 73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Andy Wilkinson d67611518f Merge branch '2.0.x' 2018-07-30 13:02:30 +01:00
Andy Wilkinson 06b4007ce4 Avoid installing unwanted ConsoleHandler when cleaning up 
Closes gh-13470
 2018-07-30 13:00:34 +01:00
Stephane Nicoll e7526a458d Upgrade to Spring Session Bean-M1 
Closes gh-13889
 2018-07-30 08:42:32 +02:00
Madhura Bhave d3719eed3f Merge branch '2.0.x' 2018-07-29 22:57:26 -07:00
Madhura Bhave 01abb196ef Fix typo 2018-07-29 22:56:49 -07:00
Stephane Nicoll 025142de69 Merge branch '2.0.x' 2018-07-29 19:01:40 +02:00
Stephane Nicoll 1435d83c18 Upgrade to Spring Session Apple-SR4 
Closes gh-13888
 2018-07-29 18:58:55 +02:00
Phillip Webb 4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +01:00
Phillip Webb 1b91c0ceb7 Merge branch '2.0.x' 2018-07-29 09:29:57 +01:00
Phillip Webb 0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb 80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Stephane Nicoll bb7401a80d Upgrade to Spring Integration 5.1.0.M1 
Closes gh-13891
 2018-07-28 15:54:21 +02:00
Stephane Nicoll deb7ea1bbd Merge branch '2.0.x' 2018-07-28 15:52:16 +02:00
Stephane Nicoll b24bb688b8 Upgrade to Spring Integration 5.0.7.RELEASE 
Closes gh-13886
 2018-07-28 15:48:39 +02:00
Phillip Webb 566056fd1a Merge branch '2.0.x' 2018-07-28 10:43:01 +01:00
Phillip Webb 9ca9a491ca Fix checkstyle issues in samples 
Fix checkstyle issues with samples following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 10:41:56 +01:00
Phillip Webb ce9c053cbf Fix checkstyle issues on master 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:36:04 +01:00
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb 63b609827e Fix checkstyle method order issues 
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:53 +01:00
Phillip Webb e6a68b39a3 Fix checkstyle javadoc issues 
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
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
Madhura Bhave f2a9030788 Merge branch '2.0.x' 2018-07-27 12:23:51 -07:00
Madhura Bhave e753b530fa EndpointRequest should match links with trailing slash 
Fixes gh-13921
 2018-07-27 12:23:27 -07:00
Stephane Nicoll 5d6e426b26 Merge branch '2.0.x' 2018-07-27 19:56:10 +02:00
Stephane Nicoll f7b90a73a0 Upgrade to Spring Kafka 2.1.8.RELEASE 
Closes gh-13887
 2018-07-27 19:53:47 +02:00
Stephane Nicoll 4eac4ad180 Merge branch '2.0.x' 2018-07-27 12:00:09 +02:00
Stephane Nicoll 20b9b2467b Merge branch '1.5.x' into 2.0.x 2018-07-27 11:59:57 +02:00
Stephane Nicoll 50e824cd3f Upgrade to Spring Data Ingalls SR14 
Closes gh-13917
 2018-07-27 11:59:01 +02:00
Stephane Nicoll e9a42e27d6 Merge branch '2.0.x' 2018-07-27 11:36:25 +02:00
Stephane Nicoll 2a0d1918f1 Merge branch '1.5.x' into 2.0.x 2018-07-27 11:36:10 +02:00