update

zhnlk · Nov 9, 2018 · 8c31ce4 · 8c31ce4
1 parent 24f6a80
commit 8c31ce4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 59 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,6 @@
         <module>streamingpro-opencv</module>
         <module>streamingpro-jython</module>
         <module>streamingpro-automl</module>
-        <module>streamingpro-bigdl</module>
     </modules>
 
     <properties>
@@ -59,8 +58,6 @@
         <spark.version>2.2.0</spark.version>
         <spark.bigversion>2.2</spark.bigversion>
 
-        <spark.version.minor>2.2.0</spark.version.minor>
-
 
         <flink.version>1.4.2</flink.version>
         <guava.version>16.0</guava.version>
@@ -185,7 +182,7 @@
                 <spark.sql.kafka.artifactId>spark-sql-kafka-0-10_${scala.binary.version}</spark.sql.kafka.artifactId>
                 <spark.version>2.2.0</spark.version>
                 <spark.bigversion>2.2</spark.bigversion>
-                <spark.version.minor>2.2.0</spark.version.minor>
+                <bigdl.spark.version.minor>2.2.0</bigdl.spark.version.minor>
             </properties>
             <modules>
                 <module>streamingpro-spark-2.2.0-adaptor</module>
@@ -254,7 +251,7 @@
                 <spark.sql.kafka.artifactId>spark-sql-kafka-0-10_${scala.binary.version}</spark.sql.kafka.artifactId>
                 <spark.version>2.3.2</spark.version>
                 <spark.bigversion>2.3</spark.bigversion>
-                <spark.version.minor>2.3.1</spark.version.minor>
+                <bigdl.spark.version.minor>2.3.1</bigdl.spark.version.minor>
             </properties>
             <modules>
                 <module>streamingpro-spark-2.3.0-adaptor</module>
@@ -323,7 +320,7 @@
                 <spark.sql.kafka.artifactId>spark-sql-kafka-0-10_${scala.binary.version}</spark.sql.kafka.artifactId>
                 <spark.version>2.4.0</spark.version>
                 <spark.bigversion>2.4</spark.bigversion>
-                <spark.version.minor>2.4.0</spark.version.minor>
+                <bigdl.spark.version.minor>2.4.0</bigdl.spark.version.minor>
             </properties>
             <modules>
                 <module>streamingpro-spark-2.4.0-adaptor</module>

diff --git a/streamingpro-bigdl/pom.xml b/streamingpro-bigdl/pom.xml
diff --git a/streamingpro-bigdl/src/main/java/streaming/dsl/mmlib/algs/BigDL.scala b/streamingpro-bigdl/src/main/java/streaming/dsl/mmlib/algs/BigDL.scala
diff --git a/streamingpro-mlsql/pom.xml b/streamingpro-mlsql/pom.xml
@@ -156,6 +156,17 @@
                     <artifactId>streamingpro-spark-2.2.0-adaptor</artifactId>
                     <version>${project.parent.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>com.intel.analytics.bigdl</groupId>
+                    <artifactId>bigdl-SPARK_2.2</artifactId>
+                    <version>0.6.0</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.intel.analytics.zoo</groupId>
+                    <artifactId>analytics-zoo-bigdl_0.6.0-spark_2.2.0</artifactId>
+                    <version>0.3.0</version>
+                </dependency>
+
             </dependencies>
         </profile>
 
@@ -167,6 +178,16 @@
                     <artifactId>streamingpro-spark-2.3.0-adaptor</artifactId>
                     <version>${project.parent.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>com.intel.analytics.bigdl</groupId>
+                    <artifactId>bigdl-SPARK_2.3</artifactId>
+                    <version>0.6.0</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.intel.analytics.zoo</groupId>
+                    <artifactId>analytics-zoo-bigdl_0.6.0-spark_2.3.1</artifactId>
+                    <version>0.3.0</version>
+                </dependency>
             </dependencies>
         </profile>
 
@@ -178,6 +199,16 @@
                     <artifactId>streamingpro-spark-2.4.0-adaptor</artifactId>
                     <version>${project.parent.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>com.intel.analytics.bigdl</groupId>
+                    <artifactId>bigdl-SPARK_2.3</artifactId>
+                    <version>0.6.0</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.intel.analytics.zoo</groupId>
+                    <artifactId>analytics-zoo-bigdl_0.6.0-spark_2.3.1</artifactId>
+                    <version>0.3.0</version>
+                </dependency>
             </dependencies>
         </profile>
 
@@ -283,12 +314,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>streaming.king</groupId>
-            <artifactId>streamingpro-bigdl</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.scalactic</groupId>
             <artifactId>scalactic_${scala.binary.version}</artifactId>