You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2018/09/18 17:54:57 UTC

[flink] 04/04: [hotfix] Move common dependencies into 'flink-filesystems'

This is an automated email from the ASF dual-hosted git repository.

sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 0794fa862134fbd669c4e15a410adc2f877cc393
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Wed Sep 12 12:54:16 2018 +0200

    [hotfix] Move common dependencies into 'flink-filesystems'
---
 flink-filesystems/flink-s3-fs-hadoop/pom.xml    | 14 ------------
 flink-filesystems/flink-s3-fs-presto/pom.xml    | 14 ------------
 flink-filesystems/flink-swift-fs-hadoop/pom.xml | 21 ------------------
 flink-filesystems/pom.xml                       | 29 +++++++++++++++++++------
 4 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
index 1598518..fb6bda1 100644
--- a/flink-filesystems/flink-s3-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
@@ -161,20 +161,6 @@ under the License.
 			<artifactId>aws-java-sdk-s3</artifactId>
 		</dependency>
 
-		<!-- make sure that also logger and JSR is provided -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- for the behavior test suite -->
 		<dependency>
 			<groupId>org.apache.flink</groupId>
diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml
index 67ba69c..8720217 100644
--- a/flink-filesystems/flink-s3-fs-presto/pom.xml
+++ b/flink-filesystems/flink-s3-fs-presto/pom.xml
@@ -184,20 +184,6 @@ under the License.
 			<version>2.7.3-1</version>
 		</dependency>
 
-		<!-- make sure that also logger and JSR is provided -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- for the behavior test suite -->
 		<dependency>
 			<groupId>org.apache.flink</groupId>
diff --git a/flink-filesystems/flink-swift-fs-hadoop/pom.xml b/flink-filesystems/flink-swift-fs-hadoop/pom.xml
index e2a3bab..d0445d6 100644
--- a/flink-filesystems/flink-swift-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-swift-fs-hadoop/pom.xml
@@ -130,27 +130,6 @@ under the License.
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<!-- make sure that also logger and JSR is provided -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- test dependencies -->
-
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-test-utils-junit</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/flink-filesystems/pom.xml b/flink-filesystems/pom.xml
index f0a4ab3..148eed6 100644
--- a/flink-filesystems/pom.xml
+++ b/flink-filesystems/pom.xml
@@ -43,6 +43,28 @@ under the License.
 		<module>flink-swift-fs-hadoop</module>
 	</modules>
 
+	<!-- Common dependency setup for all filesystems -->
+	<dependencies>
+
+		<!-- The filesystems are extensions that can assume logger and JSR to be already provided -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Base testing tools -->
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-test-utils-junit</artifactId>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -63,11 +85,4 @@ under the License.
 		</plugins>
 	</build>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-test-utils-junit</artifactId>
-		</dependency>
-	</dependencies>
-
 </project>