You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sn...@apache.org on 2023/06/20 08:16:47 UTC
[flink-connector-elasticsearch] branch main updated: [FLINK-28347][Test infrastructure] Upgrade testcontainers to 1.18.3 (#71)
This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push:
new 7798196 [FLINK-28347][Test infrastructure] Upgrade testcontainers to 1.18.3 (#71)
7798196 is described below
commit 7798196cc460622211751f0ca9ed9ea8046b8622
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Tue Jun 20 10:16:41 2023 +0200
[FLINK-28347][Test infrastructure] Upgrade testcontainers to 1.18.3 (#71)
---------
Co-authored-by: Martijn Visser <ma...@apache.org>
Co-authored-by: Martijn Visser <mv...@confluent.io>
---
flink-connector-elasticsearch-e2e-tests/pom.xml | 13 +++++++++++++
pom.xml | 10 +++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/flink-connector-elasticsearch-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/pom.xml
index 1114edc..caf292f 100644
--- a/flink-connector-elasticsearch-e2e-tests/pom.xml
+++ b/flink-connector-elasticsearch-e2e-tests/pom.xml
@@ -39,6 +39,19 @@ under the License.
<module>flink-connector-elasticsearch7-e2e-tests</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <!-- We pick the version of net.java.dev.jna:jna to satisfy dependency
+ convergence for org.testcontainers:testcontainers which transitively depends on
+ two different versions.-->
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.12.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
<id>run-end-to-end-tests</id>
diff --git a/pom.xml b/pom.xml
index 57bb1e9..d322718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,8 @@ under the License.
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.9.1</junit5.version>
<assertj.version>3.23.1</assertj.version>
- <testcontainers.version>1.17.2</testcontainers.version>
+ <!-- keep net.java.dev.jna:jna in sync with the one from testcontainers -->
+ <testcontainers.version>1.18.3</testcontainers.version>
<mockito.version>3.4.6</mockito.version>
<japicmp.skip>false</japicmp.skip>
@@ -316,6 +317,13 @@ under the License.
</dependency>
<!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.22</version>
+ </dependency>
+
+ <!-- For dependency convergence -->
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>