提交 39fb7c94 编写于 作者: R Robert Metzger

[FLINK-1266] More dependency exclusions & fixed image in web client

This closes #268
上级 c024d819
......@@ -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>
......
......@@ -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);
......
......@@ -384,6 +384,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>
......@@ -598,6 +602,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>
......@@ -618,6 +623,10 @@ under the License.
<groupId>org.mortbay.jetty</groupId>
<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>
......@@ -641,6 +650,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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册