add coveralls token to spark-2.2 profile;synchronize file path and pa…

…ckage name;Delete duplicate class CarbonColumnValidator present in spark2 module
apache · Jan 4, 2018 · 9c92ce8 · 9c92ce8
1 parent 69de387
commit 9c92ce8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 39 deletions.
diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonColumnValidator.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonColumnValidator.scala
diff --git a/...rk2/src/main/spark2.1/CarbonSQLConf.scala → ...apache/spark/sql/hive/CarbonSQLConf.scala b/...rk2/src/main/spark2.1/CarbonSQLConf.scala → ...apache/spark/sql/hive/CarbonSQLConf.scala
diff --git a/...rc/main/spark2.1/CarbonSessionState.scala → ...e/spark/sql/hive/CarbonSessionState.scala b/...rc/main/spark2.1/CarbonSessionState.scala → ...e/spark/sql/hive/CarbonSessionState.scala
diff --git a/...rc/main/spark2.2/CarbonSessionState.scala → ...e/spark/sql/hive/CarbonSessionState.scala b/...rc/main/spark2.2/CarbonSessionState.scala → ...e/spark/sql/hive/CarbonSessionState.scala
diff --git a/...rk2/src/main/spark2.2/CarbonSqlConf.scala → ...apache/spark/sql/hive/CarbonSqlConf.scala b/...rk2/src/main/spark2.2/CarbonSqlConf.scala → ...apache/spark/sql/hive/CarbonSqlConf.scala
diff --git a/pom.xml b/pom.xml
@@ -495,6 +495,7 @@
                 <sourceDirectory>${basedir}/hadoop/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark2/src/main/scala</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark2/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/integration/spark2/src/main/spark2.1</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark-common/src/main/scala</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark-common/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark-common-test/src/main/scala</sourceDirectory>
@@ -504,7 +505,7 @@
                 <sourceDirectory>${basedir}/integration/presto/src/main/scala</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/presto/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
-                <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/streaming/src/main/scala</sourceDirectory>
               </sourceDirectories>
             </configuration>
           </plugin>
@@ -532,7 +533,7 @@
             <artifactId>coveralls-maven-plugin</artifactId>
             <version>4.3.0</version>
             <configuration>
-              <repoToken>Q8mcBW8dw34wjNiPAMx0SFQidspIwHw8g</repoToken>
+              <repoToken>opPwqWW41vYppv6KISea3u1TJvE1ugJ5Y</repoToken>
               <sourceEncoding>UTF-8</sourceEncoding>
               <jacocoReports>
                 <jacocoReport>${basedir}/target/carbondata-coverage-report/carbondata-coverage-report.xml
@@ -544,6 +545,7 @@
                 <sourceDirectory>${basedir}/processing/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/hadoop/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark2/src/main/scala</sourceDirectory>
+                <sourceDirectory>${basedir}/integration/spark2/src/main/spark2.2</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark2/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark-common/src/main/scala</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/spark-common/src/main/java</sourceDirectory>
@@ -554,7 +556,7 @@
                 <sourceDirectory>${basedir}/integration/presto/src/main/scala</sourceDirectory>
                 <sourceDirectory>${basedir}/integration/presto/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
-                <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/streaming/src/main/scala</sourceDirectory>
               </sourceDirectories>
             </configuration>
           </plugin>