Commit Graph

32018 Commits (ad968a264094d5a46ee2a8c4a70f346f7459606b)
 

Author SHA1 Message Date
Andy Wilkinson ad968a2640 Merge branch '2.4.x'
Closes gh-26273
4 years ago
Andy Wilkinson cf1b29ebd4 Merge branch '2.3.x' into 2.4.x
Closes gh-26272
4 years ago
Andy Wilkinson e4d93b3624 Merge pull request #26264 from dreis2211
* gh-26264:
  Rename nohttp whitelist to allowlist

Closes gh-26264
4 years ago
dreis2211 9b1b47ae5d Rename nohttp whitelist to allowlist
See gh-26264
4 years ago
Andy Wilkinson e7c1c8937d Merge branch '2.4.x'
Closes gh-26261
4 years ago
Andy Wilkinson 79d27344e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26260
4 years ago
Andy Wilkinson 912c82e50d Work around https://bugs.openjdk.java.net/browse/JDK-8156584
sun.security.x509.AlgorithmId.get(String) isn't thread-safe and can
lead to null be returned for an algorithm that should be present.

This commit aims to work around this problem by avoiding the call
to AlgorithmId.get(String). It does so by configuring the
PKCS12 key protection algorithm to one that starts with
pbewithhmacsha (case insensitive). This short-circuits the logic
in PKCS12KeyStore.mapPBEAlgorithmToOID(String) and avoids the call to
AlgorithmId.get(String). Thanks again to @dreis2211 for the
suggestion.

The work around is only used when building with Java 8 as the problem
was fixed in Java 9.

Closes gh-26252
4 years ago
Andy Wilkinson fa49ed05c8 Merge pull request #26253 from dreis2211
* gh-26253:
  Fix GitHub tag determination following main branch rename

Closes gh-26253
4 years ago
dreis2211 5219697eb7 Fix GitHub tag determination following main branch rename
See gh-26253
4 years ago
Andy Wilkinson 6953da2013 Merge branch '2.4.x'
Closes gh-26257
4 years ago
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x
Closes gh-26256
4 years ago
Andy Wilkinson a470c1af3a Align documentation with main default branch name
Closes gh-26255
4 years ago
Andy Wilkinson c191009183 Merge branch '2.4.x' 4 years ago
Andy Wilkinson 4743ccc261 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 2ab679aceb Update prepare-forward-merge following master->main rename
See gh-26248
4 years ago
Andy Wilkinson 31b650093d Merge branch '2.4.x'
Closes gh-26251
4 years ago
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename
See gh-26248
4 years ago
Andy Wilkinson ffc06e1e30 Merge branch '2.3.x' into 2.4.x
Closes gh-26250
4 years ago
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI
Closes gh-26247
4 years ago
Andy Wilkinson 091907f762 Rename default branch to main
Closes gh-26248
4 years ago
Andy Wilkinson 47516b50c3 Merge branch '2.4.x'
Closes gh-26246
4 years ago
Andy Wilkinson b1c32f2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-26245
4 years ago
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
4 years ago
Phillip Webb d42ad237f5 Merge branch '2.4.x'
Closes gh-26242
4 years ago
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x
Closes gh-26241
4 years ago
Phillip Webb 1e0a3a946d Fix binding random properties test
See gh-26201
4 years ago
Phillip Webb f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
4 years ago
Phillip Webb ba5b36d733 Restore support for binding random properties
Revert 0588e989af so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.

Fixes gh-26201
4 years ago
Phillip Webb 5e8f383947 Extract code samples from docs
See gh-6313
4 years ago
Andy Wilkinson 6de10ff791 Merge branch '2.4.x'
Closes gh-26237
4 years ago
Andy Wilkinson 11fa850b97 Merge branch '2.3.x' into 2.4.x
Closes gh-26236
4 years ago
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration
Fixes gh-26234
4 years ago
Brian Clozel 1732d8ccf7 Merge branch '2.4.x'
Closes gh-26233
4 years ago
Brian Clozel 7be9c268b8 Fix ignored use-last-modified property in Spring MVC
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
4 years ago
Phillip Webb 32a87fcbda Extract code samples from docs
See gh-6313
4 years ago
Phillip Webb 2f852fa256 Update copyright year of changed files 4 years ago
Phillip Webb f30d48e3b3 Extract code samples from docs
See gh-6313
4 years ago
Phillip Webb 02cc778911 Extract code samples from docs
See gh-6313
4 years ago
Phillip Webb 3075ac0f54 Formatting 4 years ago
Stephane Nicoll a654380552 Merge pull request #26200 from slawekjaranowski
* pr/26200:
  Test Maven plugin against latest Maven versions

Closes gh-26200
4 years ago
Slawomir Jaranowski 50118f67fd Test Maven plugin against latest Maven versions
See gh-26200
4 years ago
Stephane Nicoll a7b0f90609 Merge branch '2.4.x'
Closes gh-26211
4 years ago
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x
Closes gh-26210
4 years ago
Stephane Nicoll 1d88e8fa65 Merge pull request #26209 from zoosm3
* pr/26209:
  Align Maven version in system requirements with what is actually tested

Closes gh-26209
4 years ago
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested
See gh-26209
4 years ago
Stephane Nicoll f1aeb8daf5 Merge branch '2.4.x' 4 years ago
Stephane Nicoll 65a7422a45 Upgrade to Kafka 2.6.2
Closes gh-24247
4 years ago
Stephane Nicoll 0c8f4e5ab3 Merge branch '2.4.x' 4 years ago
Stephane Nicoll 5aaca2b734 Upgrade Java 11 version in CI image
Closes gh-26193
4 years ago
Stephane Nicoll a712d9d089 Upgrade Java 8 version in CI image
Closes gh-26196
4 years ago