DRILL-5849: Add freemarker lib to dependencyManagement to ensure proper version is used when resolving dependency version conflicts
closes #977 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/27b6605f Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/27b6605f Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/27b6605f Branch: refs/heads/master Commit: 27b6605fab5a52526c2abb5a90c649febe725905 Parents: a7b2571 Author: Arina Ielchiieva <arina.yelchiy...@gmail.com> Authored: Fri Oct 6 16:58:28 2017 +0300 Committer: Paul Rogers <prog...@maprtech.com> Committed: Wed Oct 11 10:21:38 2017 -0700 ---------------------------------------------------------------------- exec/java-exec/pom.xml | 1 - pom.xml | 5 +++++ tools/fmpp/pom.xml | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/27b6605f/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 06340d5..a16fa6b 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -224,7 +224,6 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>${freemarker.version}</version> </dependency> <dependency> <groupId>net.hydromatic</groupId> http://git-wip-us.apache.org/repos/asf/drill/blob/27b6605f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f394507..4f7c2e2 100644 --- a/pom.xml +++ b/pom.xml @@ -679,6 +679,11 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>${freemarker.version}</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-aws</artifactId> <version>${hadoop.version}</version> http://git-wip-us.apache.org/repos/asf/drill/blob/27b6605f/tools/fmpp/pom.xml ---------------------------------------------------------------------- diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml index 27eca82..6fe7925 100644 --- a/tools/fmpp/pom.xml +++ b/tools/fmpp/pom.xml @@ -52,7 +52,6 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>${freemarker.version}</version> </dependency> </dependencies> <build>
