Skip to content

Commit

Permalink
release 2.1.1 (#886)
Browse files Browse the repository at this point in the history
  • Loading branch information
marsishandsome authored Jul 2, 2019
1 parent 3997740 commit 7f6cf04
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -29,7 +29,7 @@ If you are using maven(recommended), add the following to your pom.xml:
<dependency>
<groupId>com.pingcap.tispark</groupId>
<artifactId>tispark-core</artifactId>
<version>2.1-spark_${spark.version}</version>
<version>2.1.1-spark_${spark.version}</version>
</dependency>
</dependencies>
```
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.pingcap.tispark</groupId>
<artifactId>tispark-parent</artifactId>
<version>2.1</version>
<version>2.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.pingcap.tispark</groupId>
<artifactId>tispark-parent</artifactId>
<version>2.1</version>
<version>2.1.1</version>
<packaging>pom</packaging>
<name>TiSpark Project Parent POM</name>
<url>http://github.copm/pingcap/tispark</url>
Expand Down
2 changes: 1 addition & 1 deletion tikv-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.pingcap.tispark</groupId>
<artifactId>tispark-parent</artifactId>
<version>2.1</version>
<version>2.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 7f6cf04

Please sign in to comment.