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 0b3df53a95aafd50107a99814893baaa7f5976d8
Author: Kusal Kithul-Godage <kkithulgod...@atlassian.com>
AuthorDate: Mon Jun 26 12:55:26 2023 +1000
Update README.md
---
README.md | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/README.md b/README.md
index ca6366563..e7140fb7f 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+# This branch is an Atlassian fork of Apache Struts
+
+## Updating this branch fork for a new patch release
+
+1. Clone this repo and checkout this branch
+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`
+
+## Creating a new branch fork for a new major/minor release
+
+1. Clone this repo and checkout this branch
+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`
+
+## Releasing a new version
+
+1. Ensure snapshot versions are correct
+2. Ensure that the `scm` and `distributionManagement` sections in `pom.xml`
are correct (consistent with previous
+ 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`
+
+---
The Apache Struts web framework
-------------------------------
