2011/7/26 Mark Derricutt <[email protected]>: > Before cutting the release, I start a new release branch, do the maven > release, then when I'm happy, finish the release branch, THEN push to origin > > $ git flow release start 3.4.5 > $ mvn release:prepare release:perform > $ git flow release finish 3.4.5 > $ git push && git push --tags > > At least thats my work flow. There may be one or two fix up patches before I > finish the release branch, if I need to roll back the release and tweak > something ( I'll git tag -d the maven made tag if things for that far ). > > After the git flow release is finnished, both master and develop sit at the > next -SNAPSHOT version, > this actually works out nice as it means you can then at some point do a "git > flow hotfix start..." > if need be to patch the last release ( which branches from master ).
This breaks the gitflow master definition: "We consider origin/master to be the main branch where the source code of HEAD always reflects a production-ready state." But without this restriction, your process should work. > Master will always be the code at the time the git flow release branch > finished, > it's not necessarily a direct match to your maven repo. It must not match the maven repo, but there should not be a SNAPSHOT-pom on HEAD Also, if I configure the maven-release-plugin with > <pushChanges>false</pushChanges> > <localCheckout>true</localCheckout> the maven release fails with: [...] [INFO] --- maven-release-plugin:2.2:perform (default-cli) @ master --- [INFO] Checking out the project to perform the release ... [INFO] Performing a LOCAL checkout from scm:git:file://D:\dev\projects\maven.master\source\maven.master [INFO] Executing: cmd.exe /X /C "git clone file://D\dev\projects\maven.master\source\maven.master D:\dev\projects\maven.master\source\maven.master\target\checkout" [INFO] Working directory: D:\dev\projects\maven.master\source\maven.master\target [ERROR] The git-clone command failed. [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 58.157s [INFO] Finished at: Wed Jul 27 16:17:26 CEST 2011 [INFO] Final Memory: 5M/247M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.2:perform (default-cli) on project master: Unable to checkout from SCM [ERROR] Provider message: [ERROR] The git-clone command failed. [ERROR] Command output: [ERROR] fatal: 'D\dev\projects\maven.master\source\maven.master' does not appear to be a git repository [ERROR] fatal: The remote end hung up unexpectedly [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException Do I have to make a special configuration on SCM? Regards, Lars --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
