flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/2] git commit: Repair guava dependencies
Date Wed, 01 Oct 2014 18:34:26 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/master 425e8a46f -> d5fb423a9


Repair guava dependencies


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/1c2ce3a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/1c2ce3a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/1c2ce3a3

Branch: refs/heads/master
Commit: 1c2ce3a39ae79bf3670919587609d7cd506855fc
Parents: 425e8a4
Author: Stephan Ewen <sewen@apache.org>
Authored: Wed Oct 1 18:35:29 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Wed Oct 1 18:35:29 2014 +0200

----------------------------------------------------------------------
 .../flink-streaming/flink-streaming-examples/pom.xml        | 8 ++++++++
 flink-examples/flink-java-examples/pom.xml                  | 8 ++++++++
 flink-examples/flink-scala-examples/pom.xml                 | 9 +++++++++
 pom.xml                                                     | 7 -------
 4 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1c2ce3a3/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
index 228d69c..c4534c5 100644
--- a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
@@ -53,6 +53,14 @@ under the License.
 			<artifactId>flink-streaming-connectors</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
+		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 	</dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1c2ce3a3/flink-examples/flink-java-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-java-examples/pom.xml b/flink-examples/flink-java-examples/pom.xml
index 836b0bc..8739574 100644
--- a/flink-examples/flink-java-examples/pom.xml
+++ b/flink-examples/flink-java-examples/pom.xml
@@ -38,6 +38,14 @@ under the License.
 			<artifactId>flink-java</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
+		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	
 	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1c2ce3a3/flink-examples/flink-scala-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-scala-examples/pom.xml b/flink-examples/flink-scala-examples/pom.xml
index a3eba40..a22558d 100644
--- a/flink-examples/flink-scala-examples/pom.xml
+++ b/flink-examples/flink-scala-examples/pom.xml
@@ -38,11 +38,20 @@ under the License.
 			<artifactId>flink-scala</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-java-examples</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
+		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1c2ce3a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d368aa9..3077778 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,13 +145,6 @@ under the License.
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
-        
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-            <scope>provided</scope>
-        </dependency>
 	</dependencies>
 	
 	<!-- this section defines the module versions that are used if nothing else is specified.
-->


Mime
View raw message