Andy Wilkinson
17953eeb33
Merge branch '2.7.x'
...
Closes gh-32544
2022-09-29 11:41:15 +01:00
Andy Wilkinson
84a25c7dcf
Configure Log4j2 classpath overrides consistently
...
Closes gh-32537
2022-09-29 11:25:21 +01:00
Andy Wilkinson
5c057a2730
Auto-configure the new Elasticsearch clients
...
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.
As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.
Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Stephane Nicoll
f52d00d9fa
Merge branch '2.7.x'
...
Closes gh-31779
2022-07-18 11:30:45 +02:00
Johnny Lim
f591c75ad7
Disable incompatible tests on macOS AArch64
...
This commit also updates related test support classes.
See gh-31539
2022-07-18 11:25:52 +02:00
dreis2211
5db04da275
Use pattern matching for instanceof where appropriate
...
See gh-31475
2022-06-20 17:55:36 +01:00
Phillip Webb
657fa3e64e
Merge branch '2.7.x'
...
Closes gh-31409
2022-06-16 15:36:29 -07:00
Phillip Webb
ae6311ddda
Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
...
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.
Fixes gh-19365
2022-06-16 15:35:32 -07:00
Andy Wilkinson
4f3180540c
Use Framework's MockSpringFactoriesLoader
...
Closes gh-31406
2022-06-16 15:40:03 +01:00
Stephane Nicoll
d5695c1931
Add resource hints for configuration properties
...
This commits introduces a RuntimeHintsRegistrar for configuration
properties. By default, it provides the necessary hint to load
application properties and yaml files in default locations.
Closes gh-31311
2022-06-15 10:15:27 +02:00
Andy Wilkinson
003f747e77
Merge branch '2.7.x'
...
Closes gh-31170
2022-05-26 13:52:41 +01:00
Andy Wilkinson
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
Andy Wilkinson
770cb840c3
Use more flexible SpringFactoriesLoader
...
Closes gh-30235
Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-05-09 14:13:04 +01:00
Moritz Halbritter
24a68fc595
Merge branch '2.7.x'
2022-03-07 14:12:19 +01:00
Moritz Halbritter
e980a53399
Merge branch '2.5.x' into 2.6.x
2022-03-07 14:11:11 +01:00
Moritz Halbritter
f3eb90046f
Remove @Repeatable support for @DisabledOnOs
...
We'll add it back again when we need it, and delay the naming issue.
See gh-30082
2022-03-07 14:10:13 +01:00
Moritz Halbritter
74fe5735d9
Polish
2022-03-07 13:28:41 +01:00
Moritz Halbritter
a1b1377733
Merge branch '2.7.x'
2022-03-07 13:23:06 +01:00
Moritz Halbritter
564555347f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter
be38311c5d
Disable incompatible tests on Linux AArch64
...
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
@DisableOnOs annotation. This new annotation supports the architecture
and is repeatable
Closes gh-30082
2022-03-07 13:22:17 +01:00
Andy Wilkinson
fe7b13ec46
Upgrade to Spring Framework 6 and Jakarta EE 9
...
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872
See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson
24ef4e6fb9
Merge branch '2.5.x'
...
Closes gh-28471
2021-10-28 13:07:22 +01:00
Andy Wilkinson
7fbbb4e08a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson
72f80f3ae6
Upgrade to Testcontainers 1.16.1
...
Closes gh-28468
2021-10-28 13:06:41 +01:00
Andy Wilkinson
9514a72d5a
Test using an up-to-date version of Postgres
...
See gh-28296
2021-10-13 11:56:44 +01:00
Andy Wilkinson
533bb24b55
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27525
2021-07-29 17:42:26 +01:00
Andy Wilkinson
ad2d9c0ab1
Customize Cassandra's configuration to reduce container startup time
...
Closes gh-27524
2021-07-29 17:33:56 +01:00
Andy Wilkinson
1a0e008a8c
Prevent Netty tcNative from loading classes with wrong class loader
...
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.
It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.
Closes gh-26749
2021-06-08 11:20:02 +01:00
Stephane Nicoll
75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
Stephane Nicoll
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
dreis2211
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
Stephane Nicoll
e9ed92a305
Polish
2021-06-02 14:14:04 +02:00
Stephane Nicoll
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
dreis2211
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02:00
Stephane Nicoll
ef093bc9c6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26570
2021-05-17 14:24:03 +02:00
Stephane Nicoll
306b6f6999
Configure SessionCookieConfig in MockServletWebServer
...
Closes gh-26479
2021-05-17 14:05:45 +02:00
Stephane Nicoll
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
2021-05-07 09:14:35 +02:00
Sach Nguyen
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
2021-05-07 09:12:43 +02:00
Andy Wilkinson
ecf8437d4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25430
2021-02-25 14:28:28 +00:00
dreis2211
101d88a840
Update Testcontainers image versions
...
See gh-25412
2021-02-25 14:27:41 +00:00
Stephane Nicoll
b6fc0913cf
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll
515b18e142
Merge branch '2.3.x'
...
Closes gh-24108
2020-11-10 17:10:26 +01:00
Stephane Nicoll
9e901b6e07
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll
23ad2b4156
Rationalize Testcontainers image versions
...
This commit rationalizes the Docker image names used in integration
tests.
Closes gh-24107
2020-11-10 16:04:27 +01:00
Stephane Nicoll
45f1133e1e
Merge branch '2.3.x'
2020-11-10 09:49:49 +01:00
Stephane Nicoll
339c8d0a26
Revert "Upgrade to Testcontainers 1.15.0"
2020-11-10 09:47:46 +01:00
Stephane Nicoll
5123eb0c74
Fix deprecation in Testcontainers 1.15.0
...
See gh-24103
2020-11-10 09:39:18 +01:00
Stephane Nicoll
7fb21fbff3
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 08:47:51 +01:00
Stephane Nicoll
c1a1b5fe71
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 08:46:15 +01:00
Johnny Lim
e48af31ced
Polish
...
See gh-23081
2020-08-26 10:47:45 +02:00
dreis2211
c00d5c5643
Introduce @ForkedClassPath for testing unmodified class path
...
See gh-22710
2020-08-12 17:21:31 +01:00
Andy Wilkinson
969dd35e45
Upgrade to Mockito 3.4.6
...
Closes gh-22838
2020-08-10 15:22:03 +01:00
Phillip Webb
8d06b0f368
Merge branch '2.3.x'
2020-08-06 10:15:36 -07:00
Phillip Webb
4924573074
Merge branch '2.2.x' into 2.3.x
2020-08-06 10:15:22 -07:00
Phillip Webb
fdd6a89a61
Polish
2020-08-06 10:14:01 -07:00
Andy Wilkinson
8b3f8a6138
Merge branch '2.3.x'
...
Closes gh-22768
2020-08-06 15:14:16 +01:00
Andy Wilkinson
11d1002f15
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22767
2020-08-06 15:13:55 +01:00
Andy Wilkinson
07699ea6ff
Retry when dependency resolution fails in ModifiedClassPathClassLoader
...
Closes gh-22763
2020-08-06 15:12:20 +01:00
Andy Wilkinson
989fc36528
Polish
2020-08-03 10:51:22 +01:00
Andy Wilkinson
11a296b068
Polish "Fix NPE in BeanDefinitionLoader when XML support is disabled"
...
See gh-22696
2020-08-03 09:54:43 +01:00
dreis2211
507eb9498b
Use Class.getDeclaredConstructor().newInstance()
...
See gh-21913
2020-07-07 11:12:35 +01:00
Andy Wilkinson
96e6b74894
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22243
2020-07-07 09:56:21 +01:00
Andy Wilkinson
a0f1424393
Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
...
See gh-22214
2020-07-07 09:54:52 +01:00
XenoAmess
75a64bd901
Fix unwrapping of captured PrintStream in test support's OutputCapture
...
See gh-22214
2020-07-07 09:53:34 +01:00
Phillip Webb
ad1248e4ec
Replace "folder" with "directory"
...
Consistently use the term "directory" instead of "folder"
Closes gh-21218
2020-04-28 19:20:24 -07:00
Stephane Nicoll
b5e23e7405
Update copyright year of changed files
...
See gh-20020
2020-02-03 17:39:40 +01:00
Johnny Lim
b67ece48e4
Polish
...
See gh-20020
2020-02-03 17:37:01 +01:00
dreis2211
d8e2349e47
Use Supplier variants of Assert
...
See gh-19864
2020-01-28 15:04:11 +01:00
dreis2211
d75de39456
Upgrade to JUnit Jupiter 5.6.0
...
See gh-19907
2020-01-26 08:39:12 +01:00
Stephane Nicoll
e044817fe7
Migrate remaining use of ClassLoader.loadClass to Class.forName
...
Closes gh-19824
2020-01-23 13:15:45 +01:00
Stephane Nicoll
95be419527
Use Class.forName rather than ClassLoader.loadClass
...
This commit changes uses of ClassLoader.loadClass to Class.forName for
consistency with what was initiated in #19342 and better compatibility
with GraalVM.
Closes gh-19824
2020-01-23 10:47:53 +01:00
Phillip Webb
fd792cedaf
Polish DisabledIfDockerUnavailable
...
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
2020-01-16 16:54:43 -08:00
Phillip Webb
862462b791
Update copyright year of changed files
2020-01-13 17:04:19 -08:00
Phillip Webb
f57281340c
Merge branch '2.2.x'
2020-01-13 16:46:49 -08:00
Phillip Webb
3cfbfebbb1
Merge branch '2.1.x' into 2.2.x
2020-01-13 16:45:40 -08:00
Phillip Webb
9bd49562fe
Update copyright year of changed files
2020-01-13 14:09:11 -08:00
Brian Clozel
e0171a5da8
Polish
2020-01-10 22:29:57 +01:00
Andy Wilkinson
b5ae8b0af5
Disable tests that use Docker when Docker is unavailable
...
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson
ce99db1902
Port the build to Gradle
...
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Andy Wilkinson
bdffa860d9
Increase startup timeout for Docker containers
...
Closes gh-19569
2020-01-08 11:39:36 +00:00
Stephane Nicoll
2c1e81adf0
Polish
2019-12-26 10:42:40 +01:00
Phillip Webb
83d4d94e8b
Cache ModifiedClassPathClassLoaders
...
Closes gh-18694
2019-10-22 15:25:31 -07:00
Phillip Webb
8d08d654d1
Merge branch '2.1.x'
...
Closes gh-18693
2019-10-22 15:18:32 -07:00
Andy Wilkinson
29080b87ec
Protect autoconfigure module against slow starting test containers
2019-09-04 10:15:10 +01:00
dreis2211
07b857e57a
Use disabledWithoutDocker option for @Testcontainers
...
See gh-18095
2019-09-03 09:51:53 +02:00
dreis2211
b4350a9d96
Remove unnecessary blank lines
...
See gh-18089
2019-09-03 08:48:10 +02:00
dreis2211
3e35a6616c
Fix duplicated words
...
See gh-18004
2019-09-01 09:09:38 +02:00
thelproad
9c1f503e46
Simplify if statements
...
See gh-17884
2019-08-17 06:50:32 +02:00
Phillip Webb
da4f436140
Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY
...
Fixup references following upstream Spring Framework change.
2019-07-31 15:11:43 +01:00
Phillip Webb
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00
Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Andy Wilkinson
41957ec2ad
Polish "Polish OutputCapture and its JUnit Jupiter extension"
...
See gh-17049
2019-07-18 17:46:56 +01:00
dreis2211
2038fac825
Remove testsupport.assertj package
...
See gh-17557
2019-07-18 14:20:28 +02:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
dreis2211
4ec035977b
Polish testsupport.junit.platform package
...
See gh-17524
2019-07-15 21:35:25 +01:00
Phillip Webb
eff1147ccc
Rename classpath runner package
...
Remove `runner` since we're no longer tied to JUnit 4.
See gh-17491
2019-07-15 13:40:26 +01:00
Phillip Webb
1117fdb2b3
Make ModifiedClassPathExtension package private
...
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.
See gh-17491
2019-07-15 13:38:26 +01:00
Phillip Webb
b6ec1332a0
Polish ModifiedClassPathClassLoader
...
Remove the `ModifiedClassPathClassLoaderFactory` in favor of
factory methods on `ModifiedClassPathClassLoader`.
See gh-17491
2019-07-15 13:37:34 +01:00
Phillip Webb
4fe5e9e31e
Remove direct junit-platform-launcher dependency
...
Replace any direct `junit-platform-launcher` dependencies and instead
rely on the test runner providing it. Launcher related class are not
handled via reflection.
This update allows us to workaround SUREFIRE-1679.
Closes gh-17517
2019-07-15 13:35:08 +01:00