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
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
f59fa2e3f7
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39149
2024-01-16 16:07:37 +00:00
Andy Wilkinson
ea727f056a
Polish "Update links to Micrometer reference docs"
...
See gh-39114
2024-01-16 16:05:09 +00:00
Tobias Lippert
6c5fea7341
Update links to Micrometer reference docs
...
See gh-39114
2024-01-16 15:51:08 +00:00
Brian Clozel
00f69c4ee8
Upgrade to MySQL 8.3.0
...
Closes gh-39081
2024-01-16 16:33:29 +01:00
Brian Clozel
de2aee9816
Upgrade to MariaDB 3.3.2
...
Closes gh-38901
2024-01-16 16:31:19 +01:00
Andy Wilkinson
a575807078
Upgrade to Spring Pulsar 1.0.2
...
Closes gh-38994
2024-01-16 13:02:46 +00:00
Andy Wilkinson
0f23feffaf
Upgrade to Neo4j Java Driver 5.15.0
...
Closes gh-39136
2024-01-15 15:26:16 +00:00
Andy Wilkinson
d06c1db259
Upgrade to Neo4j Java Driver 5.15.0
...
Closes gh-39135
2024-01-15 15:24:55 +00:00
Andy Wilkinson
c0fedc8f74
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39133
2024-01-15 15:21:31 +00:00
Andy Wilkinson
c8e9a2a32c
Add support to Bomr for aligning dependency versions
...
Closes gh-34114
2024-01-15 15:20:29 +00:00
Brian Clozel
46b7bd2f23
Add configuration property to enable micrometer annotations
...
Prior to this commit, the Micrometer annotations support (`@Timed`,
`@Counted`...) was guarded by the presence of both Micrometer and
AspectJ on the classpath.
This signal is too weak, considering the startup performance impact and
the fact that the AspectJ dependency can be brought transitively in many
cases.
This commit adds a new `micrometer.observations.annotations.enabled`
property that is set to `false` by default to only process the
annotations support when this property is enabled.
Fixes gh-39128
2024-01-15 13:51:15 +01:00
Andy Wilkinson
8bdaae37b0
Upgrade to Spring WS 4.0.10
...
Closes gh-39130
2024-01-15 10:14:54 +00:00
Andy Wilkinson
84bb060312
Upgrade to Spring Data Bom 2023.1.2
...
Closes gh-38981
2024-01-15 10:14:50 +00:00
Andy Wilkinson
5f4d347ea6
Upgrade to Spring WS 4.0.10
...
Closes gh-39129
2024-01-15 10:11:25 +00:00
Andy Wilkinson
abba215498
Upgrade to Spring Data Bom 2023.0.8
...
Closes gh-38977
2024-01-15 10:11:20 +00:00
Andy Wilkinson
145fe15daf
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39122
2024-01-12 17:08:23 +00:00
Andy Wilkinson
3df77c67ec
Fix request mapping of endpoint path-mapped to /
...
Closes gh-35426
2024-01-12 17:07:48 +00:00
Andy Wilkinson
6bfac1f860
Fix handling of nested: UNC paths on Windows
...
Closes gh-38956
2024-01-12 15:53:19 +00:00
Andy Wilkinson
6ec56da919
Ensure that reactive actuator security has an auth manager
...
This is a follow-on from afad358
and ensures that the auto-configured
security for Actuator in a WebFlux app has an authentication manager
to back its use of HTTP basic and form login.
Fixes gh-39069
2024-01-12 13:02:31 +00:00
Andy Wilkinson
a48e2d3539
Fix configuration property conversion for CharSequence inputs
...
Closes gh-39051
2024-01-12 11:09:29 +00:00
Moritz Halbritter
a424ba2055
Restore configuration property for http requests names when using WebFlux
...
Closes gh-39083
2024-01-11 16:28:23 +01:00
Andy Wilkinson
a5d3fb588b
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39103
2024-01-11 13:55:34 +00:00
Andy Wilkinson
31936f036b
Remove FlywayMigrationScriptMissingFailureAnalyzer from spring.factories
...
Closes gh-39102
2024-01-11 13:55:05 +00:00
Andy Wilkinson
fe54801cbe
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39100
2024-01-11 13:45:47 +00:00
Andy Wilkinson
f4ff2e63ff
Document that failure analyzers should use constructor injection
...
Closes gh-39099
2024-01-11 13:45:20 +00:00
Andy Wilkinson
5047048c10
Upgrade to Reactor Bom 2023.0.2
...
Closes gh-38980
2024-01-11 13:23:04 +00:00
Andy Wilkinson
f103586a13
Upgrade to Reactor Bom 2022.0.15
...
Closes gh-38976
2024-01-11 13:17:15 +00:00
Andy Wilkinson
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
Moritz Halbritter
66dc72da46
Polish "Fix Jetty ConnectionLimit configuration"
...
See gh-39052
2024-01-10 10:17:38 +01:00
Onur Kagan Ozcan
7113c10b08
Fix Jetty ConnectionLimit configuration
...
See gh-39052
2024-01-10 10:12:27 +01:00
Moritz Halbritter
793801b9cb
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39078
2024-01-10 09:53:45 +01:00
BenchmarkingBuffalo
56f00c4c21
Move autoStartup property
...
Move the property 'autoStartup' from BaseContainer to AmqpContainer.
See gh-39072
2024-01-10 09:52:28 +01:00
skcskitano
dc8b55c0ef
Fix connection leak in SqlDialectLookup
...
See gh-38924
2024-01-10 09:46:39 +01:00
Moritz Halbritter
748a80c448
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39075
2024-01-10 09:41:41 +01:00
Moritz Halbritter
47e8f6168f
Polish "Fix error mark position for PatternParseException"
...
See gh-38944
2024-01-10 09:21:03 +01:00
Fabrice Bibonne
fccce54d52
Fix error mark position for PatternParseException
...
PatternParseException.toDetailedString() return a String
with a mark to specify the error position in the pattern.
The mark takes place in the second line in the String
returned. Because PatternParseFailureAnalyzer.analyze
appended "Invalid mapping pattern detected:" at the
beginning of the returned String, the mark was not well
positioned.
Now, a "\n" is inserted after "Invalid mapping pattern detected:"
and the mark is well positioned
See gh-38944
2024-01-10 09:14:04 +01:00
Moritz Halbritter
8504b6e0a7
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39073
2024-01-10 09:11:53 +01:00
Christoph Dreis
68b9f0c643
Update copyright year to 2024
...
See gh-38946
2024-01-10 09:11:29 +01:00
Phillip Webb
e5f489f338
Restore manifest support for nested directory jars
...
Update `NestedJarFile` so that the `getManifest()` method returns the
manifest from the parent jar file for nested jars based on directory
entries.
This restores the previous behavior supported by Spring Boot 3.1 and
allows class methods such as `getPackage().getImplementationVersion()`
to return non `null` results.
Fixes gh-38996
2024-01-09 12:33:10 -08:00
Andy Wilkinson
bef0ce244e
Upgrade to Micrometer Tracing 1.2.2
...
Closes gh-38979
2024-01-09 12:54:51 +00:00
Andy Wilkinson
1f636adb34
Upgrade to Micrometer 1.12.2
...
Closes gh-38978
2024-01-09 12:54:50 +00:00
Andy Wilkinson
284dc2070c
Upgrade to Micrometer Tracing 1.1.9
...
Closes gh-38975
2024-01-09 12:52:58 +00:00
Andy Wilkinson
c1a147474c
Upgrade to Micrometer 1.11.8
...
Closes gh-38974
2024-01-09 12:52:58 +00:00
Chris Bono
af89c2bb5f
Use Spring Pulsar BOM
...
See gh-38966
2024-01-05 14:55:52 +00:00
Andy Wilkinson
2acb90cbb5
Prohibit upgrades to Jetty Reactive HTTPClient 4.0.2
...
Closes gh-39010
2024-01-05 10:33:23 +00:00
Andy Wilkinson
d94661f91b
Start building against Spring Pulsar 1.0.2 snapshots
...
See gh-38994
2024-01-04 14:16:53 +00:00
Andy Wilkinson
2fb6a2eef4
Consider snapshots when upgrading Spring Pulsar
...
Closes gh-38992
2024-01-04 14:15:35 +00:00
Andy Wilkinson
d7fc9a66b4
Start building against Spring Data Bom 2023.1.2 snapshots
...
See gh-38981
2024-01-04 13:25:40 +00:00
Andy Wilkinson
6b59c01003
Start building against Reactor Bom 2023.0.2 snapshots
...
See gh-38980
2024-01-04 13:25:36 +00:00
Andy Wilkinson
44f5a8bfe9
Start building against Micrometer Tracing 1.2.2 snapshots
...
See gh-38979
2024-01-04 13:25:31 +00:00
Andy Wilkinson
e589606112
Start building against Micrometer 1.12.2 snapshots
...
See gh-38978
2024-01-04 13:25:26 +00:00
Andy Wilkinson
d5d4ec99da
Start building against Spring Data Bom 2023.0.8 snapshots
...
See gh-38977
2024-01-04 12:34:13 +00:00
Andy Wilkinson
905e2a623e
Start building against Reactor Bom 2022.0.15 snapshots
...
See gh-38976
2024-01-04 12:34:09 +00:00
Andy Wilkinson
694b418f59
Start building against Micrometer Tracing 1.1.9 snapshots
...
See gh-38975
2024-01-04 12:34:04 +00:00
Andy Wilkinson
e9f086ff86
Start building against Micrometer 1.11.8 snapshots
...
See gh-38974
2024-01-04 12:33:59 +00:00
Andy Wilkinson
735df3597f
Merge branch '3.1.x'
...
Closes gh-38963
2024-01-03 15:13:27 +00:00
Andy Wilkinson
c10f78ec5a
Improve handling of Throwable from logging system init
...
Closes gh-38885
2024-01-03 15:13:05 +00:00
Andy Wilkinson
00cf1a6d13
Remove unnecessary configuration of idle timeout
...
Fixes gh-38960
2024-01-03 11:37:01 +00:00
Phillip Webb
7216d2b031
Merge branch '3.1.x'
...
Closes gh-38916
2023-12-22 10:43:46 -08:00
Phillip Webb
95a8fa561c
Correctly order @AutoConfigureAfter values when sorting
...
Update `AutoConfigurationSorter` so that `getClassesRequestedAfter()`
results are sorted to match the earlier name/order sorting. Prior to
this commit the order of items added via `@AutoConfigureAfter` was in
an undetermined order which could cause very subtle `@ConditionalOnBean`
bugs.
Thanks very much to Alexandre Baron for their help in diagnosing and
reproducing this issue.
Fixes gh-38904
2023-12-22 08:20:25 -08:00
Phillip Webb
f31ffbf927
Don't duplicate META-INF entries in nested directory jars
...
Update `ZipContent` so that `META-INF` entries are no longer duplicated
in nested jars created from directory entries. This aligns with the
behavior of the classic loader and prevents the same META-INF file from
being discovered twice.
Fixes gh-38862
2023-12-20 17:36:06 -08:00
Phillip Webb
20529ea90c
Drop Netty restriction
2023-12-20 09:54:59 -08:00
Phillip Webb
e754c91f50
Upgrade to Spring WS 4.0.9
...
Closes gh-38892
2023-12-20 09:17:52 -08:00
Phillip Webb
1abc0827f8
Upgrade to Netty 4.1.104.Final
...
Closes gh-38891
2023-12-20 09:17:48 -08:00
Phillip Webb
7dfddce1ac
Upgrade to jOOQ 3.18.8
...
Closes gh-38890
2023-12-20 09:17:42 -08:00
Phillip Webb
c1e8c18124
Upgrade to Jetty 11.0.19
...
Closes gh-38889
2023-12-20 09:17:38 -08:00
Phillip Webb
ff3a2f7e42
Upgrade to Jetty Reactive HTTPClient 3.0.11
...
Closes gh-38888
2023-12-20 09:17:34 -08:00
Phillip Webb
4df87f6224
Upgrade to Hibernate 6.2.17.Final
...
Closes gh-38887
2023-12-20 09:17:29 -08:00
Phillip Webb
15dd37095f
Merge branch '3.1.x'
...
Closes gh-38880
2023-12-19 23:45:42 -08:00
Phillip Webb
b00d5fabe8
Auto-configure Hibernate JPA before DataSource TransactionManager
...
Fixes gh-38861
2023-12-19 23:44:48 -08:00
Phillip Webb
dd27429195
Merge pull request #38776 from SandraAhlgrimm
...
* pr/38776:
Add the LangChain4J to the list of community starters
Closes gh-38776
2023-12-19 23:14:32 -08:00
Sandra Ahlgrimm
b0bc872831
Add the LangChain4J to the list of community starters
...
See gh-38776
2023-12-19 23:14:01 -08:00
Phillip Webb
be1639fe68
Merge branch '3.1.x'
...
Closes gh-38879
2023-12-19 23:12:48 -08:00
meiyese
4370c6e850
Fix typo in endpoint documentation
...
See gh-38823
2023-12-19 23:12:06 -08:00
Phillip Webb
246a0e6f21
Merge branch '3.1.x'
...
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou
8cb8999772
Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
...
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.
See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
8599e5a986
Remove unnecessary `toString()` calls
...
See gh-38739
2023-12-19 22:38:34 -08:00
Yanming Zhou
b6e87cee35
Remove unnecessary `extends Object` from generic
...
See gh-38739
2023-12-19 22:38:19 -08:00
Yanming Zhou
84f7c2dba9
Remove unnecessary `final` modifiers
...
See gh-38739
2023-12-19 22:38:14 -08:00
Yanming Zhou
d3a51e56b7
Remove unnecessary `static` modifiers
...
See gh-38739
2023-12-19 22:38:08 -08:00
Yanming Zhou
ac18e3015c
Use `.isEmpty()` where feasible
...
See gh-38739
2023-12-19 22:38:05 -08:00
Iliès BELDJILALI
e39d1d14ea
Hide application name placeholder when include property is false
...
Update log4j configuration so that an empty value is used when
`LOGGED_APPLICATION_NAME` is missing. Prior to this commit when
`logging.include-application-name` was `false` the logged output
would include the raw `${sys:LOGGED_APPLICATION_NAME}` value.
See gh-38847
2023-12-19 22:08:13 -08:00
Phillip Webb
1b498dea43
Drop Netty restriction
2023-12-19 20:45:10 -08:00
Phillip Webb
67b43baa16
Upgrade to Spring WS 4.0.9
...
Closes gh-38876
2023-12-19 20:38:20 -08:00
Phillip Webb
b6d855fa0b
Upgrade to Spring Pulsar 1.0.1
...
Closes gh-38875
2023-12-19 20:38:15 -08:00
Phillip Webb
32d6949733
Upgrade to Spring Kafka 3.1.1
...
Closes gh-38874
2023-12-19 20:38:11 -08:00
Phillip Webb
21116297f6
Upgrade to Pulsar Reactive 0.5.1
...
Closes gh-38873
2023-12-19 20:38:07 -08:00
Phillip Webb
a04a16a783
Upgrade to Netty 4.1.104.Final
...
Closes gh-38872
2023-12-19 20:38:03 -08:00
Phillip Webb
31bc458a13
Upgrade to Jetty 12.0.5
...
Closes gh-38871
2023-12-19 20:37:58 -08:00
Phillip Webb
cf5dc186f8
Upgrade to Hibernate 6.4.1.Final
...
Closes gh-38870
2023-12-19 20:37:53 -08:00
Brian Clozel
bf21fa8e76
Upgrade to Spring Integration 6.2.1
...
Closes gh-38698
2023-12-19 21:22:27 +01:00
Brian Clozel
76c7fe3f8a
Upgrade to Spring Session 3.2.1
...
Closes gh-38866
2023-12-19 19:11:15 +01:00
Brian Clozel
97f08da638
Upgrade to Spring Authorization Server 1.2.1
...
Closes gh-38696
2023-12-19 19:10:41 +01:00
Brian Clozel
d3af5cce73
Upgrade to Spring Session 3.1.4
...
Closes gh-38683
2023-12-19 18:49:02 +01:00
Brian Clozel
cb019e2957
Upgrade to Spring Authorization Server 1.1.4
...
Closes gh-38678
2023-12-19 18:48:19 +01:00
Brian Clozel
450a0ce8c7
Upgrade to Spring Security 6.1.6
...
Closes gh-38682
2023-12-19 12:30:36 +01:00