diff --git a/README.md b/README.md index 12670511fb..c399779e0e 100755 --- a/README.md +++ b/README.md @@ -11,15 +11,15 @@ TiSpark is a thin layer built for running Apache Spark on top of TiDB/TiKV to an Read the [Quick Start](./docs/userguide.md). ## Getting TiSpark -The current stable version is **TiSpark 2.1** which is compatible with **Spark 2.3.0+** and **Spark 2.4.0+**. +The current stable version is **TiSpark 2.1.1** which is compatible with **Spark 2.3.0+** and **Spark 2.4.0+**. The latest stable version compatible with **Spark 2.1.0+** is **TiSpark 1.2** **When using TiSpark 1.2, please follow the [document for Spark 2.1](./docs/userguide_spark2.1.md)** -**When using TiSpark 2.1 with Spark 2.3.0+, please use version `2.1-spark_2.3` and follow the [document for Spark 2.3+](./docs/userguide.md)** +**When using TiSpark 2.1.1 with Spark 2.3.0+, please use version `2.1.1-spark_2.3` and follow the [document for Spark 2.3+](./docs/userguide.md)** -**When using TiSpark 2.1 with Spark 2.4.0+, please use version `2.1-spark_2.4` and follow the [document for Spark 2.3+](./docs/userguide.md)** +**When using TiSpark 2.1.1 with Spark 2.4.0+, please use version `2.1.1-spark_2.4` and follow the [document for Spark 2.3+](./docs/userguide.md)** You may also [build from sources](#how-to-build-from-sources) to try the new features on TiSpark master branch. @@ -29,7 +29,7 @@ If you are using maven(recommended), add the following to your pom.xml: com.pingcap.tispark tispark-core - 2.1-spark_${spark.version} + 2.1.1-spark_${spark.version} ``` @@ -70,7 +70,7 @@ While TiSpark provides downward compatibility for TiDB, it guarantees **restrict | ----- | ------ | | 1.x | Spark v2.1.0+ | | 2.0 | Spark v2.3.0+ | -| 2.1 | Spark v2.3.0+, Spark v2.4.0+ | +| 2.1.x | Spark v2.3.0+, Spark v2.4.0+ | | Latest (master) | Spark v2.3.0+, Spark v2.4.0+ | ## How to migrate from Spark 2.1 to Spark 2.3/2.4 diff --git a/core/pom.xml b/core/pom.xml index 7b0695996b..dd5abc269c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 2.1 + 2.1.1 ../pom.xml diff --git a/core/scripts/version.sh b/core/scripts/version.sh index 222673e017..074f339a3f 100755 --- a/core/scripts/version.sh +++ b/core/scripts/version.sh @@ -15,7 +15,7 @@ # cd .. -TiSparkReleaseVersion=2.1 +TiSparkReleaseVersion=2.1.1 TiSparkBuildTS=`date -u '+%Y-%m-%d %I:%M:%S'` TiSparkGitHash=`git rev-parse HEAD` TiSparkGitBranch=`git rev-parse --abbrev-ref HEAD` diff --git a/pom.xml b/pom.xml index 1484f48ced..6164e21d0e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.pingcap.tispark tispark-parent - 2.1 + 2.1.1 pom TiSpark Project Parent POM http://github.copm/pingcap/tispark diff --git a/tikv-client/pom.xml b/tikv-client/pom.xml index 420fcc37db..3ae4b62c1e 100644 --- a/tikv-client/pom.xml +++ b/tikv-client/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 2.1 + 2.1.1 ../pom.xml