Commit Graph

24973 Commits (10fdd6506310ea0255bf8e05cf422f0dd4ef0ea4)
 

Author SHA1 Message Date
Phillip Webb 10fdd65063 Add prepare-forward-merge script
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
5 years ago
Phillip Webb 39caf45155 Allow forward merge to work with .x patterns
Closes gh-21687
5 years ago
Phillip Webb 4a6e08c817 Add logging to forward-merge script
Add some logging to aid with development.
5 years ago
Phillip Webb b6474f2ca1 Remove accidentally committed hook file 5 years ago
Andy Wilkinson 29c2a0471d Add Oracle DB dependency management under com.oracle.database
Closes gh-20333
5 years ago
Phillip Webb 864daab03a Merge branch '2.1.x' into 2.2.x 5 years ago
Phillip Webb b5fe3c3494 Refine YAML type restriction error
Closes gh-21596
5 years ago
Phillip Webb 4fc0dec6c4 Support wrapped random property sources
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.

Closes gh-21595
5 years ago
Phillip Webb 09a47c9aad Fix containsDescendantOf for random sources
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.

Closes gh-21654
5 years ago
Phillip Webb 14e6c734a9 Merge branch '2.1.x' into 2.2.x
Closes gh-21643
5 years ago
Phillip Webb 95031295b9 Restore TomcatReactiveWebServerFactoryTests
Restore tests that were previously ignored due to a framework bug.

Closes gh-19702
5 years ago
Madhura Bhave 573cb98d90 Make management security configuration back off when SAML present
Fixes gh-21620
5 years ago
Phillip Webb 14c9804c5c Fix checkstyle issues 5 years ago
Phillip Webb af90604030 Merge branch '2.1.x' into 2.2.x
Closes gh-21597
5 years ago
Phillip Webb 587b840666 Restrict use of custom YAML types
Update `YamlJsonParser` and `OriginTrackedYamlLoader` to ensure that
custom types cannot be loaded.

Closes gh-21596
5 years ago
Stephane Nicoll 6a00ccf60c Merge pull request #21540 from BramDeCneudt
* pr/21540:
  Fix links for Apache Camel starter

Closes gh-21540
5 years ago
Bram De Cneudt 591d234e43 Fix links for Apache Camel starter
See gh-21540
5 years ago
Stephane Nicoll a657c97ce8 Merge pull request #21480 from olamy
* pr/21480:
  Polish "Use the container IP address for tests using TestContainer"
  Use the container IP address for tests using TestContainer

Closes gh-21480
5 years ago
Stephane Nicoll 77981ac2ae Polish "Use the container IP address for tests using TestContainer"
See gh-21480
5 years ago
olivier lamy 0c2bf70bb8 Use the container IP address for tests using TestContainer
See gh-21480
5 years ago
Stephane Nicoll afcb5d54b2 Polish "Fix uri tag for empty path"
See gh-21392
5 years ago
Stephane Nicoll 3f372824ea Merge pull request #21392 from jkschneider
* pr/21392:
  Fix uri tag for empty path

Closes gh-21392
5 years ago
Jon Schneider f78f2d57e1 Fix uri tag for empty path
See gh-21392
5 years ago
Madhura Bhave 398c80fb69 Merge pull request #21485 from FrontierPsychiatrist
* pr/21485:
  Fix typo in section 4.30.6

Closes gh-21485
5 years ago
Moritz do Rio Schulze 1e168a2145 Fix typo in section 4.30.6
See gh-21485
5 years ago
Madhura Bhave 831bb1f206 Merge branch '2.1.x' into 2.2.x
Closes gh-21526
5 years ago
Madhura Bhave bce48ea745 Upgrade CI to Docker 19.03.9
Closes gh-21525
5 years ago
Madhura Bhave 808cb98b98 Merge branch '2.1.x' into 2.2.x
Closes gh-21527
5 years ago
Madhura Bhave 7d197e6469 Don't add waiting-for-triage label for issues created by CI automation
Closes gh-21282
5 years ago
Scott Frederick 4a812fc29c Fix log name in ServletWebServerApplicationContext
Fixes gh-21354
5 years ago
Andy Wilkinson 4a896f2272 Merge branch '2.1.x' into 2.2.x
Closes gh-21471
5 years ago
Andy Wilkinson fdc63d71fe Use HTTPS when linking to groovy-lang.org
Closes gh-21466
5 years ago
Andy Wilkinson b78e4dacec Work around file handle leak when Undertow is stopped
There's a bug in Undertow that means it may leak a file handle is
the server is stopped immediately after a response to an SSL request
has been received. The stop processing races with Undertow's SSL
support tidying things up after sending the response. When the stop
processing wins, the tidying up fails with a NullPointerException that
prevents an input stream from being closed. On Windows, the input
stream remaining open prevents JUnit from being able to clean up its
temporary directory.

This commit uses Awaitility to wait for the file that's being served
over SSL to be deleted before stopping the server. On Windows, this
will delay the stop processing from beginning until after the tidy up
that's performed after sending the response has been completed,
hopefully eliminating the race condition that resulted in the input
stream being left open.

Fixes gh-21172
5 years ago
Phillip Webb 5eabb0400c Merge branch '2.1.x' into 2.2.x
Closes gh-21447
5 years ago
Phillip Webb d7c7ca31f3 Upgrade to spring-javaformat 0.0.22
Closes gh-21446
5 years ago
Phillip Webb 49a21ded7a Create endpoint beans as late as possible
Update `EndpointDiscoverer` so that `@Endpoint` and `@EndpointExtension`
beans are created as late as possible.

Prior to this commit, endpoint beans and extension beans would be
created during the discovery phase which could cause early bean
initialization. The problem was especially nasty when using an embedded
servlet container since `ServletEndpointRegistrar` is loaded as the
container is initialized. This would trigger discovery and load all
endpoint beans, including the health endpoint, and all health indicator
beans.

Fixes gh-20714
5 years ago
Madhura Bhave 27ada029b5 Revert "Expose property to configure OAuth2 provider configurationMetadata"
This reverts commit 7b79029949.

See gh-21375
5 years ago
Phillip Webb daed512076 Restore getUseRelativeRedirects in deprecated form
Restore the `getUseRelativeRedirects` method with a `Boolean` object
result and introduce `isUseRelativeRedirects` for the primitive boolean
variant.

See gh-20796
5 years ago
Phillip Webb 5157a75119 Polish 5 years ago
Madhura Bhave 7b79029949 Expose property to configure OAuth2 provider configurationMetadata
Closes gh-21375
5 years ago
Scott Frederick 6b8d08a6e3 Handle exceptions in management context
Prior to this commit, details about an exception would get dropped when
the management context was separate from the application context and
an actuator endpoint threw a binding exception.

This commit adds some logic to capture the exception so the management
context error handlers can add the appropriate attributes to the error
response.

Fixes gh-21036
5 years ago
Brian Clozel 3c666ac4c8 Upgrade to RSocket 1.0.0
Closes gh-21421
5 years ago
Stephane Nicoll c3eaa6dc54 Merge branch '2.1.x' into 2.2.x
Closes gh-21366
5 years ago
Stephane Nicoll efc9978362 Document use case of splitting auto-configuration and starter
Closes gh-20686
5 years ago
Stephane Nicoll 0dfca922ac Merge pull request #21318 from ahrytsiuk
* pr/21318:
  Polish "Align TestRestTemplate Javadoc with documentation"
  Align TestRestTemplate Javadoc with documentation

Closes gh-21318
5 years ago
Stephane Nicoll 60ff8bafb5 Polish "Align TestRestTemplate Javadoc with documentation"
See gh-21318
5 years ago
Andrii Hrytsiuk f11c030b71 Align TestRestTemplate Javadoc with documentation
See gh-21318
5 years ago
Stephane Nicoll 15cd0f8ef4 Merge branch '2.1.x' into 2.2.x 5 years ago
Spring Buildmaster b65747e301 Next development version (v2.2.8.BUILD-SNAPSHOT) 5 years ago
Spring Buildmaster 9f37f163a8 Next development version (v2.1.15.BUILD-SNAPSHOT) 5 years ago