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

28495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
0ea2ab1005 Upgrade to Tomcat 9.0.40 
Closes gh-24360
 2020-12-07 12:27:42 +01:00
Stephane Nicoll
193e3e5e82 Upgrade to Httpcore 4.4.14 
Closes gh-24359
 2020-12-07 12:27:40 +01:00
Stephane Nicoll
e06c106a4f Upgrade to Byte Buddy 1.10.18 
Closes gh-24358
 2020-12-07 12:27:39 +01:00
Stephane Nicoll
e8f6f6be17 Upgrade to Netty 4.1.54.Final 
Closes gh-24357
 2020-12-07 12:27:38 +01:00
Stephane Nicoll
8498f402e5 Upgrade to Dropwizard Metrics 4.1.16 
Closes gh-24356
 2020-12-07 12:27:36 +01:00
Stephane Nicoll
7689609f81 Upgrade to Db2 Jdbc 11.5.5.0 
Closes gh-24355
 2020-12-07 12:27:35 +01:00
Stephane Nicoll
cf51d80278 Upgrade to Appengine Sdk 1.9.83 
Closes gh-24354
 2020-12-07 12:27:34 +01:00
Stephane Nicoll
264ff95753 Upgrade to Caffeine 2.8.7 
Closes gh-24353
 2020-12-07 12:27:33 +01:00
Stephane Nicoll
d8706cdcfe Upgrade to Jackson 2.10.5.20201202 
Closes gh-24352
 2020-12-07 12:27:31 +01:00
Stephane Nicoll
aba4c20823 Upgrade to Couchbase Client 2.7.18 
Closes gh-24351
 2020-12-07 12:27:30 +01:00
Stephane Nicoll
07e32bf52e Merge branch '2.2.x' into 2.3.x 
Closes gh-24347
 2020-12-07 11:55:40 +01:00
Stephane Nicoll
f64b7f8465 Use proper CentOS base image 
See gh-24344
 2020-12-07 11:46:33 +01:00
Stephane Nicoll
a5a8545801 Switch integration tests to CentOS 7 
This commit upgrades the docker image for CentOS to Centos 7.9 as
CentOs 6 is EOL since November 30. Given that CentOS 7 does no longer
support SysVinit, this commit also updates the integration tests to not
test this OS anymore.

Closes gh-24344
 2020-12-07 10:33:29 +01:00
Phillip Webb
c7fe37212b Merge branch '2.2.x' into 2.3.x 2020-12-05 08:04:04 -08:00
Phillip Webb
ff0725f6bf Fix HazelcastHealthIndicatorTests 
See gh-24337
 2020-12-05 07:52:53 -08:00
Phillip Webb
e0a061707e Fix checkstyle header violation 
See gh-24337
 2020-12-05 07:51:37 -08:00
Phillip Webb
55ae5be84b Revert "Restore HazelcastHealthIndicatorTests" 
This reverts commit 5a51b5853e42325cb323eab40350c20027a022d0.
 2020-12-05 07:47:50 -08:00
Phillip Webb
562f49d958 Merge branch '2.2.x' into 2.3.x 2020-12-05 07:28:39 -08:00
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