Repository: flink Updated Branches: refs/heads/master c1e1aca21 -> 6ddfcb402
[hotfix] Fix missing guava dependency of flink-tests When building in hadoop 2 profile everything is fine since we get guava as a transitive dependency. For hadoop 1 we need to manually add the guava dependency. This was erroneously removed earlier. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6ddfcb40 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6ddfcb40 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6ddfcb40 Branch: refs/heads/master Commit: 6ddfcb402b1fa0ec185f0d924c234411c47c4fd7 Parents: c1e1aca Author: Aljoscha Krettek <aljoscha.kret...@gmail.com> Authored: Mon Feb 9 17:10:54 2015 +0100 Committer: Aljoscha Krettek <aljoscha.kret...@gmail.com> Committed: Mon Feb 9 17:10:54 2015 +0100 ---------------------------------------------------------------------- flink-tests/pom.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/6ddfcb40/flink-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index 7bf3e2e..467067d 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -439,4 +439,35 @@ under the License. </plugins> </pluginManagement> </build> + + <!-- See main pom.xml for explanation of profiles --> + <profiles> + <profile> + <id>hadoop-1</id> + <activation> + <property> + <!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh --> + <!--hadoop1--><name>hadoop.profile</name><value>1</value> + </property> + </activation> + <dependencies> + <!-- Add this here, for hadoop-2 we don't need it since we get guava transitively --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hadoop-2</id> + <activation> + <property> + <!-- Please do not remove the 'hadoop2' comment. See ./tools/generate_specific_pom.sh --> + <!--hadoop2--><name>!hadoop.profile</name> + </property> + </activation> + </profile> + </profiles> </project>
