DRILL-5849: Add freemarker lib to dependencyManagement to ensure prop…

…er version is used when resolving dependency version conflicts closes #977
apache · Oct 11, 2017 · 27b6605 · 27b6605
1 parent a7b2571
commit 27b6605
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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>

diff --git a/pom.xml b/pom.xml
@@ -678,6 +678,11 @@
   <!-- Managed Dependencies -->
   <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>

diff --git 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>