Andy Wilkinson
aec4550b02
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39167
2024-01-17 13:00:22 +00:00
Andy Wilkinson
4949ffdebe
Merge pull request #39137 from amparab
...
* gh-39137:
Polish "Improve toString of SslBundle implementations"
Improve toString of SslBundle implementations
Closes gh-39137
2024-01-17 12:57:18 +00:00
Andy Wilkinson
a7d52226d5
Polish "Improve toString of SslBundle implementations"
...
See gh-39137
2024-01-17 11:50:34 +00:00
amparab
b49ccbb0c2
Improve toString of SslBundle implementations
...
See gh-39137
2024-01-17 11:37:18 +00:00
Andy Wilkinson
6a8372509c
Merge branch '3.2.x'
2024-01-17 10:43:11 +00:00
Andy Wilkinson
045bc74aa0
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39165
2024-01-17 10:42:57 +00:00
Andy Wilkinson
f66fd0e9e2
Remove OCI entry as it is no longer maintained
...
Closes gh-39164
2024-01-17 10:42:27 +00:00
Scott Frederick
a7463c02cf
Merge branch '3.2.x'
...
Closes gh-39159
2024-01-16 17:30:41 -06:00
Scott Frederick
90564d722d
Merge branch '3.1.x' into 3.2.x
...
Fixes gh-39158
2024-01-16 17:06:17 -06:00
Scott Frederick
47b1c41dac
Allow server.ssl properties to mix PEM and JKS certificate types
...
Prior to the introduction of SSL bundles, the `server.ssl` properties
allowed PEM and JKS certificate files types to be mixed when
configuring keystores and truststores. This was lost when adapting to
SSL bundles using `WebServerSslBundle`. This commit restores the
previous behavior for back compatibility.
Fixes gh-39105
2024-01-16 16:26:28 -06:00
Phillip Webb
8cdec2daf2
Merge pull request #39145 from
...
* pr/39145:
Remove OCI starter info from README
Closes gh-39145
2024-01-16 12:49:16 -08:00
Olga MaciaszekSharma
072d6dadcb
Remove OCI starter info from README
...
The project has been archived and is no longer maintained.
See gh-39145
2024-01-16 12:48:54 -08:00
Phillip Webb
1c9043e435
Merge branch '3.2.x'
...
Closes gh-39157
2024-01-16 12:46:13 -08:00
Phillip Webb
57f2960c07
Merge pull request #38942 from
...
* pr/38942:
Polish 'Improve reference documentation'
Improve reference documentation
Closes gh-38942
2024-01-16 12:45:54 -08:00
Phillip Webb
ac00a0c28b
Polish 'Improve reference documentation'
...
See gh-38942
2024-01-16 12:45:03 -08:00
Won Joon Thomas Choi
6ed8dc2970
Improve reference documentation
...
Address a series of minor typos and phrasing inconsistencies
identified in few sections of documentation to enhance overall
clarity and readability.
See gh-38942
2024-01-16 12:43:38 -08:00
Phillip Webb
f586d2d6bb
Merge branch '3.2.x'
...
Closes gh-39155
2024-01-16 11:56:48 -08:00
Phillip Webb
837047ab79
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39154
2024-01-16 11:56:37 -08:00
Phillip Webb
b796447fc3
Merge pull request #39107 from
...
* pr/39107:
Polish 'Remove unreachable throw code'
Remove unreachable throw code
Closes gh-39107
2024-01-16 11:54:57 -08:00
Phillip Webb
e23e431f10
Polish 'Remove unreachable throw code'
...
See gh-39107
2024-01-16 11:36:18 -08:00
BenchmarkingBuffalo
a4ae6600ef
Remove unreachable throw code
...
Improve `SpringApplication` by removing the unreachable throw statement
in favor of returning an exception from `handleRunFailure`. This commit
also removes the if statements in favor of dedicated catch blocks.
See gh-39107
2024-01-16 11:35:49 -08:00
Phillip Webb
8b47d8c657
Merge branch '3.2.x'
2024-01-16 11:20:09 -08:00
Phillip Webb
267b7ab248
Polish formatting
2024-01-16 11:20:05 -08:00
Phillip Webb
02b63a3b19
Merge branch '3.2.x'
...
Closes gh-39152
2024-01-16 11:18:55 -08:00
Phillip Webb
a08e4d47af
Merge pull request #39125 from
...
* pr/39125:
Polish 'Use the term "tags" in documentation consistently'
Use the term "tags" in documentation consistently
Closes gh-39125
2024-01-16 11:16:34 -08:00
Phillip Webb
5a38662f5f
Polish 'Use the term "tags" in documentation consistently'
...
See gh-39125
2024-01-16 11:16:02 -08:00
Wzy19930507
3274205709
Use the term "tags" in documentation consistently
...
See gh-39125
2024-01-16 11:15:42 -08:00
Phillip Webb
3c6dff7c36
Merge branch '3.2.x'
2024-01-16 10:49:30 -08:00
Phillip Webb
88a8550609
Make OTEL tstcontainers integration test more resilient
...
Tweak awaitility assertions to fix timing error that often occurs on
local builds.
2024-01-16 10:49:25 -08:00
Phillip Webb
90ce0f01bd
Merge branch '3.2.x'
...
Closes gh-39151
2024-01-16 10:49:18 -08:00
Phillip Webb
89874d351a
Ensure containers are started before binding datasource properties
...
Update `TestcontainersLifecycleBeanPostProcessor` so that containers
are now initialized either on the first `postProcessAfterInitialization`
call with a frozen configuration or just before a test container
property is supplied.
Prior to this commit, it was assumed that the first post-process call
after the configuration was frozen was suitably early to initialize
the containers. This turns out to not be no always the case.
Specifically, in the `finishBeanFactoryInitialization` method of
`AbstractApplicationContext` we see that `LoadTimeWeaverAware` beans
are obtained before the configuration is frozen. One such bean is
`DefaultPersistenceUnitManager` which is likely to need datasource
properties that will require a started container.
To fix the problem, the `TestcontainersPropertySource` now publishes
a `BeforeTestcontainersPropertySuppliedEvent` to the ApplicationContext
just before any value is supplied. By listening for this event, we can
ensure that containers are initialized and started before any dynamic
property is read.
Fixes gh-38913
2024-01-16 10:36:54 -08:00
Andy Wilkinson
22b7525ccd
Merge branch '3.2.x'
...
Closes gh-39150
2024-01-16 16:07:53 +00:00
Andy Wilkinson
f59fa2e3f7
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39149
2024-01-16 16:07:37 +00:00
Andy Wilkinson
dee709e5ba
Merge pull request #39114 from tobias-lippert
...
* gh-39114:
Polish "Update links to Micrometer reference docs"
Update links to Micrometer reference docs
Closes gh-39114
2024-01-16 16:05:46 +00:00
Andy Wilkinson
ea727f056a
Polish "Update links to Micrometer reference docs"
...
See gh-39114
2024-01-16 16:05:09 +00:00
Brian Clozel
50c89ff803
Upgrade to MySQL 8.3.0
...
Closes gh-39147
2024-01-16 16:55:17 +01:00
Tobias Lippert
6c5fea7341
Update links to Micrometer reference docs
...
See gh-39114
2024-01-16 15:51:08 +00:00
Andy Wilkinson
b54567f5f3
Upgrade to Spring Authorization Server 1.3.0-M1
...
Closes gh-38987
2024-01-16 15:40:41 +00:00
Brian Clozel
4b01023967
Merge branch '3.2.x'
2024-01-16 16:33:51 +01:00
Brian Clozel
00f69c4ee8
Upgrade to MySQL 8.3.0
...
Closes gh-39081
2024-01-16 16:33:29 +01:00
Brian Clozel
7e39f7f505
Merge branch '3.2.x'
...
Closes gh-39146
2024-01-16 16:32:40 +01:00
Brian Clozel
de2aee9816
Upgrade to MariaDB 3.3.2
...
Closes gh-38901
2024-01-16 16:31:19 +01:00
Andy Wilkinson
18c083d619
Upgrade to Spring Session 3.3.0-M1
...
Closes gh-38991
2024-01-16 13:44:15 +00:00
Andy Wilkinson
c48ff13cee
Upgrade to Spring Pulsar 1.0.2
...
Closes gh-38995
2024-01-16 13:03:25 +00:00
Andy Wilkinson
9b87cf56bd
Merge branch '3.2.x'
2024-01-16 13:03:00 +00:00
Andy Wilkinson
a575807078
Upgrade to Spring Pulsar 1.0.2
...
Closes gh-38994
2024-01-16 13:02:46 +00:00
Andy Wilkinson
dacf20533e
Merge branch '3.2.x'
...
Closes gh-39143
2024-01-16 12:23:57 +00:00
Andy Wilkinson
75fa963f72
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39142
2024-01-16 12:23:43 +00:00
Andy Wilkinson
38f078fc9d
Upgrade Gradle Enterprise Plugins
...
Closes gh-39141
2024-01-16 12:23:08 +00:00
Andy Wilkinson
4fa47aa501
Merge branch '3.2.x'
...
Closes gh-39140
2024-01-15 19:45:38 +00:00