Skip to content

Commit 5a914f6

Browse files
yuxiqianyuxiqian
committed
[ci] Bump TestContainers version to 2.x to resolve testcontainers/testcontainers-java#11212 
1 parent 2f59f35 commit 5a914f6

File tree

36 files changed

+249
-48
lines changed

36 files changed

+249
-48
lines changed

‎flink-cdc-composer/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ limitations under the License.
5555
<artifactId>flink-test-utils</artifactId>
5656
<version>${flink.version}</version>
5757
<scope>test</scope>
58+
<exclusions>
59+
<exclusion>
60+
<artifactId>testcontainers</artifactId>
61+
<groupId>org.testcontainers</groupId>
62+
</exclusion>
63+
</exclusions>
5864
</dependency>
5965
<dependency>
6066
<groupId>org.apache.flink</groupId>

‎flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@
5252
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
5353
import org.apache.flink.test.junit5.MiniClusterExtension;
5454

55+
import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
56+
5557
import org.junit.jupiter.api.AfterEach;
5658
import org.junit.jupiter.api.BeforeEach;
5759
import org.junit.jupiter.api.extension.RegisterExtension;
5860
import org.junit.jupiter.params.ParameterizedTest;
5961
import org.junit.jupiter.params.provider.EnumSource;
60-
import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
6162

6263
import java.io.ByteArrayOutputStream;
6364
import java.io.PrintStream;

‎flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerLenientITCase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@
4646
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
4747
import org.apache.flink.test.junit5.MiniClusterExtension;
4848

49+
import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
50+
4951
import org.junit.jupiter.api.AfterEach;
5052
import org.junit.jupiter.api.BeforeEach;
5153
import org.junit.jupiter.api.Test;
5254
import org.junit.jupiter.api.extension.RegisterExtension;
5355
import org.junit.jupiter.params.ParameterizedTest;
5456
import org.junit.jupiter.params.provider.EnumSource;
55-
import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
5657

5758
import java.io.ByteArrayOutputStream;
5859
import java.io.PrintStream;

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ limitations under the License.
6767

6868
<dependency>
6969
<groupId>org.testcontainers</groupId>
70-
<artifactId>junit-jupiter</artifactId>
70+
<artifactId>testcontainers-junit-jupiter</artifactId>
7171
<version>${testcontainers.version}</version>
7272
<scope>test</scope>
7373
</dependency>
@@ -83,6 +83,12 @@ limitations under the License.
8383
<artifactId>flink-test-utils</artifactId>
8484
<version>${flink.version}</version>
8585
<scope>test</scope>
86+
<exclusions>
87+
<exclusion>
88+
<artifactId>testcontainers</artifactId>
89+
<groupId>org.testcontainers</groupId>
90+
</exclusion>
91+
</exclusions>
8692
</dependency>
8793
<dependency>
8894
<groupId>org.slf4j</groupId>
@@ -92,7 +98,7 @@ limitations under the License.
9298
</dependency>
9399
<dependency>
94100
<groupId>org.testcontainers</groupId>
95-
<artifactId>jdbc</artifactId>
101+
<artifactId>testcontainers-jdbc</artifactId>
96102
<version>${testcontainers.version}</version>
97103
<scope>test</scope>
98104
</dependency>

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,24 @@ limitations under the License.
5858
<artifactId>flink-test-utils</artifactId>
5959
<version>${flink.version}</version>
6060
<scope>test</scope>
61+
<exclusions>
62+
<exclusion>
63+
<artifactId>testcontainers</artifactId>
64+
<groupId>org.testcontainers</groupId>
65+
</exclusion>
66+
</exclusions>
6167
</dependency>
6268
<dependency>
6369
<groupId>org.apache.flink</groupId>
6470
<artifactId>flink-connector-test-utils</artifactId>
6571
<version>${flink.version}</version>
6672
<scope>test</scope>
73+
<exclusions>
74+
<exclusion>
75+
<artifactId>testcontainers</artifactId>
76+
<groupId>org.testcontainers</groupId>
77+
</exclusion>
78+
</exclusions>
6779
</dependency>
6880

6981
<!-- Jackson Databind -->
@@ -76,13 +88,13 @@ limitations under the License.
7688
<!-- Testcontainers -->
7789
<dependency>
7890
<groupId>org.testcontainers</groupId>
79-
<artifactId>junit-jupiter</artifactId>
91+
<artifactId>testcontainers-junit-jupiter</artifactId>
8092
<version>${testcontainers.version}</version>
8193
<scope>test</scope>
8294
</dependency>
8395
<dependency>
8496
<groupId>org.testcontainers</groupId>
85-
<artifactId>elasticsearch</artifactId>
97+
<artifactId>testcontainers-elasticsearch</artifactId>
8698
<version>${testcontainers.version}</version>
8799
<scope>test</scope>
88100
</dependency>

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-fluss/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ limitations under the License.
5757
<artifactId>flink-test-utils</artifactId>
5858
<version>${flink.version}</version>
5959
<scope>test</scope>
60+
<exclusions>
61+
<exclusion>
62+
<artifactId>testcontainers</artifactId>
63+
<groupId>org.testcontainers</groupId>
64+
</exclusion>
65+
</exclusions>
6066
</dependency>
6167

6268
<dependency>

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-iceberg/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ limitations under the License.
5656
<artifactId>junit-vintage-engine</artifactId>
5757
<groupId>org.junit.vintage</groupId>
5858
</exclusion>
59+
<exclusion>
60+
<artifactId>testcontainers</artifactId>
61+
<groupId>org.testcontainers</groupId>
62+
</exclusion>
5963
</exclusions>
6064
</dependency>
6165

@@ -67,7 +71,7 @@ limitations under the License.
6771
</dependency>
6872
<dependency>
6973
<groupId>org.testcontainers</groupId>
70-
<artifactId>junit-jupiter</artifactId>
74+
<artifactId>testcontainers-junit-jupiter</artifactId>
7175
<version>${testcontainers.version}</version>
7276
<scope>test</scope>
7377
</dependency>

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ limitations under the License.
6464

6565
<dependency>
6666
<groupId>org.testcontainers</groupId>
67-
<artifactId>kafka</artifactId>
67+
<artifactId>testcontainers-kafka</artifactId>
6868
<version>${testcontainers.version}</version>
6969
<scope>test</scope>
7070
</dependency>
@@ -74,6 +74,12 @@ limitations under the License.
7474
<artifactId>flink-test-utils</artifactId>
7575
<version>${flink.version}</version>
7676
<scope>test</scope>
77+
<exclusions>
78+
<exclusion>
79+
<artifactId>testcontainers</artifactId>
80+
<groupId>org.testcontainers</groupId>
81+
</exclusion>
82+
</exclusions>
7783
</dependency>
7884

7985
<dependency>

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ limitations under the License.
7878
<dependency>
7979
<groupId>org.testcontainers</groupId>
8080
<artifactId>testcontainers</artifactId>
81-
<version>1.19.8</version>
81+
<version>${testcontainers.version}</version>
8282
<scope>test</scope>
8383
</dependency>
8484
</dependencies>

‎flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/pom.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,25 @@ limitations under the License.
9494
<artifactId>flink-test-utils</artifactId>
9595
<version>${flink.version}</version>
9696
<scope>test</scope>
97+
<exclusions>
98+
<exclusion>
99+
<artifactId>testcontainers</artifactId>
100+
<groupId>org.testcontainers</groupId>
101+
</exclusion>
102+
</exclusions>
97103
</dependency>
98104

99105
<dependency>
100106
<groupId>org.apache.flink</groupId>
101107
<artifactId>flink-connector-test-utils</artifactId>
102108
<version>${flink.version}</version>
103109
<scope>test</scope>
110+
<exclusions>
111+
<exclusion>
112+
<groupId>org.testcontainers</groupId>
113+
<artifactId>testcontainers</artifactId>
114+
</exclusion>
115+
</exclusions>
104116
</dependency>
105117

106118
<dependency>
@@ -147,7 +159,7 @@ limitations under the License.
147159

148160
<dependency>
149161
<groupId>org.testcontainers</groupId>
150-
<artifactId>mysql</artifactId>
162+
<artifactId>testcontainers-mysql</artifactId>
151163
<version>${testcontainers.version}</version>
152164
<scope>test</scope>
153165
</dependency>

0 commit comments

Comments
 (0)