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

21754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
b132192841 Merge pull request #16539 from dreis2211 
* pr/16539:
  Polish "Add Duration support in /configprops endpoint"
  Add Duration support in /configprops endpoint
 2019-05-21 10:02:39 +02:00
Stephane Nicoll
2b5632ec3e Polish "Add Duration support in /configprops endpoint" 
Closes gh-16539
 2019-05-21 10:02:15 +02:00
dreis2211
47d85bb4fe Add Duration support in /configprops endpoint 
See gh-16539
 2019-05-21 09:55:39 +02:00
Stephane Nicoll
bc90d48f72 Merge pull request #16755 from garyrussell 
* pr/16755:
  Polish "Auto-configure Kafka listener container with rebalance listener"
  Auto-configure Kafka listener container with rebalance listener
 2019-05-21 09:54:22 +02:00
Stephane Nicoll
74208bb1a7 Polish "Auto-configure Kafka listener container with rebalance listener" 
Closes gh-16755
 2019-05-21 09:49:34 +02:00
Gary Russell
abdc2e1b4f Auto-configure Kafka listener container with rebalance listener 
This commit associates a `ConsumerAwareRebalanceListener` to the
auto-configured listener container factory if a single instance is found
in the context.

See gh-16755
 2019-05-21 09:40:41 +02:00
Stephane Nicoll
0635d86cf4 Merge pull request #16745 from izeye 
* pr/16745:
  Use MergedAnnotation.getRoot() in PropertyMappingCheckBeanPostProcessor
 2019-05-21 09:26:51 +02:00
Johnny Lim
652906ec7c Use MergedAnnotation.getRoot() in PropertyMappingCheckBeanPostProcessor 
Closes gh-16745
 2019-05-21 09:26:27 +02:00
Stephane Nicoll
9b73d6567e Merge pull request #16389 from enesacikoglu 
* pr/16389:
  Polish "Add support for Couchbase's role-based access"
  Add support for Couchbase's role-based access
 2019-05-21 09:15:52 +02:00
Stephane Nicoll
2949561bf6 Polish "Add support for Couchbase's role-based access" 
Closes gh-16389
 2019-05-21 09:13:09 +02:00
Enes Açıkoğlu
3386856ccf Add support for Couchbase's role-based access 
See gh-16389
 2019-05-21 09:12:45 +02:00
Andy Wilkinson
f8eb230dea Ignore Redshift in DatabaseDriverClassNameTests 
Closes gh-16831
 2019-05-20 17:18:23 +01:00
Andy Wilkinson
64860e196c Improve diagnostics when forked JVM exits with non-zero status 
Closes gh-16869
 2019-05-20 16:04:32 +01:00
Stephane Nicoll
2afc8af2bf Merge pull request #16874 from rstoyanchev 
* pr/16874:
  Improve notes for the import into IntelliJ IDEA
 2019-05-20 14:49:34 +02:00
Rossen Stoyanchev
3a0f81c2bb Improve notes for the import into IntelliJ IDEA 
Closes gh-16874
 2019-05-20 14:49:08 +02:00
Stephane Nicoll
7bf48ed3b7 Merge pull request #16740 from garyrussell 
* pr/16740:
  Polish "Add configuration property for Spring Kafka's missingTopicsFatal"
  Add configuration property for Spring Kafka's missingTopicsFatal
 2019-05-20 14:47:02 +02:00
Stephane Nicoll
3c46b9e83d Polish "Add configuration property for Spring Kafka's missingTopicsFatal" 
Closes gh-16740
 2019-05-20 14:45:59 +02:00
Gary Russell
1583ce8d26 Add configuration property for Spring Kafka's missingTopicsFatal 
See gh-16740
 2019-05-20 14:32:18 +02:00
Stephane Nicoll
68085c93d1 Merge pull request #16815 from izeye 
* pr/16815:
  Fix assertion for outcomeWhenDevtoolsShouldBeEnabledIsTrueShouldMatch()
 2019-05-20 14:28:32 +02:00
Johnny Lim
7aaad7e5f4 Fix assertion for outcomeWhenDevtoolsShouldBeEnabledIsTrueShouldMatch() 
Closes gh-16815
 2019-05-20 14:27:38 +02:00
Stephane Nicoll
4f4fe01444 Merge pull request #16831 from hekonsek 
* pr/16831:
  Polish "Add support for AWS Redshift JDBC driver"
  Add support for AWS Redshift JDBC driver
 2019-05-20 14:24:32 +02:00
Stephane Nicoll
9e31c764fc Polish "Add support for AWS Redshift JDBC driver" 
Closes gh-16831
 2019-05-20 14:23:44 +02:00
Henryk Konsek
146f35d2bd Add support for AWS Redshift JDBC driver 
See gh-16831
 2019-05-20 14:06:23 +02:00
Stephane Nicoll
26df55761d Merge enablement and exposure conditions for Actuator endpoints 
This commit merges the conditions for determining if an endpoint is
available in a single condition, deprecating
`ConditionalOnEnabledEndpoint` in the process.

Closes gh-16169
 2019-05-20 13:52:59 +02:00
Stephane Nicoll
275d794553 Make sure JdbcTemplateConfiguration is imported once 
Closes gh-13806
 2019-05-20 10:52:00 +02:00
Stephane Nicoll
2f244c8bd1 Merge pull request #16701 from jvwilge 
* pr/16701:
  Polish "Make excludeDevtools available as a user property"
  Make excludeDevtools available as a user property
 2019-05-20 10:43:49 +02:00
Stephane Nicoll
66dc728018 Polish "Make excludeDevtools available as a user property" 
Closes gh-16701
 2019-05-20 10:38:15 +02:00
jvwilge
dcc09ffac2 Make excludeDevtools available as a user property 
See gh-16701
 2019-05-20 10:37:40 +02:00
Stephane Nicoll
6998b7c30c Merge pull request #16885 from izeye 
* pr/16885:
  Restore HttpTraceAutoConfigurationTests.configuresServletFilter()
 2019-05-20 08:47:36 +02:00
Johnny Lim
4900117c71 Restore HttpTraceAutoConfigurationTests.configuresServletFilter() 
Closes gh-16885
 2019-05-20 08:47:30 +02:00
Stephane Nicoll
75c42023c7 Merge pull request #16875 from izeye 
* pr/16875:
  Polish
 2019-05-19 14:38:52 +02:00
Johnny Lim
87874ffb70 Polish 
Closes gh-16875
 2019-05-19 14:38:38 +02:00
Phillip Webb
cce8c45ae6 Merge branch '2.1.x' 2019-05-15 01:37:54 -07:00
Spring Buildmaster
8e84d29e51 Next development version (v2.1.6.BUILD-SNAPSHOT) 2019-05-15 08:12:03 +00:00
Phillip Webb
10e67f8977 Fix dashIgnoringElementEquals algorithm 
Update `dashIgnoringElementEquals` so that trailing checks fail if
the last characters are not all `-`.

Fixes gh-16855
 2019-05-14 22:44:07 -07:00
Phillip Webb
963a544fb1 Merge branch '2.1.x' 
Closes gh-16860
 2019-05-14 21:31:08 -07:00
Phillip Webb
e0e9c4afad Merge pull request #16756 from ayudovin 
* pr/16756:
  Polish 'Drop blocking RedisReactiveHealthIndicator calls'
  Drop blocking RedisReactiveHealthIndicator calls
 2019-05-14 21:30:13 -07:00
Phillip Webb
f790556f96 Polish 'Drop blocking RedisReactiveHealthIndicator calls' 
See gh-16756
 2019-05-14 21:28:30 -07:00
ayudovin
de857372a5 Drop blocking RedisReactiveHealthIndicator calls 
Update `RedisReactiveHealthIndicator` so that `getReactiveConnection`
is not called directly since it blocks.

Fixed gh-16756
 2019-05-14 21:23:40 -07:00
Phillip Webb
3a9ca5fa30 Update copyright header of changed files 2019-05-14 21:05:53 -07:00
Phillip Webb
79e05c770f Merge branch '2.1.x' 2019-05-14 21:05:05 -07:00
Phillip Webb
ed998ef0d3 Update copyright header of changed files 2019-05-14 21:04:50 -07:00
Phillip Webb
c49b9bece5 Merge branch '2.1.x' 
Closes gh-16859
 2019-05-14 21:03:55 -07:00
Phillip Webb
ab15b8e26d Support overloaded setters when binding beans 
Update `JavaBeanBinder` so that overloaded setters can be used when
binding. Prior to this commit the setter picked would depend on the
order that the JVM returned the declared methods. We now consistently
prefer using the setter with a parameter type that matches the getter.

Closes gh-16206
 2019-05-14 21:02:16 -07:00
Phillip Webb
a82b5266ae Merge branch '2.1.x' 
Closes gh-16858
 2019-05-14 20:04:51 -07:00
Phillip Webb
e2dc278cae Use default SslContextFactory for JettyClient 
Update the auto-configured Jetty `HttpClient` so that a default
`SslContextFactory` is used.

Prior to this commit connecting to https URLs would cause a
`NullPointerException`.

Fixed gh-16810
 2019-05-14 20:04:02 -07:00
Phillip Webb
e03f3b8e9a Merge branch '2.1.x' 
Closes gh-16857
 2019-05-14 18:51:46 -07:00
Phillip Webb
f665910cdb Use generic type for binder cache comparisons 
Update `JavaBeanBinder` so that previously cached beans are compared
using full generic type information. Prior to this commit binding would
fail if a class with the same resolved type, but different generics was
in the cache.

Fixes gh-16821
 2019-05-14 18:42:16 -07:00
Phillip Webb
544e81ccd5 Merge branch '2.1.x' 
Closes gh-16856
 2019-05-14 17:37:30 -07:00
Phillip Webb
7407b226f2 Update CI to skip artifact downloads when possible 
Update the promote and sync jobs so that only the build-info.json
file is downloaded.

Closes gh-16448
 2019-05-14 17:10:46 -07:00