Modify final steps of release

release/release_guide.md

@@ -374,36 +374,33 @@ Once the release candidate has been reviewed and approved by the community, the
 
 ## Current follow the below steps to finalize the release.
 
-1. Drop all RC orgapachextable-XXX in [Apache Nexus Staging Repositories](https://repository.apache.org/#stagingRepositories).
-2. change the version from ${RELEASE_VERSION}-rc${RC_NUM} to ${RELEASE_VERSION} against release branch, use command `mvn versions:set -DnewVersion=${RELEASE_VERSION}`, e.g. change 0.5.1-rc1 to 0.5.1.
-3. Commit and push the version change to release branch.
+1. Drop all RC orgapachextable-XXX in [Apache Nexus Staging Repositories](https://repository.apache.org/#stagingRepositories) that haven't been approved.
+2. Checkout to the release branch for the approved rc and move it to one without the rc suffix. Eg: `release-0.1.0-incubating-rc4 to release-0.1.0-incubating`
     1. git commit -am "[MINOR] Update release version to reflect published version  ${RELEASE_VERSION}"
     2. git push origin release-${RELEASE_VERSION}
-4. Repeat the steps from **_Generate Source Release (f) to Stage source releases on [dist.apache.org](http://dist.apache.org/) (i)_**. Including staging jars with the release version and uploading source release.
-   > **Note that make sure remove the -rc${RC_NUM} suffix when repeat the above steps. and please also verify the steps.  Ensure git tag is also done without -rc${RC_NUM}**
-5. One more step is to [deploy source code to release](https://www.apache.org/legal/release-policy.html#upload-ci) dist. [https://dist.apache.org/repos/dist/release/incubator/xtable](https://dist.apache.org/repos/dist/release/incubator/xtable).
-   Only PMC will have access to this repo. So, if you are not a PMC, do get help from somone who is.
+3. Copy the source distributions for the approved release candidate from https://dist.apache.org/repos/dist/dev/incubator/xtable/ to https://dist.apache.org/repos/dist/release/incubator
+   Only PMC will have access to this repo. So, if you are not a PMC, do get help from someone who is.
     1. svn checkout https://dist.apache.org/repos/dist/release/incubator/xtable --depth=immediates, if you would not checkout, please try svn checkout https://dist.apache.org/repos/dist/release/incubator/xtable again.
     2. Make a directory for the new release:
        ```shell
-       mkdir incubator-xtable/${RELEASE_VERSION}
+       mkdir xtable/${RELEASE_VERSION}
        ```
     3. Copy incubator-xtable source distributions, hashes, and GPG signature:
        ```shell
-       mv <incubator-xtable-dir>/src_release/* incubator-xtable/${RELEASE_VERSION}
+       mv <svn-dev-xtable-dir>/approved-rcX/* xtable/${RELEASE_VERSION}
        ```
     4. Add and commit all the files.
        ```shell
-       cd incubator-xtable
+       cd xtable
        svn add ${RELEASE_VERSION}
        svn commit
        ```
-    5. Verify that files are [present](https://dist.apache.org/repos/dist/release/incubator/xtable)
-6. Use the Apache Nexus repository to release the staged binary artifacts to the Maven Central repository. In the Staging Repositories section, find the relevant release candidate orgapachextable-XXX entry and click `Release`.
+    5. Verify that files are [present](https://dist.apache.org/repos/dist/release/xtable)
+4. Use the Apache Nexus repository to release the staged binary artifacts to the Maven Central repository. In the Staging Repositories section, find the relevant release candidate orgapachextable-XXX entry and click `Release`.
    > Note: make sure and check you click `Release` repo, it cannot be withdrawn.
-7. Drop all other release candidates that are not being released. It can take up to 24 hours for the new release to show up in [Maven Central repository](https://search.maven.org/search?q=g:org.apache.xtable).
-8. Finalize the Release in GH by providing the release date.
-9. Update [DOAP]
+5. Drop all other release candidates that are not being released. It can take up to 24 hours for the new release to show up in [Maven Central repository](https://search.maven.org/search?q=g:org.apache.xtable).
+6. Finalize the Release in GH by providing the release date.
+7. Update [DOAP]
 
 # Promote the release