Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

[NSE-86] Add root pom.xml; Remove native-sql-engine/core/ArrowWritableColumnVector.java #88

Merged
merged 6 commits into from
Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion native-sql-engine/cpp/.gitignore → .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,5 +42,5 @@ cmake-build-release/
*.bak
*flymake*
*.kdev4
*.log
*.swp
scalastyle-output.xml
16 changes: 0 additions & 16 deletions arrow-data-source/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion arrow-data-source/parquet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 2 additions & 1 deletion arrow-data-source/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
<configuration>
Expand All @@ -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>
Expand Down
27 changes: 1 addition & 26 deletions arrow-data-source/standard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 0 additions & 10 deletions native-sql-engine/.gitignore

This file was deleted.

10 changes: 5 additions & 5 deletions native-sql-engine/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading