Skip to content

Commit fc19c77

Browse files
davidradldavidradl
committed
HTTP155 cleanup poms and correct weekly flink version
Signed-off-by: davidradl <[email protected]>
1 parent 7d96faa commit fc19c77

File tree

3 files changed

+9
-55
lines changed

3 files changed

+9
-55
lines changed

‎.github/workflows/weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
flink_branches: [{
33-
flink: 2.1-SNAPSHOT,
33+
flink: 1.20-SNAPSHOT,
3434
branch: main
3535
}]
3636
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils

‎flink-connector-http/pom.xml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,6 @@ under the License.
121121
<scope>provided</scope>
122122
</dependency>
123123

124-
<!-- <dependency>-->
125-
<!-- <groupId>org.apache.flink</groupId>-->
126-
<!-- <artifactId>flink-connector-base</artifactId>-->
127-
<!-- <version>${flink.version}</version>-->
128-
<!-- <scope>provided</scope>-->
129-
<!-- </dependency>-->
130-
131124
<dependency>
132125
<groupId>org.apache.flink</groupId>
133126
<artifactId>flink-json</artifactId>
@@ -256,31 +249,6 @@ under the License.
256249
</exclusions>
257250
</dependency>
258251

259-
<!-- <dependency>-->
260-
<!-- <groupId>org.apache.flink</groupId>-->
261-
<!-- <artifactId>flink-table-test-utils</artifactId>-->
262-
<!-- <optional>true</optional>-->
263-
<!-- <exclusions>-->
264-
<!-- <exclusion>-->
265-
<!-- <groupId>org.slf4j</groupId>-->
266-
<!-- <artifactId>slf4j-api</artifactId>-->
267-
<!-- </exclusion>-->
268-
<!-- <exclusion>-->
269-
<!-- <groupId>com.google.code.findbugs</groupId>-->
270-
<!-- <artifactId>jsr305</artifactId>-->
271-
<!-- </exclusion>-->
272-
<!-- <exclusion>-->
273-
<!-- <groupId>org.junit.jupiter</groupId>-->
274-
<!-- <artifactId>junit-jupiter-api</artifactId>-->
275-
<!-- </exclusion>-->
276-
<!-- <exclusion>-->
277-
<!-- <groupId>org.xerial.snappy</groupId>-->
278-
<!-- <artifactId>snappy-java</artifactId>-->
279-
<!-- </exclusion>-->
280-
<!-- </exclusions>-->
281-
<!-- <scope>test</scope>-->
282-
<!-- </dependency>-->
283-
284252
<dependency>
285253
<groupId>org.assertj</groupId>
286254
<artifactId>assertj-core</artifactId>
@@ -335,13 +303,6 @@ under the License.
335303
</exclusions>
336304
</dependency>
337305

338-
<!-- <dependency>-->
339-
<!-- <groupId>org.apache.flink</groupId>-->
340-
<!-- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>-->
341-
<!-- <type>test-jar</type>-->
342-
<!-- <scope>test</scope>-->
343-
<!-- </dependency>-->
344-
345306
<dependency>
346307
<groupId>net.minidev</groupId>
347308
<artifactId>json-smart</artifactId>

‎pom.xml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,11 @@ under the License.
9494
<mockito.version>4.6.1</mockito.version>
9595
<mockito-inline.version>4.6.1</mockito-inline.version>
9696
<wiremock.version>2.27.2</wiremock.version>
97-
<!-- <wiremock.version>3.0.1</wiremock.version>-->
9897
<maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
9998
<resilence4j.version>1.7.1</resilence4j.version>
10099
<japicmp.skip>false</japicmp.skip>
101100
<japicmp.referenceVersion>1.17.0</japicmp.referenceVersion>
102-
<!-- to match flinks level -->
101+
<!-- to match flink's level -->
103102
<slf4j.version>1.7.36</slf4j.version>
104103
<!-- can be removed with maven-spotless-plugin:2.38+ -->
105104
<spotless.skip>false</spotless.skip>
@@ -139,7 +138,7 @@ under the License.
139138
<artifactId>flink-java</artifactId>
140139
<version>${flink.version}</version>
141140
<exclusions>
142-
<!--exlusion required to pass convergence check in CI -->
141+
<!--exclusion required to pass convergence check in CI -->
143142
<exclusion>
144143
<groupId>com.esotericsoftware.kryo</groupId>
145144
<artifactId>kryo</artifactId>
@@ -186,6 +185,7 @@ under the License.
186185
<groupId>org.apache.flink</groupId>
187186
<artifactId>flink-core</artifactId>
188187
<version>${flink.version}</version>
188+
<!--exclusion required to pass convergence check in CI -->
189189
<exclusions>
190190
<exclusion>
191191
<groupId>org.apache.commons</groupId>
@@ -281,6 +281,7 @@ under the License.
281281
<dependency>
282282
<groupId>io.github.resilience4j</groupId>
283283
<artifactId>resilience4j-retry</artifactId>
284+
<!--exclusions required to pass convergence check in CI -->
284285
<exclusions>
285286
<exclusion>
286287
<groupId>org.slf4j</groupId>
@@ -333,6 +334,7 @@ under the License.
333334
<groupId>org.apache.flink</groupId>
334335
<artifactId>flink-test-utils-junit</artifactId>
335336
<version>${flink.version}</version>
337+
<!--exclusions required to pass convergence check in CI -->
336338
<exclusions>
337339
<exclusion>
338340
<groupId>com.fasterxml.jackson.core</groupId>
@@ -360,16 +362,6 @@ under the License.
360362
<scope>provided</scope>
361363
</dependency>
362364

363-
<!-- For dependency convergence
364-
<dependency>
365-
<groupId>org.junit</groupId>
366-
<artifactId>junit-bom</artifactId>
367-
<version>${junit5.version}</version>
368-
<type>pom</type>
369-
<scope>test</scope>
370-
</dependency>
371-
-->
372-
373365
<dependency>
374366
<groupId>org.assertj</groupId>
375367
<artifactId>assertj-core</artifactId>
@@ -380,6 +372,7 @@ under the License.
380372
<groupId>org.mockito</groupId>
381373
<artifactId>mockito-junit-jupiter</artifactId>
382374
<version>${mockito.version}</version>
375+
<!--exclusion required to pass convergence check in CI -->
383376
<exclusions>
384377
<exclusion>
385378
<groupId>org.junit.jupiter</groupId>
@@ -392,6 +385,7 @@ under the License.
392385
<groupId>org.mockito</groupId>
393386
<artifactId>mockito-core</artifactId>
394387
<version>${mockito.version}</version>
388+
<!--exclusion required to pass convergence check in CI -->
395389
<exclusions>
396390
<exclusion>
397391
<groupId>org.objenesis</groupId>
@@ -434,7 +428,7 @@ under the License.
434428
<groupId>com.github.tomakehurst</groupId>
435429
<artifactId>wiremock</artifactId>
436430
<version>${wiremock.version}</version>
437-
<!-- excluding for convergance reasons -->
431+
<!--exclusion required to pass convergence check in CI -->
438432
<exclusions>
439433
<exclusion>
440434
<groupId>com.google.guava</groupId>
@@ -587,7 +581,6 @@ under the License.
587581
<ignoreAllNonTestScoped>true</ignoreAllNonTestScoped>
588582
<ignoredDependencies>
589583
<!--These dependencies are required for the unit tests to succeed -->
590-
<!-- <ignoredDependency>org.apache.flink:flink-table-test-utils:jar:1.20.0</ignoredDependency>-->
591584
<ignoredDependency>org.mockito:mockito-inline:jar:4.6.1</ignoredDependency>
592585
</ignoredDependencies>
593586
</configuration>

0 commit comments

Comments
 (0)