update maven profile

update maven profile update maven profile update maven profile update maven profile update maven profile hive example ci test hive example remove unused update hive example update spark dependencies update spark dependencies update spark dependencies add spark core scope
apache · Nov 29, 2018 · 968bb19 · 968bb19
1 parent 877efe1
commit 968bb19
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 21 deletions.
diff --git a/datamap/mv/core/pom.xml b/datamap/mv/core/pom.xml
@@ -53,7 +53,6 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/datamap/mv/plan/pom.xml b/datamap/mv/plan/pom.xml
@@ -47,7 +47,6 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/examples/spark2/pom.xml b/examples/spark2/pom.xml
@@ -74,8 +74,6 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-streaming_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <scope>${spark.deps.scope}</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -91,7 +89,6 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.carbondata</groupId>

diff --git a/integration/hive/pom.xml b/integration/hive/pom.xml
@@ -82,7 +82,6 @@
         <dependency>
           <groupId>org.apache.spark</groupId>
           <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-          <version>${spark.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -104,6 +103,11 @@
             <artifactId>carbondata-hadoop</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_${scala.binary.version}</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/integration/hive/src/main/scala/org/apache/carbondata/hiveexample/HiveExample.scala b/integration/hive/src/main/scala/org/apache/carbondata/hiveexample/HiveExample.scala
@@ -192,7 +192,6 @@ object HiveExample {
       outOfOrderColFetched = outOfOrderColFetched + 1
     }
     hiveEmbeddedServer2.stop()
-    System.exit(0)
   }
 
 }
diff --git a/integration/hive/src/test/scala/org/apache/carbondata/hiveexampleCI/RunHiveExample.scala b/integration/hive/src/test/scala/org/apache/carbondata/hiveexampleCI/RunHiveExample.scala
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.carbondata.hiveexampleCI
+
+import org.apache.spark.sql.test.util.QueryTest
+import org.scalatest.BeforeAndAfterAll
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants
+import org.apache.carbondata.core.util.CarbonProperties
+import org.apache.carbondata.hiveexample.HiveExample
+
+class RunHiveExample extends QueryTest with BeforeAndAfterAll {
+
+  private val spark = sqlContext.sparkSession
+
+  override def beforeAll: Unit = {
+    CarbonProperties.getInstance().addProperty(
+      CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
+      CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)
+    CarbonProperties.getInstance().addProperty(
+      CarbonCommonConstants.CARBON_DATE_FORMAT,
+      CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)
+  }
+
+  test("HiveExample") {
+    HiveExample.main(null)
+  }
+}
diff --git a/integration/presto/pom.xml b/integration/presto/pom.xml
@@ -437,13 +437,11 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-network-common_${scala.binary.version}</artifactId>
       <scope>test</scope>
-      <version>${spark.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
       <scope>test</scope>
-      <version>${spark.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
@@ -487,7 +485,6 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
       <scope>test</scope>
-      <version>${spark.version}</version>
     </dependency>
     <dependency>
       <groupId>org.lz4</groupId>

diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml
@@ -135,7 +135,6 @@
       will fail to execute -->
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
       <scope>test</scope>
       <exclusions>
         <!-- need to Exclude Avro jar from this project,spark core is using

diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml
@@ -71,18 +71,14 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-streaming_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <scope>${spark.deps.scope}</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-sql_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
       <exclusions>
         <!-- from transitive dependency com.univocity:univocity-parsers:2.5.9
         is added from the org.apache.spark:spark-sql_2.11,so need to remove
@@ -96,8 +92,6 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-sql-kafka-0-10_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <scope>${spark.deps.scope}</scope>
       <exclusions>
         <exclusion>
           <groupId>net.jpountz.lz4</groupId>

diff --git a/pom.xml b/pom.xml
@@ -100,7 +100,6 @@
     <module>processing</module>
     <module>hadoop</module>
     <module>integration/spark-common</module>
-    <module>integration/spark-datasource</module>
     <module>integration/spark-common-test</module>
     <module>datamap/examples</module>
     <module>store/sdk</module>
@@ -200,12 +199,30 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-core_${scala.binary.version}</artifactId>
+        <version>${spark.version}</version>
+        <scope>${spark.deps.scope}</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-sql_${scala.binary.version}</artifactId>
         <version>${spark.version}</version>
         <scope>${spark.deps.scope}</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
+        <version>${spark.version}</version>
+        <scope>${spark.deps.scope}</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-streaming_${scala.binary.version}</artifactId>
+        <version>${spark.version}</version>
+        <scope>${spark.deps.scope}</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-hive-thriftserver_${scala.binary.version}</artifactId>
@@ -218,6 +235,12 @@
         <version>${spark.version}</version>
         <scope>${spark.deps.scope}</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-network-common_${scala.binary.version}</artifactId>
+        <version>${spark.version}</version>
+        <scope>${spark.deps.scope}</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-sql-kafka-0-10_${scala.binary.version}</artifactId>
@@ -461,6 +484,7 @@
       <modules>
         <module>format</module>
         <module>integration/spark2</module>
+        <module>integration/spark-datasource</module>
         <module>examples/spark2</module>
         <module>integration/hive</module>
         <module>integration/presto</module>
@@ -495,6 +519,7 @@
       </properties>
       <modules>
         <module>integration/spark2</module>
+        <module>integration/spark-datasource</module>
         <module>integration/hive</module>
         <module>integration/presto</module>
         <module>streaming</module>
@@ -555,6 +580,7 @@
       </properties>
       <modules>
         <module>integration/spark2</module>
+        <module>integration/spark-datasource</module>
         <module>integration/hive</module>
         <module>integration/presto</module>
         <module>streaming</module>
@@ -613,6 +639,7 @@
       </properties>
       <modules>
         <module>integration/spark2</module>
+        <module>integration/spark-datasource</module>
         <module>integration/hive</module>
         <module>integration/presto</module>
         <module>streaming</module>

diff --git a/streaming/pom.xml b/streaming/pom.xml
@@ -28,13 +28,10 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-sql_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-streaming_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
-      <scope>${spark.deps.scope}</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>