root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
28,304 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

28304 Commits

Author SHA1 Message Date
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
Sergey Kolesnikov b341b478a6 Rename "sla" to "slo" in reference documentation 
See gh-24160
 2020-11-16 07:20:23 +01:00
Spring Buildmaster 5a5f5bc2ad Next development version (v2.3.7.BUILD-SNAPSHOT) 2020-11-12 08:57:43 +00:00
Andy Wilkinson 189046bd4f Revert "Reduce scope of META-INF customizations to main, source, and javadoc jars" 
Closes gh-24131
 2020-11-12 08:11:00 +00:00
Stephane Nicoll 8311edf722 Upgrade to Neo4j OGM 3.2.18 
Closes gh-24125
 2020-11-12 07:15:26 +01:00
Stephane Nicoll 79835dc20f Upgrade to Netty 4.1.54.Final 
Closes gh-24124
 2020-11-12 07:08:37 +01:00
Andy Wilkinson 3e243de41b Merge branch '2.2.x' into 2.3.x 
Closes gh-24121
 2020-11-11 20:16:39 +00:00
Andy Wilkinson 0c938ffa73 Merge pull request #24119 from dreis2211 
* gh-24119:
  Fix link to Flyway callback docs

Closes gh-24119
 2020-11-11 20:14:36 +00:00
dreis2211 033c78b945 Fix link to Flyway callback docs 
See gh-24119
 2020-11-11 20:14:08 +00:00
Andy Wilkinson e35c8e0214 Upgrade to Micrometer 1.5.7 
Closes gh-24050
 2020-11-11 19:33:12 +00:00
Andy Wilkinson 6507175d35 Upgrade to Spring Kafka 2.5.8.RELEASE 
Closes gh-24075
 2020-11-11 19:30:09 +00:00
Andy Wilkinson 0053fb7871 Upgrade to Spring Integration 5.3.4.RELEASE 
Closes gh-24096
 2020-11-11 19:28:49 +00:00
Andy Wilkinson 4a630dc7a9 Only skip ..-prefixed locations when found via wildcard 
Closes gh-23983
 2020-11-11 15:36:39 +00:00
Andy Wilkinson e8a1c3b9f8 Start building against Spring Integration 5.3.4 snapshots 
See gh-24096
 2020-11-11 09:16:30 +00:00
Andy Wilkinson 85cb5d4b3b Upgrade to Reactor Dysprosium-SR14 
Closes gh-24109
 2020-11-11 09:14:21 +00:00
Andy Wilkinson e6ab20b029 Merge branch '2.2.x' into 2.3.x 
Closes gh-24111
 2020-11-10 17:37:41 +00:00
Andy Wilkinson 31042bfc49 Test inclusion of system scope dependencies in repackaged war 
Closes gh-22503
 2020-11-10 17:35:04 +00:00
Stephane Nicoll afe721bc34 Start building against Reactor Dysprosium-SR14 snapshots 
See gh-24109
 2020-11-10 18:00:10 +01:00
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0 
Closes gh-24103
 2020-11-10 16:24:16 +01:00
Stephane Nicoll 23ad2b4156 Rationalize Testcontainers image versions 
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
 2020-11-10 16:04:27 +01:00
Stephane Nicoll 0c43d13789 Upgrade to Spring Framework 5.2.11 
Closes gh-24034
 2020-11-10 11:21:24 +01:00
Stephane Nicoll 339c8d0a26 Revert "Upgrade to Testcontainers 1.15.0" 2020-11-10 09:47:46 +01:00
Stephane Nicoll 5123eb0c74 Fix deprecation in Testcontainers 1.15.0 
See gh-24103
 2020-11-10 09:39:18 +01:00
Stephane Nicoll c1a1b5fe71 Upgrade to Testcontainers 1.15.0 
Closes gh-24103
 2020-11-10 08:46:15 +01:00