Repository: flink Updated Branches: refs/heads/master 2d373d88a -> 61a3a6485
[FLINK-1785] [test] Master tests in flink-tachyon fail with java.lang.NoSuchFieldError: IBM_JAVA. Move the hadoop-hdfs and hadoop-common test jars dependency before Tachyon. Looks like Maven respect the ordering of dependencies and first declarations win. Seemed like Tachyon brings transitive dependencies of older hadoop versions. Author: Henry Saputra <hsapu...@apache.org> Closes #536 from hsaputra/FLINK-1785_add_hadoop_deps_to_test_scope and squashes the following commits: f266a6c [Henry Saputra] [FLINK-1785] [test] Master tests in flink-tachyon fail with java.lang.NoSuchFieldError: IBM_JAVA. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/61a3a648 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/61a3a648 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/61a3a648 Branch: refs/heads/master Commit: 61a3a6485308642303256e9423b61e0e425c28b7 Parents: 2d373d8 Author: Henry Saputra <hsapu...@apache.org> Authored: Thu Mar 26 11:10:44 2015 -0700 Committer: Henry Saputra <henry.sapu...@gmail.com> Committed: Thu Mar 26 11:10:44 2015 -0700 ---------------------------------------------------------------------- flink-staging/flink-tachyon/pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/61a3a648/flink-staging/flink-tachyon/pom.xml ---------------------------------------------------------------------- diff --git a/flink-staging/flink-tachyon/pom.xml b/flink-staging/flink-tachyon/pom.xml index b58bc20..e1a1ffd 100644 --- a/flink-staging/flink-tachyon/pom.xml +++ b/flink-staging/flink-tachyon/pom.xml @@ -40,6 +40,7 @@ under the License. <groupId>org.apache.flink</groupId> <artifactId>${shading-artifact.name}</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> @@ -60,6 +61,20 @@ under the License. <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> + <type>test-jar</type> + <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><!--$NO-MVN-MAN-VER$--> + </dependency> + <dependency> <groupId>org.tachyonproject</groupId> <artifactId>tachyon</artifactId> <version>0.5.0</version> @@ -78,21 +93,6 @@ under the License. <version>7.6.8.v20121106</version><!--$NO-MVN-MAN-VER$--> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - <type>test-jar</type> - <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><!--$NO-MVN-MAN-VER$--> - </dependency> </dependencies> <dependencyManagement> <dependencies>
