Commit Graph

28809 Commits

Author SHA1 Message Date
Stephane Nicoll d610f3c2ff Polish "Fix ordering of metadata entries"
See gh-26230
2021-04-28 14:07:37 +02:00
Dmitry Pavlov 3e34b0a60a Fix ordering of metadata entries
This commit provides a consistent ordering for groups that share the
same configuration property prefix.

See gh-26230
2021-04-28 14:07:37 +02:00
Stephane Nicoll 20da9826cc Disable incrementalBuildTypeRenamed test
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.

See gh-26271
2021-04-28 13:54:35 +02:00
Andy Wilkinson e4d93b3624 Merge pull request #26264 from dreis2211
* gh-26264:
  Rename nohttp whitelist to allowlist

Closes gh-26264
2021-04-28 12:27:53 +01:00
dreis2211 9b1b47ae5d Rename nohttp whitelist to allowlist
See gh-26264
2021-04-28 11:39:52 +01:00
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
2021-04-27 17:27:28 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson 2ab679aceb Update prepare-forward-merge following master->main rename
See gh-26248
2021-04-27 11:57:27 +01:00
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI
Closes gh-26247
2021-04-27 11:50:52 +01:00
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
2021-04-27 10:39:19 +01:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
2021-04-26 17:35:14 -07:00
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration
Fixes gh-26234
2021-04-26 15:38:01 +01:00
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
2021-04-22 14:48:06 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested
See gh-26209
2021-04-22 14:47:29 +02:00
Stephane Nicoll 410641d336 Upgrade Java 11 version in CI image
Closes gh-26198
2021-04-22 11:08:04 +02:00
Stephane Nicoll e5a9defbc5 Upgrade Java 8 version in CI image
Closes gh-26197
2021-04-22 11:07:36 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry
Closes gh-25610
2021-04-21 10:02:57 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson 2dce3abe84 Use main branch when working with Homebrew tap's git repo
Closes gh-26173
2021-04-20 15:51:06 +01:00
Andy Wilkinson 9e5f738f7a Make relative file references in checkstyle.xml more robust
Closes gh-26174
2021-04-20 15:47:08 +01:00
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
2021-04-20 15:12:15 +02:00
wrongwrong 6ee72ff489 Use new update site for Spring Java Format's Eclipse plugin
See gh-26167
2021-04-20 15:11:03 +02:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
2021-04-20 11:15:13 +01:00
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
2021-04-19 17:01:09 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
2021-04-19 16:53:50 +02:00
Stephane Nicoll a1a2f00b65 Upgrade CI to Docker 20.10.6
Closes gh-26118
2021-04-16 09:51:14 +02:00
Spring Buildmaster dea62c1734 Next development version (v2.3.11.BUILD-SNAPSHOT) 2021-04-15 09:52:11 +00:00
Andy Wilkinson 01fb599f6e Revert "Attempt to overcome Docker rate limiting on CI"
This reverts commit 51d57e19d0.

See gh-25838
2021-04-15 10:13:50 +01:00
Andy Wilkinson bfe8e5ac19 Revert changes to make staging run Docker
See gh-26130
2021-04-15 10:11:43 +01:00
Andy Wilkinson 6073cf7063 Marking staging tasks as privileged so they can start Docker
See gh-26130
2021-04-15 09:30:14 +01:00
Andy Wilkinson f74123038a Start Docker before running a staging build
Closes gh-26130
2021-04-15 09:09:15 +01:00
Stephane Nicoll e8eb68a458 Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
2021-04-15 09:01:55 +02:00
Phillip Webb 930c637b77 Merge pull request #25455 from nguyensach
* pr/25455:
  Polish 'Don't detect CloudPlatform when property is set'
  Don't detect CloudPlatform when property is set

Closes gh-25455
2021-04-14 17:41:03 -07:00
Phillip Webb 61ff3c98bf Polish 'Don't detect CloudPlatform when property is set'
See gh-25455
2021-04-14 17:29:30 -07:00
nguyensach 70f44d3a56 Don't detect CloudPlatform when property is set
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.

See gh-25455
2021-04-14 17:24:37 -07:00
Phillip Webb fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
2021-04-14 15:02:42 -07:00
Andy Wilkinson e6130c6ce0 Upgrade to Spring Integration 5.3.7.RELEASE
Closes gh-26112
2021-04-14 17:24:22 +01:00
Stephane Nicoll ab785d9417 Document limitations of using deferred JPA bootstrap
Closes gh-24027
2021-04-14 15:38:34 +02:00
Stephane Nicoll 0fb482579b Harmonize Neo4jContainer startup options
Closes gh-26084
2021-04-14 14:50:04 +02:00
Stephane Nicoll 1de2dd9ecb Upgrade to Spring Data Neumann-SR9
Closes gh-25905
2021-04-14 13:31:16 +02:00
Stephane Nicoll 62a70475c2 Fix class condition on deprecated class
Closes gh-26107
2021-04-14 13:30:20 +02:00
Stephane Nicoll cb2a7dd4cb Upgrade to SAAJ Impl 1.5.3
Closes gh-26099
2021-04-14 08:28:19 +02:00
Stephane Nicoll cb1d7a3bc8 Upgrade to Micrometer 1.5.13
Closes gh-26098
2021-04-14 08:28:18 +02:00
Stephane Nicoll 7c85ebc9c9 Upgrade to Lettuce 5.3.7.RELEASE
Closes gh-26097
2021-04-14 08:28:16 +02:00
Stephane Nicoll 274cfc0af0 Upgrade to HSQLDB 2.5.2
Closes gh-26096
2021-04-14 08:28:14 +02:00
Stephane Nicoll 4a5cb3f29e Upgrade to Glassfish JAXB 2.3.4
Closes gh-26095
2021-04-14 08:28:13 +02:00
Stephane Nicoll caa21b0fbe Upgrade to Flatten Maven Plugin 1.2.7
Closes gh-26094
2021-04-14 08:28:12 +02:00
Phillip Webb 95a92653e1 Merge pull request #26086 from dreis2211
* pr/26086:
  Fix Docker update detection on CI

Closes gh-26086
2021-04-13 21:33:14 -07:00
dreis2211 505e6a1b4c Fix Docker update detection on CI
See gh-26086
2021-04-13 21:28:35 -07:00