Skip to content

Commit

Permalink
[HOTFIX] Fix compile error after merging PR#3001
Browse files Browse the repository at this point in the history
Fix compile error after merging PR#3001
  • Loading branch information
zzcclp committed Jan 11, 2019
1 parent d78db8f commit b81f297
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion integration/spark2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
</dependencies>

<build>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<resources>
<resource>
<directory>src/resources</directory>
Expand Down Expand Up @@ -194,6 +193,12 @@
<version>2.18</version>
<!-- Note config is repeated in scalatest config -->
<configuration>
<includes>
<include>**/Test*.java</include>
<include>**/*Test.java</include>
<include>**/*TestCase.java</include>
<include>**/*Suite.java</include>
</includes>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<argLine>-Xmx3g -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m</argLine>
<systemProperties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.apache.carbondata.core.statusmanager.FileFormat;
import org.apache.carbondata.hadoop.CarbonInputSplit;
import org.apache.carbondata.hadoop.CarbonMultiBlockSplit;
import org.apache.carbondata.hadoop.stream.CarbonStreamInputFormat;
import org.apache.carbondata.hadoop.util.CarbonInputFormatUtil;
import org.apache.carbondata.streaming.CarbonStreamInputFormat;

import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
Expand Down

0 comments on commit b81f297

Please sign in to comment.