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

17608 Commits

Author SHA1 Message Date
Stephane Nicoll 101afc9bb2 Merge branch '2.0.x' 2018-07-24 10:40:18 +02:00
Stephane Nicoll 26cab9aa83 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:40:07 +02:00
Stephane Nicoll 8570b56217 Fix typo 2018-07-24 10:39:52 +02:00
Stephane Nicoll dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll 7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
Stephane Nicoll 7865233b16 Fix Flyway filesystem prefix location check 
Co-authored-by: Andy Bell <andyrbell@gmail.com>

Closes gh-13863
 2018-07-24 10:31:53 +02:00
Stephane Nicoll 62830ee1b8 Merge pull request #13872 from 
* pr/13872:
  Fix OAuth2WebSecurityConfigurationTests
 2018-07-24 09:59:24 +02:00
dreis2211 d0918f87b2 Fix OAuth2WebSecurityConfigurationTests 
Closes gh-13872
 2018-07-24 09:57:42 +02:00
Stephane Nicoll 2ad548485c Merge branch '2.0.x' 2018-07-24 09:40:38 +02:00
Stephane Nicoll ee0de14e9f Merge pull request #13871 from dreis2211:collections-remove-if 
* pr/13871:
  Polish "Use Collection.removeIf() where possible"
  Use Collection.removeIf() where possible
 2018-07-24 09:40:27 +02:00
Stephane Nicoll 1a0afc6bbe Polish "Use Collection.removeIf() where possible" 
Closes gh-13871
 2018-07-24 09:38:51 +02:00
dreis2211 1189ccc936 Use Collection.removeIf() where possible 
See gh-13871
 2018-07-24 09:38:34 +02:00
Stephane Nicoll 6dc0cb4f67 Merge branch '2.0.x' 2018-07-24 09:33:22 +02:00
Stephane Nicoll 1ec1692381 Merge pull request #13813 from joshiste:issue-13791 
* pr/13813:
  Polish "Add metric description and base unit to metrics endpoint"
  Add metric description and base unit to metrics endpoint
 2018-07-24 09:32:35 +02:00
Stephane Nicoll 7176c54f5e Polish "Add metric description and base unit to metrics endpoint" 
Closes gh-13813
 2018-07-24 09:32:22 +02:00
Johannes Edmeier ab1f8cf77b Add metric description and base unit to metrics endpoint 
See gh-13813
 2018-07-24 09:32:22 +02:00
Stephane Nicoll a7b13dbe45 Merge pull request #13819 from jkschneider:micrometer-1.0.6 
* pr/13819:
  Polish "Upgrade to Micrometer 1.0.6"
  Upgrade to Micrometer 1.0.6
 2018-07-24 09:26:42 +02:00
Stephane Nicoll ecb8da2536 Polish "Upgrade to Micrometer 1.0.6" 
Closes gh-13819
 2018-07-24 09:25:54 +02:00
Jon Schneider f478911c54 Upgrade to Micrometer 1.0.6 
See gh-13819
 2018-07-24 09:12:06 +02:00
Stephane Nicoll ccabf83815 Merge branch '2.0.x' 2018-07-23 09:31:54 +02:00
Stephane Nicoll dcb68d4c64 Deprecate unused property 
Closes gh-13836
 2018-07-23 09:31:02 +02:00
Andy Wilkinson 70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Andy Wilkinson f1cf41f544 Merge pull request #13818 from Johnny Lim 
* gh-13818:
  Add null guards for getBeanDefinition() in BeanTypeRegistry
 2018-07-20 17:03:54 +01:00
Johnny Lim 0fd4e40e6e Add null guards for getBeanDefinition() in BeanTypeRegistry 
Closes gh-13818
 2018-07-20 17:03:35 +01:00
Andy Wilkinson c7f6fb8660 Upgrade to Mockito 2.19.1 
Closes gh-13859
 2018-07-20 16:39:24 +01:00
Andy Wilkinson f8c8c47351 Upgrade to Jooq 3.11.3 
Closes gh-13858
 2018-07-20 16:39:24 +01:00
Andy Wilkinson 0ea85800c4 Upgrade to Infinispan 9.3.1.Final 
Closes gh-13857
 2018-07-20 16:39:23 +01:00
Andy Wilkinson 2d340fcae1 Upgrade to Hibernate 5.3.3.Final 
Closes gh-13856
 2018-07-20 16:39:22 +01:00
Andy Wilkinson 3b79802c19 Upgrade to Flyway 5.1.4 
Closes gh-13855
 2018-07-20 16:39:22 +01:00
Andy Wilkinson 98f19fcc81 Upgrade to Elasticsearch 6.3.1 
Closes gh-13854
 2018-07-20 16:39:21 +01:00
Andy Wilkinson e9d1abf2ce Upgrade to Groovy 2.5.1 
Closes gh-13853
 2018-07-20 16:39:20 +01:00
Andy Wilkinson 921d883559 Upgrade to Kafka 1.1.1 
Closes gh-13852
 2018-07-20 16:39:20 +01:00
Andy Wilkinson 7a706b1581 Upgrade to Commons Pool2 2.6.0 
Closes gh-13851
 2018-07-20 16:39:19 +01:00
Andy Wilkinson f28ae9e4c5 Upgrade to Commons Dbcp2 2.5.0 
Closes gh-13850
 2018-07-20 16:39:19 +01:00
Andy Wilkinson 1df725fddc Upgrade to Byte Buddy 1.8.13 
Closes gh-13849
 2018-07-20 16:39:18 +01:00
Andy Wilkinson a19d340b60 Upgrade to Undertow 2.0.11.Final 
Closes gh-13848
 2018-07-20 16:39:17 +01:00
Andy Wilkinson 9d72838796 Upgrade to Hazelcast 3.10.3 
Closes gh-13847
 2018-07-20 16:39:17 +01:00
Andy Wilkinson 5e58a50311 Upgrade to Couchbase Client 2.6.0 
Closes gh-13846
 2018-07-20 16:39:16 +01:00
Andy Wilkinson 13337c648c Merge branch '2.0.x' 2018-07-20 16:35:19 +01:00
Andy Wilkinson 136be5916c Upgrade to Postgresql 42.2.4 
Closes gh-13845
 2018-07-20 16:30:17 +01:00
Andy Wilkinson 8f2a8576a6 Upgrade to Mariadb 2.2.6 
Closes gh-13844
 2018-07-20 16:30:16 +01:00
Andy Wilkinson e5a4cfabc3 Upgrade to Hibernate Validator 6.0.11.Final 
Closes gh-13843
 2018-07-20 16:30:15 +01:00
Andy Wilkinson 1c6e75ff10 Upgrade to Kafka 1.0.2 
Closes gh-13842
 2018-07-20 16:30:15 +01:00
Andy Wilkinson 4003c3c6e5 Upgrade to Jna 4.5.2 
Closes gh-13841
 2018-07-20 16:30:14 +01:00
Andy Wilkinson 3fd6f00155 Upgrade to Netty 4.1.27.Final 
Closes gh-13840
 2018-07-20 16:30:13 +01:00
Andy Wilkinson 478181eb2c Merge branch '1.5.x' into 2.0.x 2018-07-20 16:26:30 +01:00
Andy Wilkinson 9c5330f076 Upgrade to Narayana 5.5.32.Final 
Closes gh-13839
 2018-07-20 16:23:06 +01:00
Andy Wilkinson 5a6ba34467 Upgrade to Httpclient 4.5.6 
Closes gh-13838
 2018-07-20 16:23:05 +01:00
Stephane Nicoll 0f0fc9ec62 Adapt assertion to logging change in Spring Framework 2018-07-20 17:12:56 +02:00