From ec811363b08e727f4bffa6f40d40ec3260aa9cec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:22:03 +0000 Subject: [PATCH 1/6] build(deps): bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.3.5 to 3.4.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- testcontainers-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-spring-boot-parent/pom.xml b/testcontainers-spring-boot-parent/pom.xml index 91ef77dff..ca6e41c9a 100644 --- a/testcontainers-spring-boot-parent/pom.xml +++ b/testcontainers-spring-boot-parent/pom.xml @@ -16,7 +16,7 @@ 1.20.4 - 3.3.5 + 3.4.0 2023.0.4 5.9.0 3.18 From 294d42e56777a579c330896b12d4aaefc572d97e Mon Sep 17 00:00:00 2001 From: Oleksandr Date: Mon, 9 Dec 2024 19:24:41 +0100 Subject: [PATCH 2/6] spring-cloud-dependencies from 2023.0.4 to 2024.0.0 --- testcontainers-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-spring-boot-parent/pom.xml b/testcontainers-spring-boot-parent/pom.xml index ca6e41c9a..3e1ed56d2 100644 --- a/testcontainers-spring-boot-parent/pom.xml +++ b/testcontainers-spring-boot-parent/pom.xml @@ -17,7 +17,7 @@ 1.20.4 3.4.0 - 2023.0.4 + 2024.0.0 5.9.0 3.18 5.11.4 From a0700cc062fdb029bbba1cf61a24d49153ef7e04 Mon Sep 17 00:00:00 2001 From: admitrov Date: Mon, 30 Dec 2024 13:34:26 +0000 Subject: [PATCH 3/6] Fix error message assert --- .../common/utils/MountVolumesTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testcontainers-common/src/test/java/com/playtika/testcontainer/common/utils/MountVolumesTest.java b/testcontainers-common/src/test/java/com/playtika/testcontainer/common/utils/MountVolumesTest.java index 07cf0155c..91cbdd3ec 100644 --- a/testcontainers-common/src/test/java/com/playtika/testcontainer/common/utils/MountVolumesTest.java +++ b/testcontainers-common/src/test/java/com/playtika/testcontainer/common/utils/MountVolumesTest.java @@ -37,7 +37,7 @@ void noConfigurationEqualsEmptyList() { assertThat(it).hasSingleBean(CommonContainerProperties.class); CommonContainerProperties properties = it.getBean(CommonContainerProperties.class); assertThat(properties).isNotNull(); - assertThat(properties.getMountVolumes()).hasSize(0); + assertThat(properties.getMountVolumes()).isEmpty(); }); } @@ -71,7 +71,7 @@ void wrongModeFailsAtStartup() { .run(it -> { assertThat(it).hasFailed(); assertThat(it).getFailure().hasCauseExactlyInstanceOf(BindException.class); - assertThat(it).getFailure().getCause() + assertThat(it).getFailure().cause() .hasMessage("Failed to bind properties under 'embedded.postgresql.mount-volumes[0].mode' to org.testcontainers.containers.BindMode"); }); } @@ -82,8 +82,8 @@ void nullContainerPathFailsAtStartup() { .run(it -> { assertThat(it).hasFailed(); assertThat(it).getFailure().hasRootCauseExactlyInstanceOf(BindValidationException.class); - assertThat(it).getFailure().getRootCause() - .hasMessageContaining("on field 'containerPath': rejected value [null];"); + assertThat(it).getFailure().rootCause() + .hasMessageContaining("on field 'mountVolumes[0].containerPath': rejected value [null];"); }); } @@ -94,7 +94,7 @@ void emptyContainerPathFailsAtStartup() { .run(it -> { assertThat(it).hasFailed(); assertThat(it).getFailure().hasRootCauseExactlyInstanceOf(BindValidationException.class) - .getRootCause().hasMessageContaining("on field 'containerPath': rejected value [];"); + .rootCause().hasMessageContaining("on field 'mountVolumes[0].containerPath': rejected value [];"); }); } @@ -104,7 +104,7 @@ void nullHostPathFailsAtStartup() { .run(it -> { assertThat(it).hasFailed(); assertThat(it).getFailure().hasRootCauseExactlyInstanceOf(BindValidationException.class) - .getRootCause().hasMessageContaining("on field 'hostPath': rejected value [null];"); + .rootCause().hasMessageContaining("on field 'mountVolumes[0].hostPath': rejected value [null];"); }); } @@ -115,7 +115,7 @@ void emptyHostPathFailsAtStartup() { .run(it -> { assertThat(it).hasFailed(); assertThat(it).getFailure().hasRootCauseExactlyInstanceOf(BindValidationException.class) - .getRootCause().hasMessageContaining("on field 'hostPath': rejected value [];"); + .rootCause().hasMessageContaining("on field 'mountVolumes[0].hostPath': rejected value [];"); }); } From 3965ee3bde27ca74d6359e82314fe022cd6c5fa0 Mon Sep 17 00:00:00 2001 From: admitrov Date: Mon, 30 Dec 2024 13:46:13 +0000 Subject: [PATCH 4/6] update spring boot to v3.4.1 --- testcontainers-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-spring-boot-parent/pom.xml b/testcontainers-spring-boot-parent/pom.xml index 3e1ed56d2..8fc73edf9 100644 --- a/testcontainers-spring-boot-parent/pom.xml +++ b/testcontainers-spring-boot-parent/pom.xml @@ -16,7 +16,7 @@ 1.20.4 - 3.4.0 + 3.4.1 2024.0.0 5.9.0 3.18 From 4ac2c050e773704bf0409c084c8fa0ee06cb3918 Mon Sep 17 00:00:00 2001 From: admitrov Date: Mon, 30 Dec 2024 15:39:27 +0000 Subject: [PATCH 5/6] build(deps): bump org.opensearch.client:spring-data-opensearch-starter from 1.5.4 to 1.6.0 --- embedded-opensearch/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/embedded-opensearch/pom.xml b/embedded-opensearch/pom.xml index 16b65d032..281623325 100644 --- a/embedded-opensearch/pom.xml +++ b/embedded-opensearch/pom.xml @@ -13,7 +13,7 @@ embedded-opensearch - 1.5.4 + 1.6.0 2.1.2 @@ -48,4 +48,4 @@ - \ No newline at end of file + From 6cf947edf3f03b12369c1dfeeeac4a20326fb0e9 Mon Sep 17 00:00:00 2001 From: admitrov Date: Mon, 30 Dec 2024 21:35:40 +0000 Subject: [PATCH 6/6] reorder modules --- .../testcontainer/opensearch/springdata/SpringDataTest.java | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/embedded-opensearch/src/test/java/com/playtika/testcontainer/opensearch/springdata/SpringDataTest.java b/embedded-opensearch/src/test/java/com/playtika/testcontainer/opensearch/springdata/SpringDataTest.java index 2955525c1..f70dce95d 100644 --- a/embedded-opensearch/src/test/java/com/playtika/testcontainer/opensearch/springdata/SpringDataTest.java +++ b/embedded-opensearch/src/test/java/com/playtika/testcontainer/opensearch/springdata/SpringDataTest.java @@ -34,11 +34,11 @@ public void springDataShouldWork() { String key = "test::1"; String value = "myvalue"; assertThat(documentRepository).isNotNull(); - assertThat(documentRepository.findById(key).isPresent()).isFalse(); + assertThat(documentRepository.findById(key)).isEmpty(); TestDocument testDocument = saveDocument(key, value); - assertThat(documentRepository.findById(key).get()).isEqualTo(testDocument); + assertThat(documentRepository.findById(key)).contains(testDocument); } @Test @@ -50,7 +50,7 @@ public void queryShouldWork() { List resultList = documentRepository.findByTitle(title); - assertThat(resultList.size()).isEqualTo(2); + assertThat(resultList).hasSize(2); } @Test diff --git a/pom.xml b/pom.xml index 87cfec332..4e648af2a 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,6 @@ embedded-minio embedded-google-pubsub embedded-google-storage - embedded-influxdb embedded-vault embedded-oracle-xe embedded-mysql @@ -86,6 +85,7 @@ embedded-mailhog embedded-aerospike-enterprise embedded-spicedb + embedded-influxdb