1.1 snapsot prepare (pingcap#342)

R/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: TiSparkR
 Type: Package
 Title: TiSpark for R
-Version: 1.0
+Version: 1.1
 Author: PingCAP
 Maintainer: Novemser <[email protected]>
 Description: A shabby thin layer to support TiSpark in R language.

R/README.md

@@ -6,7 +6,7 @@ A thin layer build for supporting R language with TiSpark
 2. Build or download TiSpark dependency jar `tispark-core-1.0-RC1-jar-with-dependencies.jar` [here](https://github.com/pingcap/tispark).
 3. `cd` to your Spark home directory, and run
 ```
-./bin/sparkR --jars /where-ever-it-is/tispark-core-1.0-RC1-jar-with-dependencies.jar
+./bin/sparkR --jars /where-ever-it-is/tispark-core-${version}-jar-with-dependencies.jar
 ```
 Note that you should replace the `TiSpark` jar path with your own.
 

README.md

@@ -23,7 +23,7 @@ https://github.com/pingcap/tikv-client-lib-java
 
 Uses as below
 ```
-./bin/spark-shell --jars /wherever-it-is/tispark-1.0-RC1-jar-with-dependencies.jar
+./bin/spark-shell --jars /wherever-it-is/tispark-${version}-jar-with-dependencies.jar
 ```
 
 ```

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>1.0-RC1</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.pingcap.tikv</groupId>
             <artifactId>tikv-client</artifactId>
-            <version>1.0-RC1</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.scalaj</groupId>

core/scripts/start-tithriftserver.sh

@@ -23,7 +23,7 @@
 # Enter posix mode for bash
 set -o posix
 
-TISPARK_JAR=tispark-core-1.0-RC1-jar-with-dependencies.jar
+TISPARK_JAR=tispark-core-1.1-SNAPSHOT-jar-with-dependencies.jar
 
 if [ -z "${SPARK_HOME}" ]; then
   export SPARK_HOME="$(cd "`dirname "$0"`"/..; pwd)"

core/scripts/tispark-sql

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-TISPARK_JAR=tispark-1.0-RC1-jar-with-dependencies.jar
+TISPARK_JAR=tispark-1.1-SNAPSHOT-jar-with-dependencies.jar
 
 if [ -z "${SPARK_HOME}" ]; then
   source "$(dirname "$0")"/find-spark-home

core/scripts/version.sh

@@ -15,7 +15,7 @@
 #
 
 
-TiSparkReleaseVersion=`git describe --tags --dirty`
+TiSparkReleaseVersion=1.1-SNAPSHOT
 TiSparkBuildTS=`date -u '+%Y-%m-%d %I:%M:%S'`
 TiSparkGitHash=`git rev-parse HEAD`
 TiSparkGitBranch=`git rev-parse --abbrev-ref HEAD`

docs/userguide.md

@@ -94,14 +94,14 @@ For the  hybrid deployment of TiSpark and TiKV, add the TiSpark required resourc
 
 ## Deploy TiSpark
 
-Download the TiSpark's jar package [here](http://download.pingcap.org/tispark-1.0-RC1-jar-with-dependencies.jar).
+Download the TiSpark's jar package [here](http://download.pingcap.org/tispark-core-${version}-jar-with-dependencies.jar).
 
 ### Deploy TiSpark on the existing Spark cluster
 
 Running TiSpark on an existing Spark cluster does not require a reboot of the cluster. You can use Spark's `--jars` parameter to introduce TiSpark as a dependency:
 
 ```
-Spark-shell --jars $ PATH / tispark-0.1.0.jar
+Spark-shell --jars $ PATH / tispark-core-${version}-jar-with-dependencies.jar
 ```
 
 If you want to deploy TiSpark as a default component, simply place the TiSpark jar package into the jars path for each node of the Spark cluster and restart the Spark cluster:

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.pingcap.tispark</groupId>
     <artifactId>tispark-parent</artifactId>
-    <version>1.0-RC1</version>
+    <version>1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>TiSpark Project Parent POM</name>
     <url>http://github.copm/pingcap/tispark</url>

python/README.md

@@ -46,7 +46,7 @@ This way is generally the same as the first way, but more readable.
 
 3. Run this command in your `SPARK_HOME` directory:
 ```
-./bin/pyspark --jars /where-ever-it-is/tispark-core-1.0-RC1-jar-with-dependencies.jar
+./bin/pyspark --jars /where-ever-it-is/tispark-core-${version}-jar-with-dependencies.jar
 ```
 
 4. Use as below:

python/setup.py

@@ -2,7 +2,7 @@
 setup(
     name = 'pytispark',
     packages = ['pytispark'],
-    version = '1.0-RC1',
+    version = '1.1-SNAPSHOT',
     description = 'TiSpark support for python',
     author = 'PingCAP',
     author_email = '[email protected]',

tikv-client/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>1.0-RC1</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>com.pingcap.tikv</groupId>
     <artifactId>tikv-client</artifactId>
-    <version>1.0-RC1</version>
     <packaging>jar</packaging>
     <name>TiSpark Project TiKV Java Client</name>