This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fork/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b480454ebb750ac80f8a72f630202d573fc39af3
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Sep 4 15:52:13 2023 +1000
Update README.md
---
README.md | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index e7140fb7f..00947a6f1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
2. Add upstream repo as a remote: `git remote add apache
https://github.com/apache/struts.git`
3. Fetch the upstream tags: `git fetch --tags apache`
4. Merge latest patch version tag into this branch, eg. `git merge
STRUTS_2_5_31`
-5. Ensure correct snapshot version, eg. `2.5.31-atlassian-1-SNAPSHOT`
+5. Ensure correct snapshot version, eg. `mvn versions:set
-DnewVersion=2.5.31-atlassian-1-SNAPSHOT`
## Creating a new branch fork for a new major/minor release
@@ -31,11 +31,8 @@
2. Add upstream repo as a remote: `git remote add apache
https://github.com/apache/struts.git`
3. Fetch the upstream tags: `git fetch --tags apache`
4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.2
STRUTS_6_2_0`
-5. Either:
- * Merge previous forked branch into new branch, eg. `git merge
origin/fork/2.5`
- * Cherry-pick desired commits from previous forked branch into new branch,
eg. `git cherry-pick <hash>`. Please
- ensure release related commits are included.
-6. Ensure correct snapshot version, eg. `6.2.0-atlassian-1-SNAPSHOT`
+5. Merge previous forked branch into new branch, eg. `git merge
origin/fork/2.5`
+6. Ensure correct snapshot version, eg. `mvn versions:set
-DnewVersion=6.3.0-atlassian-1-SNAPSHOT`
## Releasing a new version
@@ -44,8 +41,7 @@
releases)
3. Grant yourself Artifactory write permission: `atlas packages permission
grant`
4. Commence release,
- eg. `mvn -B release:clean release:prepare release:perform
-DdevelopmentVersion=6.2.0-atlassian-2-SNAPSHOT`
-5. Push SNAPSHOT update: `git push`
+ eg. `mvn -B release:clean release:prepare release:perform
-DdevelopmentVersion=6.3.0-atlassian-2-SNAPSHOT`
---
The Apache Struts web framework
