flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [2/2] git commit: Guava shading fixes for eclipse and IntelliJ
Date Wed, 01 Oct 2014 18:34:27 GMT
Guava shading fixes for eclipse and IntelliJ


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

Branch: refs/heads/master
Commit: d5fb423a952b44d200de6e65db6b5fdd1809035c
Parents: 1c2ce3a
Author: Stephan Ewen <sewen@apache.org>
Authored: Wed Oct 1 19:31:38 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Wed Oct 1 19:31:38 2014 +0200

----------------------------------------------------------------------
 flink-addons/flink-avro/pom.xml                     |  8 --------
 .../flink-streaming-connectors/pom.xml              |  8 +++++++-
 .../flink-streaming/flink-streaming-core/pom.xml    | 10 ----------
 .../flink-streaming-examples/pom.xml                | 10 ----------
 flink-addons/flink-yarn/pom.xml                     |  2 +-
 flink-clients/pom.xml                               | 16 ++++++++--------
 flink-compiler/pom.xml                              |  6 +-----
 flink-core/pom.xml                                  |  8 +-------
 flink-dist/pom.xml                                  |  6 ------
 flink-examples/flink-java-examples/pom.xml          |  8 --------
 flink-examples/flink-scala-examples/pom.xml         |  8 --------
 flink-java/pom.xml                                  |  2 +-
 flink-runtime/pom.xml                               | 16 ++++++++--------
 flink-scala/pom.xml                                 |  2 +-
 flink-test-utils/pom.xml                            |  2 +-
 flink-tests/pom.xml                                 |  3 +--
 16 files changed, 30 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-addons/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml
index 2d22507..8301826 100644
--- a/flink-addons/flink-avro/pom.xml
+++ b/flink-addons/flink-avro/pom.xml
@@ -54,14 +54,6 @@ under the License.
 			<!-- version is derived from base module -->
 		</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>
-		
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-test-utils</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index 51a1621..3b1e0df 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -38,6 +38,12 @@ under the License.
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-shaded</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-streaming-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -126,7 +132,7 @@ under the License.
 				</executions>
 			</plugin>
 			
-						<!-- Relocate the entire Google Guava dependency into a different namespace -->
+			<!-- Relocate the entire Google Guava dependency into a different namespace -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-addons/flink-streaming/flink-streaming-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
index 65111ad..24bf544 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -35,7 +35,6 @@ under the License.
 	<packaging>jar</packaging>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.apache.sling</groupId>
 			<artifactId>org.apache.sling.commons.json</artifactId>
@@ -47,15 +46,6 @@ under the License.
 			<artifactId>commons-math</artifactId>
 			<version>2.2</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/d5fb423a/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 c4534c5..7e159d4 100644
--- a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
@@ -35,7 +35,6 @@ under the License.
 	<packaging>jar</packaging>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-streaming-core</artifactId>
@@ -53,15 +52,6 @@ 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>
 
 	<build>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-addons/flink-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/pom.xml b/flink-addons/flink-yarn/pom.xml
index 3b6e631..7a70195 100644
--- a/flink-addons/flink-yarn/pom.xml
+++ b/flink-addons/flink-yarn/pom.xml
@@ -51,7 +51,7 @@ under the License.
 			<version>${project.version}</version>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index dcb0add..313e1ba 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -61,6 +61,14 @@ under the License.
 			<version>${project.version}</version>
 		</dependency>
 
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
@@ -96,14 +104,6 @@ under the License.
 			<scope>compile</scope>
 		</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>
-		
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-compiler/pom.xml
----------------------------------------------------------------------
diff --git a/flink-compiler/pom.xml b/flink-compiler/pom.xml
index 3727548..580b03c 100644
--- a/flink-compiler/pom.xml
+++ b/flink-compiler/pom.xml
@@ -39,31 +39,27 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-core</artifactId>
 			<version>${project.version}</version>
-			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-runtime</artifactId>
 			<version>${project.version}</version>
-			<scope>compile</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-java</artifactId>
 			<version>${project.version}</version>
-			<scope>compile</scope>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		
 	</dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index c1e1b18..ec60080 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -39,15 +39,9 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded</artifactId>
 			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 29f3341..58f4acd 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -117,12 +117,6 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-streaming-connectors</artifactId>
 			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/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 8739574..836b0bc 100644
--- a/flink-examples/flink-java-examples/pom.xml
+++ b/flink-examples/flink-java-examples/pom.xml
@@ -38,14 +38,6 @@ 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/d5fb423a/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 a22558d..77d3aae 100644
--- a/flink-examples/flink-scala-examples/pom.xml
+++ b/flink-examples/flink-scala-examples/pom.xml
@@ -44,14 +44,6 @@ under the License.
 			<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/d5fb423a/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 4b85537..b9349b4 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -53,7 +53,7 @@ under the License.
 			<version>2.24.0</version>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index ddaf452..8403145 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -46,14 +46,6 @@ under the License.
 			<artifactId>commons-cli</artifactId>
 		</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>
-		
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
@@ -89,6 +81,14 @@ under the License.
 			<artifactId>jettison</artifactId>
 			<version>1.1</version>
 		</dependency>
+		
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 87bd3fb..827c7f0 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -91,7 +91,7 @@ under the License.
 			<version>4.0</version>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils/pom.xml b/flink-test-utils/pom.xml
index acf6e85..a4bb2ef 100644
--- a/flink-test-utils/pom.xml
+++ b/flink-test-utils/pom.xml
@@ -66,7 +66,7 @@ under the License.
 			<version>4.11</version>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d5fb423a/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index f994924..16dccb6 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -35,7 +35,6 @@ under the License.
 
 	<packaging>jar</packaging>
 
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
@@ -92,7 +91,7 @@ under the License.
 			<scope>test</scope>
 		</dependency>
 		
-		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<!--  guava needs to be in "provided" scope, to make sure it is not included into the
jars by the shading -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>


Mime
View raw message