flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [11/15] flink git commit: Minor dependencies cleanup: - Move sling JSON dependency to streaming connectors (prev streaming core) - Exclude YARN API from transitive mapreduce-core dependencies we use the dependency only for .mapred and .mapreduce
Date Sat, 10 Jan 2015 18:19:48 GMT
Minor dependencies cleanup:
  - Move sling JSON dependency to streaming connectors (prev streaming core)
  - Exclude YARN API from transitive mapreduce-core dependencies we use the dependency
    only for .mapred and .mapreduce interfaces
  - Remove some unnecessary dependencies (junit in java8)
  - Manage Kryo dependency
  - Cleanup minor POM warnings.


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

Branch: refs/heads/release-0.8
Commit: d707dca2492edb486c337a48b82325e93a62db1f
Parents: 8b31e12
Author: Stephan Ewen <sewen@apache.org>
Authored: Sat Jan 10 18:28:01 2015 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Sat Jan 10 18:42:21 2015 +0100

----------------------------------------------------------------------
 .../flink-streaming-connectors/pom.xml          |  6 +++++
 .../flink-streaming-core/pom.xml                |  5 ----
 .../flink-streaming-scala/pom.xml               |  6 ++---
 flink-addons/flink-tachyon/pom.xml              |  6 ++---
 flink-java/pom.xml                              |  1 -
 flink-java8/pom.xml                             |  7 ------
 flink-scala/pom.xml                             |  6 ++---
 pom.xml                                         | 25 +++++++++++++++++---
 8 files changed, 37 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/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 a1ab0be..9eb9994 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -208,6 +208,12 @@ under the License.
 			<artifactId>spymemcached</artifactId>
 			<version>2.8.4</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.sling</groupId>
+			<artifactId>org.apache.sling.commons.json</artifactId>
+			<version>2.0.6</version>
+		</dependency>
 
 	</dependencies>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/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 5cfeb33..b080a56 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -35,11 +35,6 @@ under the License.
 	<packaging>jar</packaging>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.sling</groupId>
-			<artifactId>org.apache.sling.commons.json</artifactId>
-			<version>2.0.6</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/flink-addons/flink-streaming/flink-streaming-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-scala/pom.xml b/flink-addons/flink-streaming/flink-streaming-scala/pom.xml
index a75d62d..b934df2 100644
--- a/flink-addons/flink-streaming/flink-streaming-scala/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-scala/pom.xml
@@ -46,9 +46,9 @@ under the License.
 		</dependency>
 
 		<dependency>
-		   <groupId>org.scalamacros</groupId>
-		   <artifactId>quasiquotes_${scala.binary.version}</artifactId>
-		   <version>${scala.macros.version}</version>
+			<groupId>org.scalamacros</groupId>
+			<artifactId>quasiquotes_${scala.binary.version}</artifactId>
+			<version>${scala.macros.version}</version>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/flink-addons/flink-tachyon/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-tachyon/pom.xml b/flink-addons/flink-tachyon/pom.xml
index 1764ee5..b6888f8 100644
--- a/flink-addons/flink-tachyon/pom.xml
+++ b/flink-addons/flink-tachyon/pom.xml
@@ -64,7 +64,7 @@ under the License.
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>
-			<version>7.6.8.v20121106</version>
+			<version>7.6.8.v20121106</version><!--$NO-MVN-MAN-VER$-->
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -82,14 +82,14 @@ under the License.
 			<artifactId>hadoop-hdfs</artifactId>
 			<scope>test</scope>
 			<type>test-jar</type>
-			<version>${hadoop.version}</version>
+			<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-common</artifactId>
 			<scope>test</scope>
 			<type>test-jar</type>
-			<version>${hadoop.version}</version>
+			<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
 	</dependencies>
 	<dependencyManagement>

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index b4c8b18..1469dac 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -50,7 +50,6 @@ under the License.
 		<dependency>
 			<groupId>com.esotericsoftware.kryo</groupId>
 			<artifactId>kryo</artifactId>
-			<version>2.24.0</version>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/flink-java8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index 0b17451..d1067ac 100644
--- a/flink-java8/pom.xml
+++ b/flink-java8/pom.xml
@@ -69,12 +69,6 @@ under the License.
 			<artifactId>flink-java-examples</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.7</version>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -87,7 +81,6 @@ under the License.
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
-					<!-- High optimization, no debugging <compilerArgument>-g:none -O</compilerArgument>
-->
 				</configuration>
 			</plugin>
 			<plugin>

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index e2d71e1..866c02b 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -70,9 +70,9 @@ under the License.
 		</dependency>
 
 		<dependency>
-		   <groupId>org.scalamacros</groupId>
-		   <artifactId>quasiquotes_${scala.binary.version}</artifactId>
-		   <version>${scala.macros.version}</version>
+			<groupId>org.scalamacros</groupId>
+			<artifactId>quasiquotes_${scala.binary.version}</artifactId>
+			<version>${scala.macros.version}</version>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/d707dca2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1906f19..3210200 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@ under the License.
 	<artifactId>flink-parent</artifactId>
 	<version>0.8-SNAPSHOT</version>
 
-	<name>flink</name>
+	<name>Apache Flink</name>
 	<packaging>pom</packaging>
-	<url>http://flink.incubator.apache.org/</url>
+	<url>http://flink.apache.org</url>
 	<inceptionYear>2014</inceptionYear>
 
 	<licenses>
@@ -47,7 +47,7 @@ under the License.
 
 	<scm>
 		<url>https://github.com/apache/incubator-flink</url>
-		<connection>git@github.com:apache/incubator-flink.git</connection>
+		<connection>git@github.com:apache/flink.git</connection>
 		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-flink.git</developerConnection>
 	</scm>
 
@@ -229,6 +229,13 @@ under the License.
 				<artifactId>stax-api</artifactId>
 				<version>1.0.1</version>
 			</dependency>
+			
+			<!-- kryo used in different versions by Flink an chill -->
+			<dependency>
+				<groupId>com.esotericsoftware.kryo</groupId>
+				<artifactId>kryo</artifactId>
+				<version>2.24.0</version>
+			</dependency>
 
 			<!-- "Old" stable Hadoop = MapReduce v1 -->
 			<dependency>
@@ -441,6 +448,18 @@ under the License.
 						<groupId>org.eclipse.jdt</groupId>
 						<artifactId>core</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.apache.hadoop</groupId>
+						<artifactId>hadoop-yarn-common</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.google.inject.extensions</groupId>
+						<artifactId>guice-servlet</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>io.netty</groupId>
+						<artifactId>netty</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>


Mime
View raw message