Skip to content

Commit a323f84

Browse files
davidradldavidradl
committed
HTTP155 improved pom files
Signed-off-by: davidradl <[email protected]>
1 parent 79cb549 commit a323f84

File tree

3 files changed

+311
-153
lines changed

3 files changed

+311
-153
lines changed

‎flink-connector-http/pom.xml‎

Lines changed: 97 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -82,29 +82,31 @@ under the License.
8282
<dependency>
8383
<groupId>org.apache.flink</groupId>
8484
<artifactId>flink-java</artifactId>
85-
<version>${flink.version}</version>
8685
<scope>provided</scope>
8786
</dependency>
8887

8988
<dependency>
9089
<groupId>org.apache.flink</groupId>
9190
<artifactId>flink-annotations</artifactId>
92-
<version>${flink.version}</version>
9391
<scope>provided</scope>
9492
</dependency>
9593

9694
<dependency>
9795
<groupId>org.apache.flink</groupId>
9896
<artifactId>flink-metrics-core</artifactId>
99-
<version>${flink.version}</version>
10097
<scope>provided</scope>
10198
</dependency>
10299

103100
<dependency>
104101
<groupId>org.apache.flink</groupId>
105102
<artifactId>flink-core</artifactId>
106-
<version>${flink.version}</version>
107103
<scope>provided</scope>
104+
<exclusions>
105+
<exclusion>
106+
<groupId>org.apache.flink</groupId>
107+
<artifactId>flink-shaded-jackson</artifactId>
108+
</exclusion>
109+
</exclusions>
108110
</dependency>
109111

110112
<dependency>
@@ -116,28 +118,25 @@ under the License.
116118
<dependency>
117119
<groupId>org.apache.flink</groupId>
118120
<artifactId>flink-table-runtime</artifactId>
119-
<version>${flink.version}</version>
120121
<scope>provided</scope>
121122
</dependency>
122123

123-
<dependency>
124-
<groupId>org.apache.flink</groupId>
125-
<artifactId>flink-connector-base</artifactId>
126-
<version>${flink.version}</version>
127-
<scope>provided</scope>
128-
</dependency>
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>-->
129130

130131
<dependency>
131132
<groupId>org.apache.flink</groupId>
132133
<artifactId>flink-json</artifactId>
133-
<version>${flink.version}</version>
134134
<scope>provided</scope>
135135
</dependency>
136136

137137
<dependency>
138138
<groupId>org.apache.flink</groupId>
139139
<artifactId>flink-core-api</artifactId>
140-
<version>${flink.version}</version>
141140
<scope>provided</scope>
142141
</dependency>
143142

@@ -154,21 +153,20 @@ under the License.
154153
<dependency>
155154
<groupId>org.apache.flink</groupId>
156155
<artifactId>flink-table-api-java-bridge</artifactId>
157-
<version>${flink.version}</version>
158156
<scope>provided</scope>
159157
<optional>true</optional>
160158
</dependency>
159+
161160
<dependency>
162161
<groupId>org.apache.flink</groupId>
163162
<artifactId>flink-table-api-java</artifactId>
164-
<version>${flink.version}</version>
165163
<scope>provided</scope>
166164
<optional>true</optional>
167165
</dependency>
166+
168167
<dependency>
169168
<groupId>org.apache.flink</groupId>
170169
<artifactId>flink-table-common</artifactId>
171-
<version>${flink.version}</version>
172170
<scope>provided</scope>
173171
<optional>true</optional>
174172
</dependency>
@@ -206,55 +204,82 @@ under the License.
206204
<version>${resilence4j.version}</version>
207205
</dependency>
208206

209-
<!--TEST-->
207+
<!--http table factory testing -->
208+
<dependency>
209+
<groupId>org.apache.flink</groupId>
210+
<artifactId>flink-connector-base</artifactId>
211+
<scope>provided</scope>
212+
</dependency>
210213

211214
<dependency>
212215
<groupId>org.apache.flink</groupId>
213-
<artifactId>flink-table-common</artifactId>
214-
<version>${flink.version}</version>
216+
<artifactId>flink-connector-base</artifactId>
215217
<type>test-jar</type>
216218
<scope>test</scope>
217219
</dependency>
218220

219221
<dependency>
220222
<groupId>org.apache.flink</groupId>
221-
<artifactId>flink-connector-base</artifactId>
222-
<version>${flink.version}</version>
223-
<type>test-jar</type>
223+
<artifactId>flink-clients</artifactId>
224+
<exclusions>
225+
<exclusion>
226+
<groupId>org.apache.flink</groupId>
227+
<artifactId>flink-shaded-jackson</artifactId>
228+
</exclusion>
229+
</exclusions>
224230
<scope>test</scope>
225231
</dependency>
226232

227233
<dependency>
228234
<groupId>org.apache.flink</groupId>
229-
<artifactId>flink-table-test-utils</artifactId>
230-
<version>${flink.version}</version>
235+
<artifactId>flink-table-common</artifactId>
236+
<type>test-jar</type>
231237
<scope>test</scope>
232238
</dependency>
233239

234240
<!-- brings in junit 5.10.1 which mismatches our junit so we need to exclude it-->
235241
<dependency>
236242
<groupId>org.apache.flink</groupId>
237243
<artifactId>flink-test-utils-junit</artifactId>
238-
<version>${flink.version}</version>
239244
<scope>test</scope>
240245
</dependency>
241246

242247
<dependency>
243248
<groupId>org.apache.flink</groupId>
244249
<artifactId>flink-streaming-java</artifactId>
245-
<version>${flink.version}</version>
246250
<scope>provided</scope>
247-
</dependency>
248-
249-
<!-- For dependency convergence
250-
<dependency>
251-
<groupId>org.junit</groupId>
252-
<artifactId>junit-bom</artifactId>
253-
<version>${junit5.version}</version>
254-
<type>pom</type>
255-
<scope>test</scope>
256-
</dependency>
257-
-->
251+
<exclusions>
252+
<exclusion>
253+
<groupId>org.apache.flink</groupId>
254+
<artifactId>flink-shaded-jackson</artifactId>
255+
</exclusion>
256+
</exclusions>
257+
</dependency>
258+
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>-->
258283

259284
<dependency>
260285
<groupId>org.assertj</groupId>
@@ -298,6 +323,25 @@ under the License.
298323
<scope>test</scope>
299324
</dependency>
300325

326+
<dependency>
327+
<groupId>org.apache.flink</groupId>
328+
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
329+
<scope>test</scope>
330+
<exclusions>
331+
<exclusion>
332+
<groupId>-org.scala-lang</groupId>
333+
<artifactId>scala-library</artifactId>
334+
</exclusion>
335+
</exclusions>
336+
</dependency>
337+
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+
301345
<dependency>
302346
<groupId>net.minidev</groupId>
303347
<artifactId>json-smart</artifactId>
@@ -311,23 +355,17 @@ under the License.
311355
<version>${wiremock.version}</version>
312356
<scope>test</scope>
313357
</dependency>
358+
359+
<dependency>
360+
<groupId> com.google.guava</groupId>
361+
<artifactId>guava</artifactId>
362+
<version>27.0-jre</version>
363+
<scope>test</scope>
364+
</dependency>
314365
</dependencies>
315366

316367
<build>
317368
<plugins>
318-
<plugin>
319-
<groupId>org.codehaus.mojo</groupId>
320-
<artifactId>exec-maven-plugin</artifactId>
321-
<inherited>false</inherited>
322-
<dependencies>
323-
<dependency>
324-
<groupId>org.apache.flink</groupId>
325-
<artifactId>flink-ci-tools</artifactId>
326-
<version>${flink.version}</version>
327-
</dependency>
328-
</dependencies>
329-
</plugin>
330-
331369
<plugin>
332370
<groupId>org.apache.maven.plugins</groupId>
333371
<artifactId>maven-surefire-plugin</artifactId>
@@ -408,13 +446,6 @@ under the License.
408446
<groupId>org.apache.maven.plugins</groupId>
409447
<artifactId>maven-shade-plugin</artifactId>
410448
</plugin>
411-
<!--
412-
TODO this is causes failure Cannot find directory for project: org.apache.flink:null
413-
<plugin>
414-
<groupId>org.commonjava.maven.plugins</groupId>
415-
<artifactId>directory-maven-plugin</artifactId>
416-
</plugin>
417-
-->
418449

419450
<plugin>
420451
<groupId>org.apache.maven.plugins</groupId>
@@ -432,8 +463,12 @@ under the License.
432463
<ignoreAllNonTestScoped>true</ignoreAllNonTestScoped>
433464
<ignoredDependencies>
434465
<!--These dependencies are required for the unit tests to succeed -->
435-
<ignoredDependency>org.apache.flink:flink-table-test-utils:jar:1.20.1</ignoredDependency>
436466
<ignoredDependency>org.mockito:mockito-inline:jar:4.6.1</ignoredDependency>
467+
<ignoredDependency>com.google.guava:guava:jar:27.0-jre</ignoredDependency>
468+
<ignoredDependency>org.apache.flink:flink-clients:jar:1.20.1</ignoredDependency>
469+
<ignoredUnusedDeclaredDependencies>org.apache.flink:flink-table-planner_${scala.binary.version}
470+
</ignoredUnusedDeclaredDependencies>
471+
<ignoredDependency>org.apache.flink:flink-table-test-utils:jar:1.20.1</ignoredDependency>
437472
</ignoredDependencies>
438473
</configuration>
439474
</execution>
@@ -453,11 +488,11 @@ under the License.
453488
<rules>
454489
<bannedDependencies>
455490
<excludes>
456-
<exclude>com.google.guava:guava</exclude>
491+
<exclude>com.google.guava:guava</exclude>
457492
<!--
458-
TODO - need to remove Mockito from the unit test code
459-
<exclude>org.mockito</exclude>
460-
-->
493+
TODO - need to remove Mockito from the unit test code
494+
<exclude>org.mockito</exclude>
495+
-->
461496
<exclude>org.powermock</exclude>
462497
</excludes>
463498
<includes>

‎flink-sql-connector-http/pom.xml‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@ under the License.
4949
<artifactId>flink-test-utils</artifactId>
5050
<version>${flink.version}</version>
5151
<scope>test</scope>
52+
<exclusions>
53+
<exclusion>
54+
<groupId>org.xerial.snappy</groupId>
55+
<artifactId>snappy-java</artifactId>
56+
</exclusion>
57+
<exclusion>
58+
<groupId>org.apache.commons</groupId>
59+
<artifactId>commons-lang3</artifactId>
60+
</exclusion>
61+
</exclusions>
5262
</dependency>
5363
<dependency>
5464
<groupId>org.junit.jupiter</groupId>
@@ -59,7 +69,6 @@ under the License.
5969
<dependency>
6070
<groupId>org.apache.flink</groupId>
6171
<artifactId>flink-table-common</artifactId>
62-
<version>${flink.version}</version>
6372
<scope>test</scope>
6473
</dependency>
6574
</dependencies>
@@ -116,23 +125,23 @@ under the License.
116125
</execution>
117126
</executions>
118127
</plugin>
119-
<!-- <plugin>-->
120-
<!-- <groupId>org.apache.maven.plugins</groupId>-->
121-
<!-- <artifactId>maven-dependency-plugin</artifactId>-->
122-
<!-- <executions>-->
123-
<!-- <execution>-->
124-
<!-- <id>analyze-deps</id>-->
125-
<!-- <goals>-->
126-
<!-- <goal>analyze</goal>-->
127-
<!-- </goals>-->
128-
<!-- <phase>verify</phase>-->
129-
<!-- <configuration>-->
130-
<!-- <ignoredUnusedDeclaredDependencies>org.apache.flink:flink-connector-http-->
131-
<!-- </ignoredUnusedDeclaredDependencies>-->
132-
<!-- </configuration>-->
133-
<!-- </execution>-->
134-
<!-- </executions>-->
135-
<!-- </plugin>-->
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-dependency-plugin</artifactId>
131+
<executions>
132+
<execution>
133+
<id>analyze-deps</id>
134+
<goals>
135+
<goal>analyze</goal>
136+
</goals>
137+
<phase>verify</phase>
138+
<configuration>
139+
<ignoredUnusedDeclaredDependencies>org.apache.flink:flink-connector-http
140+
</ignoredUnusedDeclaredDependencies>
141+
</configuration>
142+
</execution>
143+
</executions>
144+
</plugin>
136145
</plugins>
137146
</build>
138147
</project>

0 commit comments

Comments
 (0)