[hotfix] Move common dependencies into 'flink-filesystems'

laubersder · Sep 18, 2018 · 0794fa8 · 0794fa8
1 parent 48931c1
commit 0794fa8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 56 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>