[NSE-86] Add root pom.xml; Remove native-sql-engine/core/ArrowWritabl…

…eColumnVector.java (#88)
oap-project · Feb 10, 2021 · 24bfe26 · 24bfe26
1 parent 86747be
commit 24bfe26
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 1,850 deletions.
diff --git a/native-sql-engine/cpp/.gitignore → .gitignore b/native-sql-engine/cpp/.gitignore → .gitignore
@@ -1,3 +1,25 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+.idea/
+target/
+*.iml
+
+**/target/**
+
+# logs
+*.log
+
 thirdparty/*.tar*
 CMakeFiles/
 CMakeCache.txt
@@ -20,5 +42,5 @@ cmake-build-release/
 *.bak
 *flymake*
 *.kdev4
-*.log
 *.swp
+scalastyle-output.xml
diff --git a/arrow-data-source/.gitignore b/arrow-data-source/.gitignore
diff --git a/...vectorized/ArrowWritableColumnVector.java → ...vectorized/ArrowWritableColumnVector.java b/...vectorized/ArrowWritableColumnVector.java → ...vectorized/ArrowWritableColumnVector.java
diff --git a/arrow-data-source/parquet/pom.xml b/arrow-data-source/parquet/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.intel.oap</groupId>
             <artifactId>spark-arrow-datasource-standard</artifactId>
-            <version>1.1.0</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/arrow-data-source/pom.xml b/arrow-data-source/pom.xml
@@ -138,6 +138,7 @@
               <goal>compile</goal>
               <goal>testCompile</goal>
             </goals>
+            <phase>process-sources</phase>
           </execution>
         </executions>
         <configuration>
@@ -158,7 +159,7 @@
           <failOnWarning>false</failOnWarning>
           <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
           <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
-          <configLocation>scalastyle-config.xml</configLocation>
+          <configLocation>${user.dir}/scalastyle-config.xml</configLocation>
           <outputFile>${project.basedir}/target/scalastyle-output.xml</outputFile>
           <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
           <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>

diff --git a/arrow-data-source/standard/pom.xml b/arrow-data-source/standard/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.intel.oap</groupId>
             <artifactId>spark-arrow-datasource-common</artifactId>
-            <version>1.1.0</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -41,30 +41,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-writable-vector-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/generated-sources/copied/java/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.basedir}/../../../oap-native-sql/core/src/main/java/</directory>
-                                    <includes>
-                                        <include>**/ArrowWritableColumnVector.java</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -78,7 +54,6 @@
                         <configuration>
                             <sources>
                                 <source>${project.basedir}/src/main/java</source>
-                                <source>${project.build.directory}/generated-sources/copied/java/</source>
                             </sources>
                         </configuration>
                     </execution>

diff --git a/native-sql-engine/.gitignore b/native-sql-engine/.gitignore
diff --git a/native-sql-engine/core/pom.xml b/native-sql-engine/core/pom.xml
@@ -135,12 +135,12 @@
     <dependency>
       <artifactId>spark-arrow-datasource-common</artifactId>
       <groupId>com.intel.oap</groupId>
-      <version>1.1.0</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <artifactId>spark-arrow-datasource-standard</artifactId>
       <groupId>com.intel.oap</groupId>
-      <version>1.1.0</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -162,7 +162,7 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>
-      <version>3.0.6</version>
+      <version>3.0.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -356,7 +356,7 @@
           <failOnWarning>false</failOnWarning>
           <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
           <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
-          <configLocation>${project.basedir}/lib/scalastyle_config.xml</configLocation>
+          <configLocation>${user.dir}/scalastyle-config.xml</configLocation>
           <outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
           <outputEncoding>UTF-8</outputEncoding>
         </configuration>
@@ -371,7 +371,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.1</version>
         <configuration>
           <failOnViolation>false</failOnViolation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>