Skip to content

Commit 7927a66

Browse files
mohsenrezaeithemohsenrezaeithe
committed
refactored provided flink-core dep to the base file-system module
1 parent f92b042 commit 7927a66

File tree

8 files changed

+19
-90
lines changed

8 files changed

+19
-90
lines changed

‎flink-filesystems/flink-azure-fs-hadoop/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ under the License.
4040

4141
<dependencies>
4242

43-
<dependency>
44-
<groupId>org.apache.flink</groupId>
45-
<artifactId>flink-core</artifactId>
46-
<version>${project.version}</version>
47-
<scope>provided</scope>
48-
</dependency>
49-
5043
<dependency>
5144
<groupId>org.apache.flink</groupId>
5245
<artifactId>flink-hadoop-fs</artifactId>
@@ -90,15 +83,6 @@ under the License.
9083
<scope>test</scope>
9184
</dependency>
9285

93-
<!-- for the behavior test suite -->
94-
<dependency>
95-
<groupId>org.apache.flink</groupId>
96-
<artifactId>flink-core</artifactId>
97-
<version>${project.version}</version>
98-
<scope>test</scope>
99-
<type>test-jar</type>
100-
</dependency>
101-
10286
</dependencies>
10387

10488
<dependencyManagement>

‎flink-filesystems/flink-gs-fs-hadoop/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ under the License.
4242

4343
<dependencies>
4444

45-
<dependency>
46-
<groupId>org.apache.flink</groupId>
47-
<artifactId>flink-core</artifactId>
48-
<version>${project.version}</version>
49-
<scope>provided</scope>
50-
</dependency>
51-
5245
<dependency>
5346
<groupId>org.apache.flink</groupId>
5447
<artifactId>flink-hadoop-fs</artifactId>

‎flink-filesystems/flink-hadoop-fs/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ under the License.
4343
</properties>
4444

4545
<dependencies>
46+
47+
<!-- Provided to the rest of the filesystems for runtime -->
4648
<dependency>
4749
<groupId>org.apache.flink</groupId>
4850
<artifactId>flink-core</artifactId>
@@ -105,16 +107,6 @@ under the License.
105107
</exclusion>
106108
</exclusions>
107109
</dependency>
108-
109-
110-
<!-- for the behavior test suite -->
111-
<dependency>
112-
<groupId>org.apache.flink</groupId>
113-
<artifactId>flink-core</artifactId>
114-
<version>${project.version}</version>
115-
<scope>test</scope>
116-
<type>test-jar</type>
117-
</dependency>
118110

119111
<!-- for the HDFS mini cluster test suite -->
120112
<dependency>

‎flink-filesystems/flink-oss-fs-hadoop/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ under the License.
3333
</properties>
3434

3535
<dependencies>
36-
<dependency>
37-
<groupId>org.apache.flink</groupId>
38-
<artifactId>flink-core</artifactId>
39-
<version>${project.version}</version>
40-
<scope>provided</scope>
41-
</dependency>
4236

4337
<dependency>
4438
<groupId>org.apache.flink</groupId>
@@ -110,15 +104,6 @@ under the License.
110104
<type>test-jar</type>
111105
</dependency>
112106

113-
<!-- for the behavior test suite -->
114-
<dependency>
115-
<groupId>org.apache.flink</groupId>
116-
<artifactId>flink-core</artifactId>
117-
<version>${project.version}</version>
118-
<scope>test</scope>
119-
<type>test-jar</type>
120-
</dependency>
121-
122107
<dependency>
123108
<groupId>org.apache.flink</groupId>
124109
<artifactId>flink-hadoop-fs</artifactId>

‎flink-filesystems/flink-s3-fs-base/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ under the License.
4141

4242
<dependencies>
4343

44-
<!-- Flink's file system abstraction (only compiled against, not bundled) -->
45-
<dependency>
46-
<groupId>org.apache.flink</groupId>
47-
<artifactId>flink-core</artifactId>
48-
<version>${project.version}</version>
49-
<scope>provided</scope>
50-
</dependency>
51-
5244
<!-- Hadoop's file system abstraction (bundled) -->
5345
<dependency>
5446
<groupId>org.apache.hadoop</groupId>

‎flink-filesystems/flink-s3-fs-hadoop/pom.xml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,8 @@ under the License.
6666
</dependency>
6767
</dependencies>
6868
</dependencyManagement>
69-
<dependencies>
7069

71-
<!-- Flink's file system abstraction (compiled against, not bundled) -->
72-
<dependency>
73-
<groupId>org.apache.flink</groupId>
74-
<artifactId>flink-core</artifactId>
75-
<version>${project.version}</version>
76-
<scope>provided</scope>
77-
</dependency>
70+
<dependencies>
7871

7972
<!-- S3 base -->
8073
<dependency>
@@ -93,15 +86,6 @@ under the License.
9386
<scope>provided</scope>
9487
</dependency>
9588

96-
<!-- for the behavior test suite -->
97-
<dependency>
98-
<groupId>org.apache.flink</groupId>
99-
<artifactId>flink-core</artifactId>
100-
<version>${project.version}</version>
101-
<scope>test</scope>
102-
<type>test-jar</type>
103-
</dependency>
104-
10589
<dependency>
10690
<groupId>org.apache.flink</groupId>
10791
<artifactId>flink-hadoop-fs</artifactId>

‎flink-filesystems/flink-s3-fs-presto/pom.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ under the License.
4040
</properties>
4141

4242
<dependencies>
43-
44-
<!-- Flink's file system abstraction (compiled against, not bundled) -->
45-
<dependency>
46-
<groupId>org.apache.flink</groupId>
47-
<artifactId>flink-core</artifactId>
48-
<version>${project.version}</version>
49-
<scope>provided</scope>
50-
</dependency>
5143

5244
<!-- S3 base (bundled) -->
5345
<dependency>
@@ -335,15 +327,6 @@ under the License.
335327
<scope>provided</scope>
336328
</dependency>
337329

338-
<!-- for the behavior test suite -->
339-
<dependency>
340-
<groupId>org.apache.flink</groupId>
341-
<artifactId>flink-core</artifactId>
342-
<version>${project.version}</version>
343-
<scope>test</scope>
344-
<type>test-jar</type>
345-
</dependency>
346-
347330
<dependency>
348331
<groupId>org.apache.flink</groupId>
349332
<artifactId>flink-hadoop-fs</artifactId>

‎flink-filesystems/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,22 @@ under the License.
5151
<!-- Common dependency setup for all filesystems -->
5252
<dependencies>
5353

54+
<!-- The filesystems are an extension to the flink-core, which would already be provided -->
55+
<dependency>
56+
<groupId>org.apache.flink</groupId>
57+
<artifactId>flink-core</artifactId>
58+
<version>${project.version}</version>
59+
<scope>provided</scope>
60+
</dependency>
61+
<!-- for the behavior test suite -->
62+
<dependency>
63+
<groupId>org.apache.flink</groupId>
64+
<artifactId>flink-core</artifactId>
65+
<version>${project.version}</version>
66+
<scope>test</scope>
67+
<type>test-jar</type>
68+
</dependency>
69+
5470
<!-- The filesystems are extensions that can assume logger and JSR to be already provided -->
5571
<dependency>
5672
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)