Commit Graph

25155 Commits (afa5b12bdba7e68d05dc95ce79cb89dc41eb273c)
 

Author SHA1 Message Date
Stephane Nicoll 72c2638d6f Merge branch '2.1.x' into 2.2.x 5 years ago
Stephane Nicoll 10e0ca7dce Upgrade to Reactor Californium-SR19
Closes gh-21728
5 years ago
Phillip Webb ee00b57a78 Merge branch '2.1.x' into 2.2.x 5 years ago
Dave Syer b59b48e40e Ignore 'attach_pid' files 5 years ago
Andy Wilkinson 13564b4a13 Merge pull request #20716 from norio-io
* gh-20716:
  Polish "Clarify loss of defaults when adding custom mapping"
  Clarify loss of defaults when adding custom mapping

Closes gh-20716
5 years ago
Andy Wilkinson 2de906caf7 Polish "Clarify loss of defaults when adding custom mapping"
See gh-20716
5 years ago
Norio 9f009e4445 Clarify loss of defaults when adding custom mapping
See gh-20716
5 years ago
Andy Wilkinson 4a0e8217f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21759
5 years ago
Andy Wilkinson 5dce945e29 Document dispatcher-types configuration for secured error pages
Closes gh-19293
5 years ago
Andy Wilkinson 296da88e31 Merge branch '2.1.x' into 2.2.x
Closes gh-21754
5 years ago
Andy Wilkinson c96455f7cf Remove . from CLI's classpath on Unix-like platforms
Previously, the spring bash script added . to the classpath but the
Windows spring.bat script did not. This commit aligns the classpath
of the two scripts by removing . from the classpath in the bash
script.

Fixes gh-19910
5 years ago
Andy Wilkinson ad158ee729 Merge branch '2.1.x' into 2.2.x
Closes gh-21751
5 years ago
Andy Wilkinson 020a47ba3e Document support for Gradle 5
Closes gh-15358
5 years ago
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 5 years ago
Andy Wilkinson 6a9450ee8b Polish 5 years ago
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21743
5 years ago
Phillip Webb 70e0a27949 Drop the use of the term "white list"
Closes gh-21737
5 years ago
Stephane Nicoll 4c26c7d043 Start building against Spring Framework 5.2.7 snapshots
See gh-21738
5 years ago
Stephane Nicoll b997154caa Merge branch '2.1.x' into 2.2.x 5 years ago
Stephane Nicoll d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots
See gh-21729
5 years ago
Stephane Nicoll f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21730
5 years ago
Stephane Nicoll 9141e9b9e0 Merge branch '2.1.x' into 2.2.x 5 years ago
Stephane Nicoll 0b0187cd0d Start building against Reactor Californium-SR19 snapshots
See gh-21728
5 years ago
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 5 years ago
Phillip Webb 0a05b4c9fd Update copyright year of changed files 5 years ago
Phillip Webb c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
5 years ago
Stephane Nicoll 221e248b66 Merge pull request #21671 from dreis2211
* pr/21671:
  Remove usages of deprecated Connector.setAttribute()

Closes gh-21671
5 years ago
dreis2211 9bb22ffb69 Remove usages of deprecated Connector.setAttribute()
See gh-21671
5 years ago
Stephane Nicoll eb38eeaf30 Polish 5 years ago
Andy Wilkinson 1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter
Closes gh-21717
5 years ago
Andy Wilkinson 97533a5364 Merge branch '2.1.x' into 2.2.x
Closes gh-21682
5 years ago
Andy Wilkinson 20f0b41099 Upgrade CI to Docker 19.03.9
Closes gh-21681
5 years ago
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