drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [5/6] drill git commit: DRILL-4285: Bumps FMPP version to 0.9.15/FreeMarker to 2.3.21
Date Wed, 20 Jan 2016 15:31:13 GMT
DRILL-4285: Bumps FMPP version to 0.9.15/FreeMarker to 2.3.21

FMPP 0.9.14 pom.xml specifies a version range for FreeMarker dependency,
which should be okay except that latest SNAPSHOT version doesn't resolve
anymore.
FMPP 0.9.15 now uses a fixed stable version (2.3.21).

This closes #330.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/06e93e61
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/06e93e61
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/06e93e61

Branch: refs/heads/master
Commit: 06e93e61d05e0499d980d2dd514e105ba53fa790
Parents: a0ae83c
Author: Laurent Goujon <laurent@dremio.com>
Authored: Mon Jan 18 17:28:39 2016 -0800
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Wed Jan 20 07:30:26 2016 -0800

----------------------------------------------------------------------
 contrib/storage-hive/core/pom.xml | 7 -------
 contrib/storage-kudu/pom.xml      | 7 -------
 exec/java-exec/pom.xml            | 9 +--------
 exec/vector/pom.xml               | 7 -------
 pom.xml                           | 3 ++-
 tools/fmpp/pom.xml                | 5 +++++
 6 files changed, 8 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/06e93e61/contrib/storage-hive/core/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index 83a1e0c..83a311a 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -107,13 +107,6 @@
         <groupId>org.apache.drill.tools</groupId>
         <artifactId>drill-fmpp-maven-plugin</artifactId>
         <version>${project.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.19</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>generate-fmpp-sources</id>

http://git-wip-us.apache.org/repos/asf/drill/blob/06e93e61/contrib/storage-kudu/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-kudu/pom.xml b/contrib/storage-kudu/pom.xml
index cca319f..b3808da 100644
--- a/contrib/storage-kudu/pom.xml
+++ b/contrib/storage-kudu/pom.xml
@@ -137,13 +137,6 @@
         <groupId>org.apache.drill.tools</groupId>
         <artifactId>drill-fmpp-maven-plugin</artifactId>
         <version>${project.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.19</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>generate-fmpp</id>

http://git-wip-us.apache.org/repos/asf/drill/blob/06e93e61/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 516c0ed..6e3ffdd 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -154,7 +154,7 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.19</version>
+      <version>${freemarker.version}</version>
     </dependency>
     <dependency>
       <groupId>net.hydromatic</groupId>
@@ -562,13 +562,6 @@
         <groupId>org.apache.drill.tools</groupId>
         <artifactId>drill-fmpp-maven-plugin</artifactId>
         <version>${project.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.19</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>generate-fmpp</id>

http://git-wip-us.apache.org/repos/asf/drill/blob/06e93e61/exec/vector/pom.xml
----------------------------------------------------------------------
diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml
index c054d58..3be9cc1 100644
--- a/exec/vector/pom.xml
+++ b/exec/vector/pom.xml
@@ -113,13 +113,6 @@
         <groupId>org.apache.drill.tools</groupId>
         <artifactId>drill-fmpp-maven-plugin</artifactId>
         <version>${project.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.19</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>generate-fmpp</id>

http://git-wip-us.apache.org/repos/asf/drill/blob/06e93e61/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c476279..5db5b03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,8 @@
     -->
     <hive.version>1.2.1</hive.version>
     <hadoop.version>2.7.1</hadoop.version>
-    <fmpp.version>0.9.14</fmpp.version>
+    <fmpp.version>0.9.15</fmpp.version>
+    <freemarker.version>2.3.21</freemarker.version>
   </properties>
 
   <scm>

http://git-wip-us.apache.org/repos/asf/drill/blob/06e93e61/tools/fmpp/pom.xml
----------------------------------------------------------------------
diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index 405fa64..205e9e2 100644
--- a/tools/fmpp/pom.xml
+++ b/tools/fmpp/pom.xml
@@ -50,6 +50,11 @@
       <artifactId>fmpp</artifactId>
       <version>${fmpp.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>${freemarker.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>


Mime
View raw message