Simplify build and contribution process back to master/trunk development

2 files changed, 4 insertions, 38 deletions

diff --git a/README.markdown b/README.markdown
index f4b572bc..53776f8a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -31,27 +31,7 @@ Getting help
 Contributing

 ------------

 

-GitHub pull requests or Gitblit Tickets are preferred.  Any contributions must be distributed under the terms of the [Apache Software Foundation license, version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

-

-**Workflow**

-

-Gitblit practices the [git-flow][1] branching model.

-

-- **master** is the current stable release + fixes accumulated since release.

-- **develop** is the integration branch for the next major release.

-- **ticket/N** are feature or hotfix branches to be merged to **master** or **develop**, as appropriate.

-

-**Feature Development**

-

-Development of new features is mostly done using [Gitblit Tickets][2] hosted at [dev.gitblit.com][3].  This allows continuous dogfooding and improvement of Gitbit's own issue-tracker and pull-request mechanism.

-

-**Release Planning**

-

-Release planning is mostly done using Gitblit Milestones and Gitblit Tickets hosted at [dev.gitblit.com][3].

-

-**Releasing**

-

-When Gitblit is preparing for a release, a **release-{milestone}** branch will be created, tested, & fixed until it is ready to be merged to **master** and tagged as the next major release.  After the release is tagged, the **release-{milestone}** branch will also be merged back into **develop** and then the release branch will be removed.

+GitHub pull requests are preferred.  Any contributions must be distributed under the terms of the [Apache Software Foundation license, version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

 

 Building Gitblit

 ----------------

@@ -75,6 +55,3 @@ Building Tips & Tricks
 1. If you are running Ant from an ANSI-capable console, consider setting the `MX_COLOR` environment variable before executing Ant.<pre>set MX_COLOR=true</pre>

 2. The build script will honor your Maven proxy settings.  If you need to fine-tune this, please review the [settings.moxie](http://gitblit.github.io/moxie/settings.html) documentation.

 

-[1]: http://nvie.com/posts/a-successful-git-branching-model

-[2]: http://gitblit.com/tickets_overview.html

-[3]: https://dev.gitblit.com

diff --git a/release.template b/release.template
index 0fd61c56..13225190 100644
--- a/release.template
+++ b/release.template
@@ -60,23 +60,12 @@ ant publishSite
 # merge to master
 echo ""
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "Merging release ${project.version} to master"
+echo "Updating build identifier for next release cycle"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout master
-git merge --no-ff -m "Merge release ${project.version}" ${project.commitId}
 ant nextPointReleaseCycle
 
-# merge to develop
-echo ""
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "Merging release ${project.version} to develop"
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo ""
-git checkout develop
-git merge --no-ff -m "Merge release ${project.version}" ${project.commitId}
-ant nextMinorReleaseCycle
-
 # push Maven repository to origin
 echo ""
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -90,7 +79,7 @@ cd ${project.directory}
 # push project branches
 echo ""
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "Pushing master, develop, gh-pages, and tag ${project.tag}"
+echo "Pushing master, gh-pages, and tag ${project.tag}"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
-git push origin master develop gh-pages ${project.tag}
+git push origin master gh-pages ${project.tag}