You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2021/01/07 07:20:05 UTC
[incubator-sedona] branch master updated: Revert "Update docs"
This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sedona.git
The following commit(s) were added to refs/heads/master by this push:
new 0f57797 Revert "Update docs"
0f57797 is described below
commit 0f577971e85c06056eae094d5751493286ef6284
Author: Jia Yu <ji...@apache.org>
AuthorDate: Wed Jan 6 23:19:47 2021 -0800
Revert "Update docs"
This reverts commit 4161e8491021e65b5a613a0e134e405ec018014a.
---
docs/download/compile.md | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/docs/download/compile.md b/docs/download/compile.md
index e1915c9..1ac83b9 100644
--- a/docs/download/compile.md
+++ b/docs/download/compile.md
@@ -212,15 +212,16 @@ Now let's repeat the process to other Sedona modules.
```bash
python3 spark-version-converter.py spark2
```
-2. Prepare a release. Note that: release id: ==1.0.0-incubator==, scm tag id: ==sedona-1.0.0-incubator== (this is just an example. Please use the correct version number)
+2. Manuallly commit the changes of the three scala files to GitHub
+3. Prepare a release. Note that: release id: ==1.0.0-incubator==, scm tag id: ==sedona-1.0.0-incubator== (this is just an example. Please use the correct version number)
```bash
mvn clean release:prepare -DautoVersionSubmodules=true -Dresume=false -DcheckModificationExcludeList=sql/src/main/scala/org/apache/sedona/sql/UDF/UdfRegistrator.scala,sql/src/main/scala/org/apache/spark/sql/sedona_sql/strategy/join/JoinQueryDetector.scala,sql/src/main/scala/org/apache/spark/sql/sedona_sql/strategy/join/TraitJoinQueryExec.scala -Darguments="-DskipTests -Dscala=2.11 -Dspark=2.4"
```
-3. Stage a release
+4. Stage a release
```bash
mvn clean release:perform -DautoVersionSubmodules=true -Dresume=false -Darguments="-DskipTests -Dscala=2.11 -Dspark=2.4"
```
-4. Delete the scm tag on GitHub and we will only keep the tag created by the last compilation target.
+5. Delete the scm tag on GitHub and we will only keep the tag created by the last compilation target.
#### For Spark 2.4 and Scala 2.12
@@ -230,17 +231,18 @@ Step 1 and 2 are only needed if you didn't run the previous step before
```bash
python3 spark-version-converter.py spark2
```
-2. Prepare a release: release id: ==1.0.0-incubator==, scm tag id: ==sedona-1.0.0-incubator== (this is just an example. Please use the correct version number)
+2. ==Manuallly commit the changes of the three scala files to GitHub==
+3. Prepare a release: release id: ==1.0.0-incubator==, scm tag id: ==sedona-1.0.0-incubator== (this is just an example. Please use the correct version number)
```bash
mvn clean release:prepare -DautoVersionSubmodules=true -Dresume=false -DcheckModificationExcludeList=sql/src/main/scala/org/apache/sedona/sql/UDF/UdfRegistrator.scala,sql/src/main/scala/org/apache/spark/sql/sedona_sql/strategy/join/JoinQueryDetector.scala,sql/src/main/scala/org/apache/spark/sql/sedona_sql/strategy/join/TraitJoinQueryExec.scala -Darguments="-DskipTests -Dscala=2.12 -Dspark=2.4"
```
-3. Stage a release
+4. Stage a release
```bash
mvn clean release:perform -DautoVersionSubmodules=true -Dresume=false -Darguments="-DskipTests -Dscala=2.12 -Dspark=2.4"
```
!!!warning
- After staged the three releases, you will see 6 [maven-release-plugin] commits and 1 more tag in Sedona GitHub repo.
+ After staged the three releases, you need to manually revert the commited three scala files. You will see 6 [maven-release-plugin] commits and 1 more tag in Sedona GitHub repo.
### Close the staging repo
1. Check the status of the staging repo: [Locate and Examine Your Staging Repository