From 5305320bb3745102dae071a035648f377de84464 Mon Sep 17 00:00:00 2001
From: Vlad Rozov <vrozov@apache.org>
Date: Tue, 20 Mar 2018 19:24:11 -0700
Subject: [PATCH] DRILL-6280: Cleanup execution of BuildTimeScan during maven
 build

---
 common/pom.xml                                | 16 +++----------
 .../drill/common/scanner/BuildTimeScan.java   |  8 +++----
 exec/java-exec/pom.xml                        | 24 +------------------
 logical/pom.xml                               | 24 +------------------
 pom.xml                                       | 20 ++++++++++++++++
 5 files changed, 29 insertions(+), 63 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 31cce2112c6..bf32e267640 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -113,20 +113,10 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
-          <mainClass>org.apache.drill.common.scanner.BuildTimeScan</mainClass>
-          <arguments>
-            <argument>${project.build.outputDirectory}</argument>
-          </arguments>
+          <additionalClasspathElements>
+            <additionalClasspathElement>${project.basedir}/src/test/resources/</additionalClasspathElement>
+          </additionalClasspathElements>
         </configuration>
       </plugin>
     </plugins>
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 28f37049937..7f2aaa01bcd 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
@@ -45,8 +45,8 @@ public class BuildTimeScan {
   private static final String REGISTRY_FILE = "META-INF/drill-module-scan/registry.json";
 
   private static final ObjectMapper mapper = new ObjectMapper().enable(INDENT_OUTPUT);
-  private static final ObjectReader reader = mapper.reader(ScanResult.class);
-  private static final ObjectWriter writer = mapper.writerWithType(ScanResult.class);
+  private static final ObjectReader reader = mapper.readerFor(ScanResult.class);
+  private static final ObjectWriter writer = mapper.writerFor(ScanResult.class);
 
   /**
    * @return paths that have the prescanned registry file in them
@@ -118,10 +118,10 @@ private static void save(ScanResult scanResult, File file) {
    */
   public static void main(String[] args) throws Exception {
     if (args.length != 1) {
-      throw new IllegalArgumentException("Usage: java {cp} " + ClassPathScanner.class.getName() + " path/to/scan");
+      throw new IllegalArgumentException("Usage: java {cp} " + BuildTimeScan.class.getName() + " path/to/scan");
     }
     String basePath = args[0];
-    System.out.println("Scanning: " + basePath);
+    logger.info("Scanning: {}", basePath);
     File registryFile = new File(basePath, REGISTRY_FILE);
     File dir = registryFile.getParentFile();
     if ((!dir.exists() && !dir.mkdirs()) || !dir.isDirectory()) {
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 205f3ed552b..f2d2ebd2c65 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -828,31 +828,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin> <!-- classpath scanning  -->
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.drill</groupId>
-            <artifactId>drill-common</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals><goal>java</goal></goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>org.apache.drill.common.scanner.BuildTimeScan</mainClass>
-          <includePluginDependencies>true</includePluginDependencies>
-          <arguments>
-            <argument>${project.build.outputDirectory}</argument>
-          </arguments>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/logical/pom.xml b/logical/pom.xml
index 1cd9f0268c3..429baad1c26 100644
--- a/logical/pom.xml
+++ b/logical/pom.xml
@@ -109,31 +109,9 @@
 
   <build>
     <plugins>
-      <plugin> <!-- classpath scanning --> 
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.drill</groupId>
-            <artifactId>drill-common</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals><goal>java</goal></goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>org.apache.drill.common.scanner.BuildTimeScan</mainClass>
-          <includePluginDependencies>true</includePluginDependencies>
-          <arguments>
-            <argument>${project.build.outputDirectory}</argument>
-          </arguments>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d2a2262bd45..e5ad2209a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,6 +444,26 @@
           <artifactId>maven-enforcer-plugin</artifactId>
           <version>1.3.1</version>
         </plugin>
+        <plugin> <!-- classpath scanning  -->
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.6.0</version>
+          <executions>
+            <execution>
+              <phase>process-classes</phase>
+              <goals>
+                <goal>java</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <mainClass>org.apache.drill.common.scanner.BuildTimeScan</mainClass>
+            <classpathScope>test</classpathScope>
+            <arguments>
+              <argument>${project.build.outputDirectory}</argument>
+            </arguments>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>