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

28277 Commits

Author SHA1 Message Date
Phillip Webb 5a51b5853e Restore HazelcastHealthIndicatorTests 
Restore `HazelcastHealthIndicatorTests` which was accidentally replaced
with a version from 2.4.x.

See gh-24337
 2020-12-05 07:28:08 -08:00
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x 
Closes gh-24338
 2020-12-04 18:21:57 -08:00
Phillip Webb d8a05090b3 Fix checkstyle BDD Mockito violations 
See gh-24337
 2020-12-04 18:06:54 -08:00
Phillip Webb 837fc83527 Fix checkstyle header violations 
See gh-24337
 2020-12-04 18:05:53 -08:00
Phillip Webb 9a7b8c07f8 Upgrade to spring-javaformat 0.0.26 
Closes gh-24337
 2020-12-04 17:54:56 -08:00
Madhura Bhave f569d7616d Merge branch '2.2.x' into 2.3.x 
Closes gh-24315
 2020-12-02 10:56:23 -08:00
Madhura Bhave 7b38b0ed11 Add SDKMAN to pipeline 
Closes gh-11987
 2020-12-02 10:52:41 -08:00
Stephane Nicoll 065fde2996 Start building against Spring Framework 5.2.12 snapshots 
See gh-24277
 2020-11-30 16:42:38 +01:00
Stephane Nicoll 5f81882305 Start building against Reactor Dysprosium-SR15 snapshots 
See gh-24274
 2020-11-30 16:41:32 +01:00
Stephane Nicoll 98f6e19610 Merge branch '2.2.x' into 2.3.x 2020-11-30 16:40:39 +01:00
Stephane Nicoll 9763ba56ba Start building against Spring Framework 5.2.12 snapshots 
See gh-24276
 2020-11-30 16:04:27 +01:00
Stephane Nicoll afeb9f29d4 Start building against Reactor Dysprosium-SR15 snasphots 
See gh-24273
 2020-11-30 14:32:15 +01:00
Stephane Nicoll b4a1030b97 Merge pull request #24257 from JimStockwell 
* pr/24257:
  Fix ErrorAttributeOptions#getIncludes Javadoc

Closes gh-24257
 2020-11-26 09:02:18 +01:00
Jim Stockwell bb7ad30de4 Fix ErrorAttributeOptions#getIncludes Javadoc 
See gh-24257
 2020-11-26 09:00:52 +01:00
Stephane Nicoll 9b992af34b Merge branch '2.2.x' into 2.3.x 
Closes gh-24250
 2020-11-25 14:31:30 +01:00
Stephane Nicoll 47efbd9052 Merge pull request #24208 from xJoeWoo 
* pr/24208:
  Polish "Reduce redis health indicator info command result size"
  Reduce redis health indicator info command result size

Closes gh-24208
 2020-11-25 14:30:39 +01:00
Stephane Nicoll d506f0c73e Polish "Reduce redis health indicator info command result size" 
See gh-24208
 2020-11-25 14:27:07 +01:00
xJoeWoo 99cc3f4bfc Reduce redis health indicator info command result size 
See gh-24208
 2020-11-25 14:23:57 +01:00
Stephane Nicoll c383ab7883 Merge pull request #24230 from wanderleisouza 
* pr/24230:
  Polish "Allow to exclude an empty set of ErrorAttributes"
  Allow to exclude an empty set of ErrorAttributes

Closes gh-24230
 2020-11-23 20:50:52 +01:00
Stephane Nicoll 016b69aa78 Polish "Allow to exclude an empty set of ErrorAttributes" 
See gh-24230
 2020-11-23 20:44:18 +01:00
Wanderlei Souza 6518f8f7fd Allow to exclude an empty set of ErrorAttributes 
See gh-24230
 2020-11-23 20:43:59 +01:00
Andy Wilkinson 4e9f702681 Only run deployment tests when war has material changes 
Closes gh-24137
 2020-11-20 12:05:51 +00:00
Andy Wilkinson 7efa1e47aa Merge branch '2.2.x' into 2.3.x 
Closes gh-24222
 2020-11-20 11:48:25 +00:00
Andy Wilkinson 12f2529be5 Allow actuator endpoint to have responses with custom HTTP statuses 
Fixes gh-24123
 2020-11-20 11:38:31 +00:00
Andy Wilkinson 0ed7f7f40a Merge branch '2.2.x' into 2.3.x 
Closes gh-24219
 2020-11-20 11:36:31 +00:00
Andy Wilkinson fbf4c8cd32 Merge pull request #24095 from artembilan 
* gh-24095:
  Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
  Ensure that MeterRegistry bean is defined before SI looks for it

Closes gh-24095
 2020-11-20 11:36:17 +00:00
Andy Wilkinson 08b9d1da57 Polish "Ensure that MeterRegistry bean is defined before SI looks for it" 
See gh-24095
 2020-11-20 11:20:31 +00:00
Artem Bilan 7d712aaa2d Ensure that MeterRegistry bean is defined before SI looks for it 
Previously, it was possible for Spring Integration, including its
built-in Micrometer support, to be auto-configured before the
Micrometer auto-configuration had defined the MeterRegistry bean. This
resulted in missing Spring Integration metrics.

Spring Integration is unusual in having its own built-in Micrometer
support that it configures itself. Rather than providing
auto-configuration for Integration's Micrometer support (Which isn't
needed), this commit introduces some auto-configuration that just
affects the ordering of the auto-configuration classes. This ordering
ensures that the MeterRegistry bean has been defined by Spring
Integration is auto-configured. This ensures that the MeterRegistry
bean is known to the BeanFactory when Spring Integration goes looking
for it.

See gh-24095
 2020-11-20 11:18:09 +00:00
Andy Wilkinson 988526bee9 Only attempt unwrapping of interfaces 
Wrapper's isWrapperFor and unwrap methods both take a Class<?> target
but document that the target should be an interface. Prior to this
change, we were calling isWrapperFor with any Class<?> irrespective of
whether or not it was an interface. When using Oracle UCP each call
to isWrapperFor with an interface results in an exception stack trace
being logged.

This commit upates DataSourceUnwrapper to adhere to Wrapper's contract
by only calling isWrapperFor and unwrap with interfaces.

Fixes gh-24154
 2020-11-18 11:35:11 +00:00
Andy Wilkinson 46c9a4fbc7 Merge branch '2.2.x' into 2.3.x 
Closes gh-24198
 2020-11-18 11:18:22 +00:00
Andy Wilkinson 96e40e97d2 Switch to Concourse's registry-image resource 
Closes gh-24197
 2020-11-18 11:16:37 +00:00
Stephane Nicoll ac05356427 Merge branch '2.2.x' into 2.3.x 
Closes gh-24195
 2020-11-18 10:34:17 +01:00
Stephane Nicoll f3afd8a0f4 Fix location of Spring LDAP and Spring Session properties 
Closes gh-23558
 2020-11-18 10:28:54 +01:00
Stephane Nicoll 76912d1952 Merge branch '2.2.x' into 2.3.x 
Closes gh-24193
 2020-11-18 10:09:03 +01:00
Stephane Nicoll d96ff16da9 Merge pull request #24147 from stokpop 
* pr/24147:
  Polish "Avoid unnecessary pattern compilation in WebFluxTags"
  Avoid unnecessary pattern compilation in WebFluxTags

Closes gh-24147
 2020-11-18 10:08:38 +01:00
Stephane Nicoll d3440880c4 Polish "Avoid unnecessary pattern compilation in WebFluxTags" 
See gh-24147
 2020-11-18 09:58:03 +01:00
Peter Paul Bakker b22bb7ea04 Avoid unnecessary pattern compilation in WebFluxTags 
See gh-24147
 2020-11-18 09:58:03 +01:00
Madhura Bhave af8b6ed5d2 Merge branch '2.2.x' into 2.3.x 
Closes gh-24187
 2020-11-17 16:23:37 -08:00
Madhura Bhave 4961599f53 Pin github-pr-resource to v0.21.0 
Closes gh-24145
 2020-11-17 16:21:24 -08:00
Stephane Nicoll dea12f7551 Merge branch '2.2.x' into 2.3.x 
Closes gh-24185
 2020-11-17 21:36:34 +01:00
Stephane Nicoll 749f039b4b Merge pull request #24173 from izeye 
* pr/24173:
  Provide dependency management for elasticsearch-rest-client-sniffer

Closes gh-24173
 2020-11-17 21:33:00 +01:00
izeye b17895844d Provide dependency management for elasticsearch-rest-client-sniffer 
See gh-24173
 2020-11-17 21:32:37 +01:00
Scott Frederick da2276e7d4 Use stable builder and run images in integration tests 
Fixes gh-24183
 2020-11-17 13:54:10 -06:00
Andy Wilkinson 14b15027af Correct the ID of the GE conventions plugin 
See gh-24178
 2020-11-17 14:38:54 +00:00
Andy Wilkinson 23852aa06f Upgrade to Gradle Enterprise Gradle Plugin 3.5 
Closes gh-24177
 2020-11-17 14:31:43 +00:00
Andy Wilkinson 666e9e1aa6 Merge branch '2.2.x' into 2.3.x 
Closes gh-24178
 2020-11-17 14:28:46 +00:00
Andy Wilkinson 039666a688 Upgrade to Gradle Enterprise Conventions 0.0.7 
Closes gh-24175
 2020-11-17 14:27:48 +00:00
Andy Wilkinson 845e287e51 Merge branch '2.2.x' into 2.3.x 2020-11-17 14:26:46 +00:00
Andy Wilkinson 27bc7db1fa Upgrade to Gradle Enterprise Maven Extension 1.7.1 
Closes gh-24176
 2020-11-17 14:24:52 +00:00
Stephane Nicoll 1395e1eb32 Merge pull request #24160 from SCORE1387 
* pr/24160:
  Rename "sla" to "slo" in reference documentation

Closes gh-24160
 2020-11-16 07:21:02 +01:00