Guava shading fixes for eclipse and IntelliJ

VonRosenchild · Oct 1, 2014 · d5fb423 · d5fb423
1 parent 1c2ce3a
commit d5fb423
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 85 deletions.
diff --git 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>

diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -36,6 +36,12 @@ under the License.
 
  <dependencies>
 
+ <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>
@@ -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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>
diff --git 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>

diff --git 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>

diff --git 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>
 
 

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>