Commit Graph

31268 Commits (363c43e31573dc2518408406f5dacdd89f36af4e)
 

Author SHA1 Message Date
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 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 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 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 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 94a70d6837 Merge branch '2.3.x' into 2.4.x
Closes gh-26241
4 years ago
Phillip Webb f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
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 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
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 65a7422a45 Upgrade to Kafka 2.6.2
Closes gh-24247
4 years ago
Stephane Nicoll 0ad7597f56 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll df2f6a4b39 Upgrade Java 11 version in CI image
Closes gh-26194
4 years ago
Stephane Nicoll 4c6aece927 Upgrade Java 8 version in CI image
Closes gh-26195
4 years ago
Stephane Nicoll 410641d336 Upgrade Java 11 version in CI image
Closes gh-26198
4 years ago
Stephane Nicoll e5a9defbc5 Upgrade Java 8 version in CI image
Closes gh-26197
4 years ago
Stephane Nicoll db7460ddd5 Polish contribution based on Andy's review
See gh-26188
4 years ago
Stephane Nicoll b1170efd3b Merge pull request #26188 from izeye
* pr/26188:
  Polish

Closes gh-26188
4 years ago
izeye 4be48d0d50 Polish
See gh-26188
4 years ago
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x
Closes gh-26185
4 years ago
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry
Closes gh-25610
4 years ago
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x
Closes gh-26181
4 years ago
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3
Closes gh-26179
4 years ago
Andy Wilkinson 289ede6541 Merge branch '2.3.x' into 2.4.x
Closes gh-26177
4 years ago
Andy Wilkinson 2dce3abe84 Use main branch when working with Homebrew tap's git repo
Closes gh-26173
4 years ago
Andy Wilkinson be99f386a8 Merge branch '2.3.x' into 2.4.x
Closes gh-26175
4 years ago
Andy Wilkinson 9e5f738f7a Make relative file references in checkstyle.xml more robust
Closes gh-26174
4 years ago
Stephane Nicoll 7cbae821b7 Merge branch '2.3.x' into 2.4.x
Closes gh-26171
4 years ago
Stephane Nicoll 823840dd21 Merge pull request #26167 from k163377
* pr/26167:
  Use new update site for Spring Java Format's Eclipse plugin

Closes gh-26167
4 years ago
wrongwrong 6ee72ff489 Use new update site for Spring Java Format's Eclipse plugin
See gh-26167
4 years ago
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x
Closes gh-26168
4 years ago
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
4 years ago
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include
Closes gh-26163
4 years ago
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata
Closes gh-26127
4 years ago
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x
Closes gh-26159
4 years ago
Stephane Nicoll 57c199d4d1 Merge pull request #14928 from nicce
* pr/14928:
  Polish "Enhance multiple entity manager factories how-to"
  Enhance multiple entity manager factories how-to

Closes gh-14928
4 years ago
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
4 years ago
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
4 years ago
Stephane Nicoll 54613c77d4 Exclude beans with scheduled methods from global lazy init
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
4 years ago
Andy Wilkinson aa9d0bc421 Merge pull request #26149 from vsriram92
* gh-26194:
  Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
  Use ConfigDataLocationResolvers' class loader to load resolver names

Closes gh-26149
4 years ago
Andy Wilkinson 0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
See gh-26149
4 years ago
Sriram 4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names
See gh-26149
4 years ago
Stephane Nicoll d3ca939aa8 Merge branch '2.3.x' into 2.4.x 4 years ago