http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a3d22a6..f04607f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,5 @@ cache:
   directories:
   - "$HOME/.m2"
 install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true 
-Dmaven.javadoc.skip=true -Dmaven.source.skip=true
-script: mvn install 
-DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest"
 -DforkCount=1 -DmemoryMb=2560 -DdirectMemoryMb=4608
+script: mvn install -Drat.skip=false -Dlicense.skip=false 
-DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill
+.categories.SecurityTest" -DforkCount=1 -DmemoryMb=2560 -DdirectMemoryMb=4608

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index bf32e26..2891f1e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java 
b/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java
index 3a0ac4a..be296b6 100644
--- a/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java
+++ b/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/AutoCloseables.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/AutoCloseables.java 
b/common/src/main/java/org/apache/drill/common/AutoCloseables.java
index c12063c..8ca715e 100644
--- a/common/src/main/java/org/apache/drill/common/AutoCloseables.java
+++ b/common/src/main/java/org/apache/drill/common/AutoCloseables.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java 
b/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java
index 2f6536e..18e5747 100644
--- a/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java
+++ b/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/DeferredException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/DeferredException.java 
b/common/src/main/java/org/apache/drill/common/DeferredException.java
index 721a217..a38af21 100644
--- a/common/src/main/java/org/apache/drill/common/DeferredException.java
+++ b/common/src/main/java/org/apache/drill/common/DeferredException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java 
b/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java
index 11fb9a8..c1132d0 100644
--- a/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java
+++ b/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/EventProcessor.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/EventProcessor.java 
b/common/src/main/java/org/apache/drill/common/EventProcessor.java
index 08ec55e..82f5d87 100644
--- a/common/src/main/java/org/apache/drill/common/EventProcessor.java
+++ b/common/src/main/java/org/apache/drill/common/EventProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/HistoricalLog.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/HistoricalLog.java 
b/common/src/main/java/org/apache/drill/common/HistoricalLog.java
index 3331215..08e5e7b 100644
--- a/common/src/main/java/org/apache/drill/common/HistoricalLog.java
+++ b/common/src/main/java/org/apache/drill/common/HistoricalLog.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/KerberosUtil.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/KerberosUtil.java 
b/common/src/main/java/org/apache/drill/common/KerberosUtil.java
index 6b8301c..f8632d3 100644
--- a/common/src/main/java/org/apache/drill/common/KerberosUtil.java
+++ b/common/src/main/java/org/apache/drill/common/KerberosUtil.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java 
b/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
index 6a69721..f1804ae 100644
--- a/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
+++ b/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/StackTrace.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/StackTrace.java 
b/common/src/main/java/org/apache/drill/common/StackTrace.java
index 1dbffe6..a3ec92e 100644
--- a/common/src/main/java/org/apache/drill/common/StackTrace.java
+++ b/common/src/main/java/org/apache/drill/common/StackTrace.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java 
b/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java
index 99ea544..0b566b6 100644
--- 
a/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java
+++ 
b/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java 
b/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java
index 5e54b2d..37dce2f 100644
--- 
a/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java
+++ 
b/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java
 
b/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java
index 3fe5c1e..b5b1df9 100644
--- 
a/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java
+++ 
b/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java 
b/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java
index 3e14f8a..9868537 100644
--- a/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java
+++ b/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/config/CommonConstants.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/config/CommonConstants.java 
b/common/src/main/java/org/apache/drill/common/config/CommonConstants.java
index eab48d0..1b5fb29 100644
--- a/common/src/main/java/org/apache/drill/common/config/CommonConstants.java
+++ b/common/src/main/java/org/apache/drill/common/config/CommonConstants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java 
b/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java
index feeb64d..8d643f4 100644
--- a/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java
+++ b/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java 
b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
index 0d5c881..6605864 100644
--- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
+++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/config/NestedConfig.java 
b/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
index a1533a5..79bb88c 100644
--- a/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
+++ b/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/config/package-info.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/config/package-info.java 
b/common/src/main/java/org/apache/drill/common/config/package-info.java
index 2b2bbb4..2cd56af 100644
--- a/common/src/main/java/org/apache/drill/common/config/package-info.java
+++ b/common/src/main/java/org/apache/drill/common/config/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java
 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java
index 8411a1b..3f88e28 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java
index df7004c..202d2e2 100644
--- a/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java
+++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java
index 3cd086c..5acee3e 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java
index d91fb13..ef422ae 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java
 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java
index 8786994..98b1a9d 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java 
b/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java
index 9b2097d..2a331bb 100644
--- a/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java
+++ b/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java
 
b/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java
index 8fd5a95..3bda97f 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/UserException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/UserException.java 
b/common/src/main/java/org/apache/drill/common/exceptions/UserException.java
index 19a1f91..56cb935 100644
--- a/common/src/main/java/org/apache/drill/common/exceptions/UserException.java
+++ b/common/src/main/java/org/apache/drill/common/exceptions/UserException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java
 
b/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java
index 962973b..fa2c437 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java
 
b/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java
index d13fb49..04c9890 100644
--- 
a/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java
+++ 
b/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/exceptions/package-info.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/exceptions/package-info.java 
b/common/src/main/java/org/apache/drill/common/exceptions/package-info.java
index c16c69c..1781491 100644
--- a/common/src/main/java/org/apache/drill/common/exceptions/package-info.java
+++ b/common/src/main/java/org/apache/drill/common/exceptions/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/package-info.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/package-info.java 
b/common/src/main/java/org/apache/drill/common/package-info.java
index 4de8489..5b3959e 100644
--- a/common/src/main/java/org/apache/drill/common/package-info.java
+++ b/common/src/main/java/org/apache/drill/common/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java 
b/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java
index 7f2aaa0..a8b65cc 100644
--- a/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java
+++ b/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java 
b/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java
index 889efa3..fa64ac0 100644
--- a/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java
+++ b/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java 
b/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java
index 7faa0fb..f9c64f4 100644
--- a/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java
+++ b/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java
index 13abbb5..82cbd5f 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java
index f76ad49..4669229 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java
index 81a8097..48d51b9 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java
index 7e81bd8..8e3fceb 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java
index dae2a74..b52cb30 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java
index 210c4f5..82fad69 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java
index 7004bcb..290b47b 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java
 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java
index f144cca..264f6fd 100644
--- 
a/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java
+++ 
b/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/types/package-info.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/types/package-info.java 
b/common/src/main/java/org/apache/drill/common/types/package-info.java
index 1334c6f..97be23f 100644
--- a/common/src/main/java/org/apache/drill/common/types/package-info.java
+++ b/common/src/main/java/org/apache/drill/common/types/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java 
b/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java
index 9c24afa..bff480c 100644
--- a/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java
+++ b/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java 
b/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java
index bf12cfb..33c1f48 100644
--- a/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java
+++ b/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java 
b/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
index 60d37e3..9e727f4 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java 
b/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java
index c089e92..a32da08 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java
 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java
index f37bc29..77a2e7d 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java
 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java
index 6214e3e..74e6dbf 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.common.util;
 
 

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java
 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java
index 1c41197..075a50b 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.common.util;
 
 

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java
 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java
index 7693f20..3caed6a 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.common.util;
 
 /*

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java
 
b/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java
index be07a35..4f11351 100644
--- 
a/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java
+++ 
b/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java 
b/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java
index f20fef7..343c947 100644
--- a/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java
+++ b/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java 
b/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java
index 1ad0051..bc3b01b 100644
--- a/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java
+++ b/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java 
b/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java
index bc2eabf..fd6d95e 100644
--- a/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java
+++ b/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/common/util/package-info.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/common/util/package-info.java 
b/common/src/main/java/org/apache/drill/common/util/package-info.java
index 1d7d418..669f41d 100644
--- a/common/src/main/java/org/apache/drill/common/util/package-info.java
+++ b/common/src/main/java/org/apache/drill/common/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java 
b/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java
index e046ef4..46222ab 100644
--- a/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java
+++ b/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java 
b/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java
index 770ed07..f4fc9ab 100644
--- a/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java
+++ b/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java
----------------------------------------------------------------------
diff --git 
a/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java 
b/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java
index 1b06778..1da7b9f 100644
--- a/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java
+++ b/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java 
b/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java
index 91b7b15..5dfa3be 100644
--- a/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java
+++ b/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java 
b/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java
index f4125a0..0dbf589 100644
--- a/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java
+++ b/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java 
b/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java
index 4e01a16..ecf4afe 100644
--- a/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java
+++ b/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/JdbcTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/JdbcTest.java 
b/common/src/test/java/org/apache/drill/categories/JdbcTest.java
index 0c2e9a1..93d8442 100644
--- a/common/src/test/java/org/apache/drill/categories/JdbcTest.java
+++ b/common/src/test/java/org/apache/drill/categories/JdbcTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java 
b/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java
index 3229a54..774353c 100644
--- a/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java
+++ b/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java 
b/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java
index ae025bd..a94db04 100644
--- a/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java
+++ b/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/MemoryTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/MemoryTest.java 
b/common/src/test/java/org/apache/drill/categories/MemoryTest.java
index 7d874c0..824086f 100644
--- a/common/src/test/java/org/apache/drill/categories/MemoryTest.java
+++ b/common/src/test/java/org/apache/drill/categories/MemoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java 
b/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java
index 39021c1..af0edd6 100644
--- a/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java
+++ b/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/OperatorTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/OperatorTest.java 
b/common/src/test/java/org/apache/drill/categories/OperatorTest.java
index a6854b3..8d04d4a 100644
--- a/common/src/test/java/org/apache/drill/categories/OperatorTest.java
+++ b/common/src/test/java/org/apache/drill/categories/OperatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/OptionsTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/OptionsTest.java 
b/common/src/test/java/org/apache/drill/categories/OptionsTest.java
index e506a8f..fea8a0a 100644
--- a/common/src/test/java/org/apache/drill/categories/OptionsTest.java
+++ b/common/src/test/java/org/apache/drill/categories/OptionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/ParquetTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/ParquetTest.java 
b/common/src/test/java/org/apache/drill/categories/ParquetTest.java
index c5bf8e1..aafaeb4 100644
--- a/common/src/test/java/org/apache/drill/categories/ParquetTest.java
+++ b/common/src/test/java/org/apache/drill/categories/ParquetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/PlannerTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/PlannerTest.java 
b/common/src/test/java/org/apache/drill/categories/PlannerTest.java
index 4b1bcd9..c7cb7a6 100644
--- a/common/src/test/java/org/apache/drill/categories/PlannerTest.java
+++ b/common/src/test/java/org/apache/drill/categories/PlannerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/SecurityTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/SecurityTest.java 
b/common/src/test/java/org/apache/drill/categories/SecurityTest.java
index afe29a3..e0081d5 100644
--- a/common/src/test/java/org/apache/drill/categories/SecurityTest.java
+++ b/common/src/test/java/org/apache/drill/categories/SecurityTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java 
b/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java
index 78f67c0..c9943d5 100644
--- a/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java
+++ b/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/SqlTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/SqlTest.java 
b/common/src/test/java/org/apache/drill/categories/SqlTest.java
index 158e754..b2120bb 100644
--- a/common/src/test/java/org/apache/drill/categories/SqlTest.java
+++ b/common/src/test/java/org/apache/drill/categories/SqlTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/VectorTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/VectorTest.java 
b/common/src/test/java/org/apache/drill/categories/VectorTest.java
index 3a248b5..5312aca 100644
--- a/common/src/test/java/org/apache/drill/categories/VectorTest.java
+++ b/common/src/test/java/org/apache/drill/categories/VectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.categories;
 
 /**

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/categories/package-info.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/categories/package-info.java 
b/common/src/test/java/org/apache/drill/categories/package-info.java
index 9f47ecd..bb699c1 100644
--- a/common/src/test/java/org/apache/drill/categories/package-info.java
+++ b/common/src/test/java/org/apache/drill/categories/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * <p>
  * This package stores the JUnit test categories. The theory behind categories 
is that there are three broad categories of tests:

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java
 
b/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java
index 46dfcfd..42af634 100644
--- 
a/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java
+++ 
b/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java 
b/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java
index 8f31620..8901d53 100644
--- 
a/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java
+++ 
b/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/test/DirTestWatcher.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/test/DirTestWatcher.java 
b/common/src/test/java/org/apache/drill/test/DirTestWatcher.java
index c741b80..271ac94 100644
--- a/common/src/test/java/org/apache/drill/test/DirTestWatcher.java
+++ b/common/src/test/java/org/apache/drill/test/DirTestWatcher.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.test;
 
 import org.apache.commons.io.FileUtils;

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
 
b/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
index 0830461..ee81488 100644
--- 
a/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
+++ 
b/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/test/DrillAssert.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/test/DrillAssert.java 
b/common/src/test/java/org/apache/drill/test/DrillAssert.java
index 3510677..0feca06 100644
--- a/common/src/test/java/org/apache/drill/test/DrillAssert.java
+++ b/common/src/test/java/org/apache/drill/test/DrillAssert.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java 
b/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java
index bffb605..64393f3 100644
--- a/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java
+++ b/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.drill.test;
 
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java
----------------------------------------------------------------------
diff --git 
a/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java 
b/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java
index eba0d78..36525c9 100644
--- a/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java
+++ b/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/common/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/logback-test.xml 
b/common/src/test/resources/logback-test.xml
index 8ee3537..1cd04dc 100644
--- a/common/src/test/resources/logback-test.xml
+++ b/common/src/test/resources/logback-test.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
-  license agreements. See the NOTICE file distributed with this work for 
additional
-  information regarding copyright ownership. The ASF licenses this file to
-  You under the Apache License, Version 2.0 (the "License"); you may not use
-  this file except in compliance with the License. You may obtain a copy of
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-  OF ANY KIND, either express or implied. See the License for the specific
-  language governing permissions and limitations under the License. -->
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <configuration>
 
   <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/data/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/data/pom.xml b/contrib/data/pom.xml
index 99450d9..b61caaa 100644
--- a/contrib/data/pom.xml
+++ b/contrib/data/pom.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/data/tpch-sample-data/bin/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/data/tpch-sample-data/bin/pom.xml 
b/contrib/data/tpch-sample-data/bin/pom.xml
index b6c1e48..9afb8f1 100644
--- a/contrib/data/tpch-sample-data/bin/pom.xml
+++ b/contrib/data/tpch-sample-data/bin/pom.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
-  license agreements. See the NOTICE file distributed with this work for 
additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  You under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/data/tpch-sample-data/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/data/tpch-sample-data/pom.xml 
b/contrib/data/tpch-sample-data/pom.xml
index dc42555..2cf3f35 100644
--- a/contrib/data/tpch-sample-data/pom.xml
+++ b/contrib/data/tpch-sample-data/pom.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
-  license agreements. See the NOTICE file distributed with this work for 
additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  You under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml
index d9587c5..22c79bf 100644
--- a/contrib/format-maprdb/pom.xml
+++ b/contrib/format-maprdb/pom.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java
index b0131fd..0d983bd 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java
index 904cdb9..72c69a6 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java
index 2de30e3..effdcde 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java
index 601fa02..8655f5b 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java
index 3ffe47c..40ab4f4 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java
index 162776c..5e1e2e7 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java
index e71c67c..66fa232 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

http://git-wip-us.apache.org/repos/asf/drill/blob/62f14690/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java
----------------------------------------------------------------------
diff --git 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java
 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java
index 0faa888..36e7309 100644
--- 
a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java
+++ 
b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

Reply via email to