update

liu1028 · Nov 9, 2018 · 9f5a66a · 9f5a66a
1 parent cdb8b7b
commit 9f5a66a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,13 @@ git clone https://github.com/allwefantasy/streamingpro .
 cd streamingpro
 
 ./dev/make-distribution.sh
-export SPARK_HOME="....." ; ./dev/start-local.sh
+
+
+cp streamingpro-bin-1.1.3.tgz /tmp
+cd /tmp && tar xzvf  streamingpro-bin-1.1.3.tgz
+cd /tmp/streamingpro
+
+export SPARK_HOME="....." ; ./start-local.sh
 ```
 
 ## Get Latest PreBuild Package

diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
@@ -6,7 +6,7 @@ mvn install -DskipTests -Pjetty-9 -Pweb-include-jetty-9
 
 cd -
 
-mvn -DskipTests clean package -pl streamingpro-mlsql -am \
+mvn -DskipTests clean package \
 -Pspark-2.3.0 \
 -Pstreamingpro-spark-2.3.0-adaptor \
 -Ponline \
@@ -17,5 +17,4 @@ mvn -DskipTests clean package -pl streamingpro-mlsql -am \
 -Phive-thrift-server \
 -Pautoml \
 -Pxgboost \
--Pcarbondata \
--Popencv-support
+-Pcarbondata
diff --git a/docs/docv2/getting_started/installation.md b/docs/docv2/getting_started/installation.md
@@ -10,7 +10,12 @@ cd streamingpro
 
 ./dev/make-distribution.sh
 
-export SPARK_HOME="....." ; ./dev/start-local.sh
+
+cp streamingpro-bin-1.1.3.tgz /tmp
+cd /tmp && tar xzvf  streamingpro-bin-1.1.3.tgz
+cd /tmp/streamingpro
+
+export SPARK_HOME="....." ; ./start-local.sh
 ```
 
 ## Manually Installation

diff --git a/pom.xml b/pom.xml
@@ -59,6 +59,9 @@
         <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>
         <httpclient.version>4.5.3</httpclient.version>
@@ -182,6 +185,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>
             </properties>
             <modules>
                 <module>streamingpro-spark-2.2.0-adaptor</module>
@@ -250,6 +254,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>
             </properties>
             <modules>
                 <module>streamingpro-spark-2.3.0-adaptor</module>
@@ -318,6 +323,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>
             </properties>
             <modules>
                 <module>streamingpro-spark-2.4.0-adaptor</module>

diff --git a/streamingpro-bigdl/pom.xml b/streamingpro-bigdl/pom.xml
@@ -11,15 +11,10 @@
 
     <artifactId>streamingpro-bigdl</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-SPARK_${spark.bigversion}</artifactId>
-            <version>0.7.0</version>
-        </dependency>
         <dependency>
             <groupId>com.intel.analytics.zoo</groupId>
-            <artifactId>analytics-zoo-bigdl_0.6.0-spark_2.2.0</artifactId>
-            <version>0.2.0</version>
+            <artifactId>analytics-zoo-bigdl_0.7.1-spark_${spark.version.minor}</artifactId>
+            <version>0.3.0</version>
         </dependency>
     </dependencies>