@@ -58,8 +58,13 @@ version number.
58583. Update the version of the Maven artifacts to the full version of the release
5959 ```
6060 mvn versions:set -DnewVersion=1.0.0
61- ```
62- 4. Commit the changes and push the new branch to the GitHub repository
61+ ```
62+ 4. In the [README.md](https://github.com/tensorflow/java/blob/master/README.md) file,
63+ update the ['Using Maven Artifacts'](https://github.com/tensorflow/java/blob/master/README.md#using-maven-artifacts)
64+ section and the ['TensorFlow Version Support'](https://github.com/tensorflow/java/blob/master/README.md#tensorflow-version-support)
65+ table to reflect the new version being released.
66+
67+ 5. Commit the changes and push the new branch to the GitHub repository
6368 ```
6469 git add .
6570 git commit -m "Releasing 1.0.0"
@@ -83,8 +88,13 @@ version number.
83884. Update the version of the Maven artifacts to the full version of the release
8489 ```
8590 mvn versions:set -DnewVersion=1.0.1
86- ```
87- 4. Commit the changes and push the branch to the GitHub repository
91+ ```
92+ 5. In the [README.md](https://github.com/tensorflow/java/blob/master/README.md) file,
93+ update the ['Using Maven Artifacts'](https://github.com/tensorflow/java/blob/master/README.md#using-maven-artifacts)
94+ section and the ['TensorFlow Version Support'](https://github.com/tensorflow/java/blob/master/README.md#tensorflow-version-support)
95+ table to reflect the new version being released.
96+
97+ 6. Commit the changes and push the branch to the GitHub repository
8898 ```
8999 git add .
90100 git commit -m "Releasing 1.0.1"
@@ -109,7 +119,7 @@ To do so, follow the same steps as the [CI build](https://github.com/tensorflow/
109119for the same platform and make sure to checkout the release branch and to provide your Sonatype credentials
110120for temporary staging.
111121
112- ### Building and deploying all artifacts to Sonatype
122+ ### Performing the release
113123
1141241. At the root of your TensorFlow Java copy, create a Maven settings.xml file with your OSSRH credentials and
115125 your GPG key passphrase:
@@ -162,29 +172,53 @@ for temporary staging.
162172 of your release and click `Close` and `Release` to finalize the release. You always have the option
163173 to `Drop` it to abort and restart if something went wrong.
164174
165- 4. Some things of note:
175+ 4. Go to GitHub and create a release tag on the release branch with a summary of what the version includes.
176+
177+ Some things of note:
166178 - For details, look at the [Sonatype guide](http://central.sonatype.org/pages/releasing-the-deployment.html).
167179 - Syncing with [Maven Central](http://repo1.maven.org/maven2/org/tensorflow/)
168180 can take 10 minutes to 2 hours (as per the [OSSRH
169181 guide](http://central.sonatype.org/pages/ossrh-guide.html#releasing-to-central)).
170182
171183### Finishing a release
172184
173- Go to GitHub and create a release tag at the release branch with a summary of what the version includes.
174-
175185#### Major or minor release
176186
177- 1. In your local copy, checkout the master branch and increase the next snapshot version.
187+ 1. Checkout the master branch and merge back changes from the released branch
188+ ```
189+ git checkout master
190+ git merge r1.0
191+ ```
192+ 2. In your local copy, checkout the master branch and increase the next snapshot version.
178193 ```
179194 mvn versions: set -DnewVersion=1.1.0-SNAPSHOT
180195 ```
181- 2. Commit your changes and push the master branch to the GitHub repository
196+ 3. In the [README.md](https://github.com/tensorflow/java/blob/master/README.md) file,
197+ update the ['Using Maven Artifacts'](https://github.com/tensorflow/java/blob/master/README.md#using-maven-artifacts)
198+ section and the ['TensorFlow Version Support'](https://github.com/tensorflow/java/blob/master/README.md#tensorflow-version-support)
199+ table to reflect the new snapshot version.
200+
201+ 4. Commit your changes and push the master branch to the GitHub repository
182202 ```
183203 git add .
184204 git commit -m "Increase version for next iteration"
185205 git push
186206 ```
187207
208+ #### Patch release
209+
210+ 1. Checkout the master branch and merge back changes from the released branch
211+ ```
212+ git checkout master
213+ git merge r1.0
214+ ```
215+ 2. Commit the changes and push the master branch to the GitHub repository
216+ ```
217+ git add .
218+ git commit -m "Merge release 1.0.1"
219+ git push
220+ ```
221+
188222## References
189223
190224- [Sonatype guide](http://central.sonatype.org/pages/ossrh-guide.html) for
0 commit comments