flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [05/15] flink git commit: [FLINK-1266] More dependency exclusions
Date Sat, 10 Jan 2015 18:19:42 GMT
[FLINK-1266] More dependency exclusions

This closes #268


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

Branch: refs/heads/release-0.8
Commit: 3bf2d21e0613149ff7d5a41f8a45510ff2fb266c
Parents: cd66ced
Author: Robert Metzger <rmetzger@apache.org>
Authored: Thu Jan 8 15:24:46 2015 +0100
Committer: mbalassi <mbalassi@apache.org>
Committed: Thu Jan 8 18:02:01 2015 +0100

----------------------------------------------------------------------
 flink-addons/flink-hbase/pom.xml                          |  9 ++++++++-
 .../main/java/org/apache/flink/core/fs/FileSystem.java    |  1 -
 pom.xml                                                   | 10 ++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/3bf2d21e/flink-addons/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hbase/pom.xml b/flink-addons/flink-hbase/pom.xml
index f6b053a..01a3991 100644
--- a/flink-addons/flink-hbase/pom.xml
+++ b/flink-addons/flink-hbase/pom.xml
@@ -55,13 +55,13 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-clients</artifactId>
 			<version>${project.version}</version>
+			<scope>test</scope>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-core</artifactId>
 				</exclusion>
 			</exclusions>
-			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
@@ -75,6 +75,13 @@ under the License.
 			<groupId>org.apache.hbase</groupId>
 			<artifactId>hbase-client</artifactId>
 			<version>${hbase.version}</version>
+			<exclusions>
+				<!-- Remove unneeded dependency, which is conflicting with our jetty-util version.
-->
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>jetty-util</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/3bf2d21e/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
index 93a9938..fb45466 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
@@ -258,7 +258,6 @@ public abstract class FileSystem {
 				} else {
 					fs = instantiateFileSystem(fsClass);
 				}
-				System.out.println("Initializing new instance of native class for "+fsClass);
 				// Initialize new file system object
 				fs.initialize(uri);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/3bf2d21e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f590ce0..1906f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,10 @@ under the License.
 						<groupId>javax.servlet</groupId>
 						<artifactId>servlet-api</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>javax.servlet.jsp</groupId>
+						<artifactId>jsp-api</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -526,6 +530,7 @@ under the License.
 						<artifactId>hadoop-common</artifactId>
 						<version>${hadoop.version}</version>
 						<exclusions>
+							<!-- This is an additional exclusion (Netty) -->
 							<exclusion>
 								<groupId>org.jboss.netty</groupId>
 								<artifactId>netty</artifactId>
@@ -547,6 +552,10 @@ under the License.
 								<artifactId>jetty</artifactId>
 							</exclusion>
 							<exclusion>
+								<groupId>javax.servlet</groupId>
+								<artifactId>servlet-api</artifactId>
+							</exclusion>
+							<exclusion>
 								<groupId>org.mortbay.jetty</groupId>
 								<artifactId>jsp-api-2.1</artifactId>
 							</exclusion>
@@ -569,6 +578,7 @@ under the License.
 						<artifactId>hadoop-mapreduce-client-core</artifactId>
 						<version>${hadoop.version}</version>
 						<exclusions>
+							<!-- This is an additional exclusion (Netty) -->
 							<exclusion>
 								<groupId>org.jboss.netty</groupId>
 								<artifactId>netty</artifactId>


Mime
View raw message