drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [3/5] drill git commit: DRILL-3581: Upgrade to Guava 18.0
Date Fri, 05 Feb 2016 15:00:56 GMT
http://git-wip-us.apache.org/repos/asf/drill/blob/422c5a83/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 47c2f24..0f0053d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
     <proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
     <dep.junit.version>4.11</dep.junit.version>
     <dep.slf4j.version>1.7.6</dep.slf4j.version>
+    <dep.guava.version>18.0</dep.guava.version>
     <forkCount>2</forkCount>
     <parquet.version>1.8.1-drill-r0</parquet.version>
     <sqlline.version>1.1.9-drill-r7</sqlline.version>
@@ -328,6 +329,7 @@
                     <exclude>javax.servlet:servlet-api</exclude>
                     <exclude>org.mortbay.jetty:servlet-api</exclude>
                     <exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
+                    <exclude>log4j:log4j</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -408,7 +410,10 @@
               -Ddrill.exec.sys.store.provider.local.write=false
               -Dorg.apache.drill.exec.server.Drillbit.system_options="org.apache.drill.exec.compile.ClassTransformer.scalar_replacement=on"
               -Ddrill.test.query.printing.silent=true
+              -Ddrill.catastrophic_to_standard_out=true
               -XX:MaxPermSize=512M -XX:MaxDirectMemorySize=3072M
+              -Djava.net.preferIPv4Stack=true
+              -Djava.awt.headless=true
               -XX:+CMSClassUnloadingEnabled -ea</argLine>
             <forkCount>${forkCount}</forkCount>
             <reuseForks>true</reuseForks>
@@ -526,7 +531,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0.1</version>
+      <version>${dep.guava.version}</version>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/drill/blob/422c5a83/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java
----------------------------------------------------------------------
diff --git a/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java b/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java
index e2756b0..6f3833f 100644
--- a/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java
+++ b/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java
@@ -22,7 +22,6 @@ import static java.lang.String.format;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
@@ -114,7 +113,7 @@ public class FMPPMojo extends AbstractMojo {
         throw new MojoFailureException("scope must be compile or test");
     }
 
-    final Stopwatch sw = new Stopwatch().start();
+    final Stopwatch sw = Stopwatch.createStarted();
     try {
       getLog().info(format("Freemarker generation:\n scope: %s,\n config: %s,\n templates:
%s",
           scope, config.getAbsolutePath(), templatesPath));


Mime
View raw message