diff --git a/README.md b/README.md index 0dbb5f84..f5fc2e24 100644 --- a/README.md +++ b/README.md @@ -34,37 +34,37 @@ com.aliyun.emr emr-maxcompute_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-logservice_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-tablestore - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-ons_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-mns_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-core - 1.5.0-SNAPSHOT + 1.5.0 ``` diff --git a/core/pom.xml b/core/pom.xml index 3ec5ebfd..029a8259 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.aliyun.emr emr_2.11 - 1.5.0-SNAPSHOT + 1.5.0 ../pom.xml 4.0.0 diff --git a/docs/HadoopMR-on-TableStore.md b/docs/HadoopMR-on-TableStore.md index 63b8b058..2f680db1 100644 --- a/docs/HadoopMR-on-TableStore.md +++ b/docs/HadoopMR-on-TableStore.md @@ -111,7 +111,7 @@ OK, let the program run. ``` $ rm -rf out -$ HADOOP_CLASSPATH=emr-tablestore-1.5.0-SNAPSHOT.jar:tablestore-4.1.0-jar-with-dependencies.jar::joda-time-2.9.4.jar:YourRowCounter.jar bin/hadoop YourRowCounterClass +$ HADOOP_CLASSPATH=emr-tablestore-1.5.0.jar:tablestore-4.1.0-jar-with-dependencies.jar::joda-time-2.9.4.jar:YourRowCounter.jar bin/hadoop YourRowCounterClass ... $ find out -type f out/_SUCCESS @@ -122,7 +122,7 @@ $ cat out/part-r-00000 TOTAL 9 ``` -FYI, in emr-examples_2.11-1.5.0-SNAPSHOT.jar, we provides an executable row-counting program, `com.aliyun.openservices.tablestore.hadoop.RowCounter`. +FYI, in emr-examples_2.11-1.5.0.jar, we provides an executable row-counting program, `com.aliyun.openservices.tablestore.hadoop.RowCounter`. ## TableStore as Data Sink diff --git a/docs/Hive-SparkSQL-on-TableStore.md b/docs/Hive-SparkSQL-on-TableStore.md index 0c5e1bfa..ce6081e0 100644 --- a/docs/Hive-SparkSQL-on-TableStore.md +++ b/docs/Hive-SparkSQL-on-TableStore.md @@ -5,13 +5,13 @@ ### Hive CLI ``` -$ HADOOP_HOME=YourHadoopDir HADOOP_CLASSPATH=emr-tablestore-1.5.0-SNAPSHOT.jar:tablestore-4.1.0-jar-with-dependencies.jar:joda-time-2.9.4.jar bin/hive +$ HADOOP_HOME=YourHadoopDir HADOOP_CLASSPATH=emr-tablestore-1.5.0.jar:tablestore-4.1.0-jar-with-dependencies.jar:joda-time-2.9.4.jar bin/hive ``` ### SparkSQL CLI ``` -$ bin/spark-sql --master local --jars emr-tablestore-1.5.0-SNAPSHOT.jar,tablestore-4.1.0-jar-with-dependencies.jar +$ bin/spark-sql --master local --jars emr-tablestore-1.5.0.jar,tablestore-4.1.0-jar-with-dependencies.jar ``` diff --git a/docs/Spark-on-TableStore.md b/docs/Spark-on-TableStore.md index 12b84b27..e6f35f0f 100644 --- a/docs/Spark-on-TableStore.md +++ b/docs/Spark-on-TableStore.md @@ -72,10 +72,10 @@ If you prefer to scala, please replace `JavaSparkContext` to `SparkContext` and Let it run. ``` -$ bin/spark-submit --master local --jars emr-tablestore-1.5.0-SNAPSHOT.jar,tablestore-4.1.0-jar-with-dependencies.jar YourRowCounter.jar +$ bin/spark-submit --master local --jars emr-tablestore-1.5.0.jar,tablestore-4.1.0-jar-with-dependencies.jar YourRowCounter.jar TOTAL: 9 ``` FYI, * for more details about `TableStoreInputFormat`, please refer to (HadoopMR-on-TableStore.md). -* in emr-examples_2.11-1.5.0-SNAPSHOT.jar, we provides an executable row-counting program, `com.aliyun.openservices.tablestore.spark.RowCounter`. +* in emr-examples_2.11-1.5.0.jar, we provides an executable row-counting program, `com.aliyun.openservices.tablestore.spark.RowCounter`. diff --git a/docs/how_to_run_spark_with_python_sdk.md b/docs/how_to_run_spark_with_python_sdk.md index bda55c10..a639e5ee 100644 --- a/docs/how_to_run_spark_with_python_sdk.md +++ b/docs/how_to_run_spark_with_python_sdk.md @@ -26,13 +26,13 @@ Bellow document will show you how to use Loghub (ODPS, ONS, MNS and so on) in py ## LogService 1. download the [**loghub.py**](https://github.com/aliyun/aliyun-emapreduce-sdk/blob/master-2.x/external/emr-logservice/src/main/python/pyspark/streaming/loghub.py); -2. download the pre-build [**emr-logservice_2.11-1.5.0-SNAPSHOT.jar**](http://central.maven.org/maven2/com/aliyun/emr/emr-logservice_2.11/1.5.0-SNAPSHOT/emr-logservice_2.11-1.5.0-SNAPSHOT.jar); +2. download the pre-build [**emr-logservice_2.11-1.5.0.jar**](http://central.maven.org/maven2/com/aliyun/emr/emr-logservice_2.11/1.5.0/emr-logservice_2.11-1.5.0.jar); 3. download loghub's dependencies, i.e. [**fastjson-1.2.23.jar**](http://mvnrepository.com/artifact/com.alibaba/fastjson/1.2.23), [**commons-validator-1.4.0.jar**](http://mvnrepository.com/artifact/commons-validator/commons-validator/1.4.0), [**loghub-client-lib-0.6.7.jar**](http://mvnrepository.com/artifact/com.aliyun.openservices/loghub-client-lib/0.6.7), [**aliyun-log-0.6.7.jar**](http://mvnrepository.com/artifact/com.aliyun.openservices/aliyun-log/0.6.7), [**json-lib-2.4-jdk15.jar**](http://central.maven.org/maven2/net/sf/json-lib/json-lib/2.4/json-lib-2.4-jdk15.jar). Above-mentioned library version pass test; 4. download [**loghub-wordcount.py**](https://github.com/aliyun/aliyun-emapreduce-sdk/blob/master-2.x/examples/src/main/python/streaming/loghub-wordcount.py); 5. run the example, use ``` spark-submit --master local[4] --jars fastjson-1.2.23.jar,commons-validator-1.4.0.jar, -emr-logservice_2.11-1.5.0-SNAPSHOT.jar,loghub-client-lib-0.6.7.jar,aliyun-log-0.6.7.jar,json-lib-2.4-jdk15.jar +emr-logservice_2.11-1.5.0.jar,loghub-client-lib-0.6.7.jar,aliyun-log-0.6.7.jar,json-lib-2.4-jdk15.jar --py-files loghub.py loghub-wordcount.py ``` @@ -40,12 +40,12 @@ emr-logservice_2.11-1.5.0-SNAPSHOT.jar,loghub-client-lib-0.6.7.jar,aliyun-log-0. ## ODPS 1. download the [**odps.py**](https://github.com/aliyun/aliyun-emapreduce-sdk/blob/master-2.x/external/emr-maxcompute/src/main/python/pyspark/odps.py); -2. download the pre-build [**emr-maxcompute_2.11-1.5.0-SNAPSHOT.jar**](http://central.maven.org/maven2/com/aliyun/emr/emr-maxcompute_2.11/1.5.0-SNAPSHOT/emr-maxcompute_2.10-1.5.0-SNAPSHOT.jar); +2. download the pre-build [**emr-maxcompute_2.11-1.5.0.jar**](http://central.maven.org/maven2/com/aliyun/emr/emr-maxcompute_2.11/1.5.0/emr-maxcompute_2.10-1.5.0.jar); 3. download odps's dependencies, i.e. [**fastjson-1.2.23.jar**](http://mvnrepository.com/artifact/com.alibaba/fastjson/1.2.23), [**aspectjrt-1.8.2.jar**](http://mvnrepository.com/artifact/org.aspectj/aspectjrt/1.8.2), [**odps-sdk-commons-0.27.2-public.jar**](http://mvnrepository.com/artifact/com.aliyun.odps/odps-sdk-commons/0.27.2-public), [**odps-sdk-core-0.27.2-public.jar**](http://mvnrepository.com/artifact/com.aliyun.odps/odps-sdk-core/0.27.2-public). Above-mentioned library version pass test; 4. download [**odps-sample.py**](https://github.com/aliyun/aliyun-emapreduce-sdk/blob/master/examples/src/main/python/odps-sample.py); 5. run the example, use ``` - spark-submit --master local[4] --jars fastjson-1.2.23.jar,aspectjrt-1.8.2.jar,emr-maxcompute_2.11-1.5.0-SNAPSHOT.jar, + spark-submit --master local[4] --jars fastjson-1.2.23.jar,aspectjrt-1.8.2.jar,emr-maxcompute_2.11-1.5.0.jar, odps-sdk-commons-0.27.2-public.jar,odps-sdk-core-0.27.2-public.jar --py-files odps.py odps-sample.py ``` diff --git a/docs/manual.md b/docs/manual.md index 33f8a5e6..dd0b9dbe 100644 --- a/docs/manual.md +++ b/docs/manual.md @@ -31,37 +31,37 @@ com.aliyun.emr emr-maxcompute_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-logservice_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-tablestore - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-ons_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-mns_2.11 - 1.5.0-SNAPSHOT + 1.5.0 com.aliyun.emr emr-core - 1.5.0-SNAPSHOT + 1.5.0 ``` diff --git a/examples/pom.xml b/examples/pom.xml index 4b29d7b5..f0b20606 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ com.aliyun.emr emr_2.11 - 1.5.0-SNAPSHOT + 1.5.0 ../pom.xml diff --git a/external/emr-datahub/pom.xml b/external/emr-datahub/pom.xml index ebbad719..c60eb954 100644 --- a/external/emr-datahub/pom.xml +++ b/external/emr-datahub/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-dts/pom.xml b/external/emr-dts/pom.xml index b63e07d6..fc890d68 100644 --- a/external/emr-dts/pom.xml +++ b/external/emr-dts/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-kafka/pom.xml b/external/emr-kafka/pom.xml index a41ca355..3c5072fe 100644 --- a/external/emr-kafka/pom.xml +++ b/external/emr-kafka/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-logservice/pom.xml b/external/emr-logservice/pom.xml index 5e7c4f37..1c7f1eab 100644 --- a/external/emr-logservice/pom.xml +++ b/external/emr-logservice/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-logservice/src/main/python/pyspark/streaming/loghub.py b/external/emr-logservice/src/main/python/pyspark/streaming/loghub.py index f39ab54f..b92cb554 100644 --- a/external/emr-logservice/src/main/python/pyspark/streaming/loghub.py +++ b/external/emr-logservice/src/main/python/pyspark/streaming/loghub.py @@ -161,4 +161,4 @@ def _printErrorMsg(): ________________________________________________________________________________________________ -""" % ('1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT')) \ No newline at end of file +""" % ('1.5.0', '1.5.0', '1.5.0')) \ No newline at end of file diff --git a/external/emr-maxcompute/pom.xml b/external/emr-maxcompute/pom.xml index 596e7646..1ded625b 100644 --- a/external/emr-maxcompute/pom.xml +++ b/external/emr-maxcompute/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-maxcompute/src/main/python/pyspark/odps.py b/external/emr-maxcompute/src/main/python/pyspark/odps.py index f4f5e89e..50ed7049 100644 --- a/external/emr-maxcompute/src/main/python/pyspark/odps.py +++ b/external/emr-maxcompute/src/main/python/pyspark/odps.py @@ -141,4 +141,4 @@ def _printErrorMsg(): ________________________________________________________________________________________________ -""" % ('1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT')) +""" % ('1.5.0', '1.5.0', '1.5.0')) diff --git a/external/emr-mns/pom.xml b/external/emr-mns/pom.xml index bdee8aff..e81f0bbc 100644 --- a/external/emr-mns/pom.xml +++ b/external/emr-mns/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-mns/src/main/python/pyspark/streaming/mns.py b/external/emr-mns/src/main/python/pyspark/streaming/mns.py index accd0936..ee3a6763 100644 --- a/external/emr-mns/src/main/python/pyspark/streaming/mns.py +++ b/external/emr-mns/src/main/python/pyspark/streaming/mns.py @@ -96,4 +96,4 @@ def _printErrorMsg(): ________________________________________________________________________________________________ -""" % ('1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT')) \ No newline at end of file +""" % ('1.5.0', '1.5.0', '1.5.0')) \ No newline at end of file diff --git a/external/emr-ons/pom.xml b/external/emr-ons/pom.xml index aaac3457..984e92ce 100644 --- a/external/emr-ons/pom.xml +++ b/external/emr-ons/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/external/emr-ons/src/main/python/pyspark/streaming/ons.py b/external/emr-ons/src/main/python/pyspark/streaming/ons.py index dd416bec..b3db518f 100644 --- a/external/emr-ons/src/main/python/pyspark/streaming/ons.py +++ b/external/emr-ons/src/main/python/pyspark/streaming/ons.py @@ -73,4 +73,4 @@ def _printErrorMsg(): ________________________________________________________________________________________________ -""" % ('1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT', '1.5.0-SNAPSHOT')) \ No newline at end of file +""" % ('1.5.0', '1.5.0', '1.5.0')) \ No newline at end of file diff --git a/external/emr-tablestore/pom.xml b/external/emr-tablestore/pom.xml index c32981aa..e78e7ac6 100644 --- a/external/emr-tablestore/pom.xml +++ b/external/emr-tablestore/pom.xml @@ -5,7 +5,7 @@ emr_2.11 com.aliyun.emr - 1.5.0-SNAPSHOT + 1.5.0 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index db2c237d..cd664d6c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.aliyun.emr emr_2.11 - 1.5.0-SNAPSHOT + 1.5.0 pom Aliyun E-MapReduce Root