Skip to content

Commit

Permalink
[FLINK-1266] More dependency exclusions & fixed image in web client
Browse files Browse the repository at this point in the history
This closes apache#268
  • Loading branch information
rmetzger committed Jan 8, 2015
1 parent c024d81 commit 39fb7c9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
9 changes: 8 additions & 1 deletion flink-addons/flink-hbase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ public static FileSystem get(URI uri) throws IOException {
} else {
fs = instantiateFileSystem(fsClass);
}
System.out.println("Initializing new instance of native class for "+fsClass);
// Initialize new file system object
fs.initialize(uri);

Expand Down
10 changes: 10 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 39fb7c9

Please sign in to comment.