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 2016/09/29 12:45:56 UTC
[1/2] flink git commit: [FLINK-4708] [build] Properly scope Kerberos
Test Cluster dependency for tests
Repository: flink
Updated Branches:
refs/heads/master 62d4af881 -> 8243138c3
[FLINK-4708] [build] Properly scope Kerberos Test Cluster dependency for tests
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8243138c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8243138c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8243138c
Branch: refs/heads/master
Commit: 8243138c3ffb0849a7150d3c2df56eaffccd8d75
Parents: 84af0b9
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Sep 29 11:08:07 2016 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Sep 29 11:11:54 2016 +0200
----------------------------------------------------------------------
flink-streaming-connectors/flink-connector-filesystem/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8243138c/flink-streaming-connectors/flink-connector-filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-connectors/flink-connector-filesystem/pom.xml b/flink-streaming-connectors/flink-connector-filesystem/pom.xml
index edf299d..ef7e72b 100644
--- a/flink-streaming-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-streaming-connectors/flink-connector-filesystem/pom.xml
@@ -125,6 +125,7 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
<version>${minikdc.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -133,9 +134,9 @@ under the License.
<plugins>
<!--
- https://issues.apache.org/jira/browse/DIRSHARED-134
- Required to pull the Mini-KDC transitive dependency
- -->
+ https://issues.apache.org/jira/browse/DIRSHARED-134
+ Required to pull the Mini-KDC transitive dependency
+ -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
[2/2] flink git commit: [FLINK-4710] [build] Remove Guice Dependency
from Hadoop2
Posted by se...@apache.org.
[FLINK-4710] [build] Remove Guice Dependency from Hadoop2
This dependency is transitively pulled, but not necessary for the parts of the
Hadoop libraries used by Flink.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/84af0b90
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/84af0b90
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/84af0b90
Branch: refs/heads/master
Commit: 84af0b90ec81bbe2af73a56cc0483166314a492a
Parents: 62d4af8
Author: Stephan Ewen <se...@apache.org>
Authored: Wed Sep 28 20:33:20 2016 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Sep 29 11:11:54 2016 +0200
----------------------------------------------------------------------
flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/84af0b90/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index a1baba4..8a7b101 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -621,6 +621,10 @@ under the License.
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-guice</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>