[MRELEASE-516] release:prepare should support a nested/flat hybrid SCM structure

• Type: Improvement
• Status: Closed
• Priority: Major
• Resolution: Auto Closed
• Affects Version/s: 2.0-beta-9
• Component/s: perform, prepare
• Environment: OS X 10.5.8, Windows XP Prof, JDK 1.5.0_12, SVN, GIT, CVS
• Assignee: Unassigned
• Reporter: Eric Miles
• Created: 20/Jan/10 08:03
• Updated: 12/Jan/16 20:12
• Resolved: 12/Jan/16 20:12

Description

This issue is related to MRELEASE-261 in that release prepare is having some difficulty in dealing with certain SCM structures during the prepare goal. Our project structure is flat as you would see in a typical IDE setup:

release-workspace\
        |
        |--release-parent
        |    |+pom.xml (modules: ../release-module1, ../release-module2)
        |
        |--release-module1
        |    |+pom.xml (parent: ../release-parent)
        |
        |--release-module2
             |+pom.xml (parent: ../release-parent)

Our SCM (svn) structure is as follows:

svnroot
|
+--release-parent/trunk/pom.xml
+--release-parent/tags/release-parent-1.0.9/pom.xml
|
+--release-module1/trunk/pom.xml
+--release-module1/tags/release-module1-1.0.9/pom.xml
|
+--release-module1/trunk/pom.xml
+--release-module2/tags/release-module2-1.0.9/pom.xml

If we execute release:prepare with no configuration to the release plugin, we get the following error:

[INFO] [INFO] ------------------------------------------------------------------------
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /Users/emiles/Projects/release-workspace/release-parent && svn --non-interactive commit --file /var/folders/fH/fHNZYBGdFd0bMMIPiloA2U+++TI/-Tmp-/maven-scm-1253932520.commit --targets /var/folders/fH/fHNZYBGdFd0bMMIPiloA2U+++TI/-Tmp-/maven-scm-4376558781490229966-targets
[INFO] Working directory: /Users/emiles/Projects/release-workspace/release-parent
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Unable to commit files
Provider message:
The svn command failed.
Command output:
svn: '/Users/emiles/Projects/release-workspace' is not a working copy

If we use the 2.0-beta-10-SNAPSHOT with flat project support and provide the -DcommitByProject=true JVM parameter, we do not get any errors, however tagging does not happen as expected. Rather than having tags for each of the projects, some odd tagging happened at the parent level where an entire structure was created (with branches, tags and trunk under the tag folder). I'm attaching a screen shot for reference.

Ignoring the fact that the prepare only somewhat worked, when I attempted to perform the release, I get an error:

emiles-macbook:release-parent emiles$ mvn release:perform -DcommitByProject=true
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   Unnamed - com.captechventures:release-parent:pom:0.0.3-SNAPSHOT
[INFO]   Unnamed - com.captechventures:release-module1:jar:0.0.3-SNAPSHOT
[INFO]   Unnamed - com.captechventures:release-module2:jar:0.0.3-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Building Unnamed - com.captechventures:release-parent:pom:0.0.3-SNAPSHOT
[INFO]    task-segment: [release:perform] (aggregator-style)
[INFO] ------------------------------------------------------------------------
[INFO] [release:perform {execution: default-cli}]
[INFO] Checking out the project to perform the release ...
[INFO] Executing: /bin/sh -c cd /Users/emiles/Projects/release-workspace/release-parent/target && svn --non-interactive checkout http://localhost/dev/release-parent/tags/release-parent-0.0.2 /Users/emiles/Projects/release-workspace/release-parent/target/checkout
[INFO] Working directory: /Users/emiles/Projects/release-workspace/release-parent/target
[INFO] Executing goals 'deploy'...
[WARNING] Base directory is a file. Using base directory as POM location.
[WARNING] Maven will be executed in interactive mode, but no input stream has been configured for this MavenInvoker instance.
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Error executing Maven.

Working directory "/Users/emiles/Projects/release-workspace/release-parent/target/checkout/Users/emiles/Projects/release-workspace/release-parent" does not exist!
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 5 seconds
[INFO] Finished at: Mon Jan 04 12:22:31 EST 2010
[INFO] Final Memory: 11M/20M
[INFO] ------------------------------------------------------------------------

Although this isn't the flat model as identifed in MRELEASE-261, I feel this flat structure should be supported as all the relevant SCM metadata is included in each POM so the plugin should have no difficulty determining where to check stuff into SCM.

Issue Links

• is related to: MRELEASE-138 release:prepare fails when checking in modified POMs of a multi-modules project
• relates to: MRELEASE-261 release:prepare should support flat directory multi-module projects