Dennis Lundberg wrote:
> Staging repo:
> https://repository.apache.org/content/repositories/maven-068/

The new plugin *almost* solves MRELEASE-458, in that setting updateWorkingCopyVersions=false for release:branch does result in the working copy version being preserved at the end of the release process. However, the POM is changed twice in the SCM, which is bad news for (theoretically unchanging) Subversion tags. This is demonstrated below; I'm happy to provide the repository for debugging.

(There's no difference when remoteTagging=false is set.)

Any chance of a complete fix making it into 2.0 (or a 2.0.1 if necessary)?

[u...@host test-1.0]$ svn log
------------------------------------------------------------------------
r1 | user | 2010-01-30 18:32:55 -0500 (Sat, 30 Jan 2010) | 1 line

Create structure
------------------------------------------------------------------------
r3 | user | 2010-01-30 18:39:24 -0500 (Sat, 30 Jan 2010) | 1 line

[maven-release-plugin]  copy for tag test-1.0
------------------------------------------------------------------------
[u...@host test-1.0]$ mvn org.apache.maven.plugins:maven-release-plugin:2.0:branch -Pstage-release -DbranchName=test-1.0.x -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[INFO] Building Unnamed - test:test:jar:1.0
[INFO] task-segment: [org.apache.maven.plugins:maven-release-plugin:2.0:branch] (aggregator-style)
[INFO] ------------------------------------------------------------------------
[INFO] [release:branch {execution: default-cli}]
[INFO] Verifying that there are no local modifications...
[INFO] Executing: /bin/sh -c cd /home/user/maven-release-test/workspace/tags/test-1.0 && svn --non-interactive status
[INFO] Working directory: /home/user/maven-release-test/workspace/tags/test-1.0
What is the branch version for "Unnamed - test:test:jar:1.0"? (test:test) 1.0-SNAPSHOT: : 1.0.1-SNAPSHOT
[INFO] Transforming 'Unnamed - test:test:jar:1.0'...
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /home/user/maven-release-test/workspace/tags/test-1.0 && svn --non-interactive commit --file /tmp/maven-scm-10105151.commit --targets /tmp/maven-scm-3201128690134211666-targets
[INFO] Working directory: /home/user/maven-release-test/workspace/tags/test-1.0
[INFO] Branching release with the label test-1.0.x...
[INFO] Executing: /bin/sh -c cd /home/user/maven-release-test/workspace/tags/test-1.0 && svn --non-interactive copy --file /tmp/maven-scm-863886993.commit --revision 5 file:///home/user/maven-release-test/repo/tags/test-1.0 file:///home/user/maven-release-test/repo/branches/test-1.0.x
[INFO] Working directory: /home/user/maven-release-test/workspace/tags/test-1.0
[INFO] Transforming 'Unnamed - test:test:jar:1.0'...
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /home/user/maven-release-test/workspace/tags/test-1.0 && svn --non-interactive commit --file /tmp/maven-scm-3538189.commit --targets /tmp/maven-scm-924231627774381511-targets
[INFO] Working directory: /home/user/maven-release-test/workspace/tags/test-1.0
[INFO] Release preparation complete.
[INFO] Cleaning up after release...
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESSFUL
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 14 seconds
[INFO] Finished at: Sat Jan 30 18:44:52 EST 2010
[INFO] Final Memory: 23M/298M
[INFO] ------------------------------------------------------------------------
[u...@host test-1.0]$ svn log
------------------------------------------------------------------------
r7 | user | 2010-01-30 18:44:51 -0500 (Sat, 30 Jan 2010) | 1 line

[maven-release-plugin] prepare release test-1.0.x
------------------------------------------------------------------------
r5 | user | 2010-01-30 18:44:50 -0500 (Sat, 30 Jan 2010) | 1 line

[maven-release-plugin] prepare branch test-1.0.x
------------------------------------------------------------------------
r3 | user | 2010-01-30 18:39:24 -0500 (Sat, 30 Jan 2010) | 1 line

[maven-release-plugin]  copy for tag test-1.0
------------------------------------------------------------------------
r1 | user | 2010-01-30 18:32:55 -0500 (Sat, 30 Jan 2010) | 1 line

Create structure
------------------------------------------------------------------------
[u...@host test-1.0]$ svn diff -r3 pom.xml
[u...@host test-1.0]$

--
Sometimes the Universe needs a change of perspective.
  --J. Michael Straczynski

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to