diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index 7c8126e2d59905ebd7f5b70a7efc4fe0e7778e25..df34b205f1338a588d5913263b12ffb98c98ff63 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>
 
diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
index beea37cc16afd381f6d721e56f7dd1f9db534696..9231cbfd60f32a0b7b5e72e62f1585c98687b546 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>
diff --git a/flink-addons/flink-tachyon/pom.xml b/flink-addons/flink-tachyon/pom.xml
index 08046a33bc363915aa0e37a8d40973bf86a09f21..887fa4b3a8e936796627f0c32579e35fb5d938dd 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>
@@ -108,4 +108,4 @@ under the License.
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 47d8c7d52b92612955414d37972df9a2409069f2..8abe3d4e7a6245102363d0e1bc814e457a3f1c6f 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>
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index 2862788304302b1f7194a9140d4bc8502019d051..0d82ea21c8608388b3586ee6591d91a935032012 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>
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index b9026553abd61fa8daf68e85ada0f86c10f8ec68..3b686abf5312ab2416e6a9e58af428f3dd7d6632 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -67,9 +67,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>
diff --git a/pom.xml b/pom.xml
index 56106682771f07cd69b7e8e1e10973e0af6a1510..e368f3ab45ccdc26cbb3b1744b7f6ed3f8a3c8c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@ under the License.
 	<artifactId>flink-parent</artifactId>
 	<version>0.9-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>
 
@@ -232,6 +232,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>
 
 			<dependency>
 				<groupId>org.scala-lang</groupId>
@@ -513,6 +520,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>