release:prepare-with-pom fails when suppressCommitBeforeTag is used (SVN)

Details

Type: Bug
Status: Closed
Priority: Major
Resolution: Fixed
Affects Version/s: 2.2, 2.3.2
Fix Version/s: 2.4
Component/s: prepare-with-pom
Labels:
None
Environment:
Subversion 1.6.12

Number of attachments :
1

Description

When running a prepare-with-pom goal, using the suppressCommitBeforeTag option causes the removal of the release-pom.xml to fail.

This is due to the fact that the SVN command to remove the release-pom won't complete because the release-pom was never committed. The ultimate error is

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.3.2:prepare-with-pom
(default-cli) on project com.example.project: Cannot remove release POMs from SCM
[ERROR] Provider message:
[ERROR] The svn command failed.
[ERROR] Command output:
[ERROR] svn: Use --force to override this restriction
[ERROR] svn: 'C:\code\release-pom.xml' has local modifications

When suppressCommitBeforeTag is not used, the SCM operations are:

Status
Add the release-pom.xml
(build)
Commit with release version
Copy (create the tag)
Remove the release-pom.xml
Commit with next development version

When suppressCommitBeforeTag is used, step #4 is omitted, which causes step #6 to fail with the supplied error. In both cases, the tag successfully has the release-pom.xml included.

Could the --force option be used to suppress the warning?

Options
- Sort By Name
- Sort By Date
- Ascending
- Descending
- Download All

Attachments

MRELEASE-787.diff

14/Aug/12 11:07 AM

2 kB

John R Fallows

Activity

Ascending order - Click to sort in descending order

Hide

Permalink

John R Fallows added a comment - 14/Aug/12 11:07 AM

Remove the generated release POMs from the local filesystem instead of triggering the SCM error when suppressCommitBeforeTag is set, also handle dryRun.

Show

John R Fallows added a comment - 14/Aug/12 11:07 AM Remove the generated release POMs from the local filesystem instead of triggering the SCM error when suppressCommitBeforeTag is set, also handle dryRun.

Hide

Permalink

Robert Scholte added a comment - 05/Oct/12 2:34 PM

Fixed in r1394740
Thanks for the patch

Show

Robert Scholte added a comment - 05/Oct/12 2:34 PM Fixed in r1394740 Thanks for the patch

Hide

Permalink

Erik Schepers added a comment - 19/Nov/12 7:50 AM - edited

(update: updated error-report, this is the actual error)

release:prepare-with-pom still fails with this patch applied...

The tag is still created correct, but committing the next development-version fails now with a different error (release-pom.xml is scheduled for addition, but is missing)..

[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 9.990s
[INFO] Finished at: Mon Nov 19 15:33:18 CET 2012
[INFO] Final Memory: 32M/398M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.3.2:prepare-with-pom (default-cli) on project democonsumer-parent: Unable to commit files
[ERROR] Provider message:
[ERROR] The svn command failed.
[ERROR] Command output:
[ERROR] svn: Commit failed (details follow):
[ERROR] svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is scheduled for addition, but is missing
[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

Show

Erik Schepers added a comment - 19/Nov/12 7:50 AM - edited (update: updated error-report, this is the actual error) release:prepare-with-pom still fails with this patch applied... The tag is still created correct, but committing the next development-version fails now with a different error (release-pom.xml is scheduled for addition, but is missing).. [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 9.990s [INFO] Finished at: Mon Nov 19 15:33:18 CET 2012 [INFO] Final Memory: 32M/398M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.3.2:prepare-with-pom (default-cli) on project democonsumer-parent: Unable to commit files [ERROR] Provider message: [ERROR] The svn command failed. [ERROR] Command output: [ERROR] svn: Commit failed (details follow): [ERROR] svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is scheduled for addition, but is missing [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

Hide

Permalink

Robert Scholte added a comment - 19/Nov/12 1:56 PM

Fixed in r1411374, please verify

Show

Robert Scholte added a comment - 19/Nov/12 1:56 PM Fixed in r1411374 , please verify

Hide

Permalink

Erik Schepers added a comment - 20/Nov/12 3:14 AM

Retested with 2.4-SNAPSHOT (based on r1411374).

The build still fails. Now there are 2 problems:

The tag is created, but the release-pom.xml is not part of the tag
Committing the next development version to trunk fails (see logging below)

[INFO] Modified POMs are not committed because suppressCommitBeforeTagOrBranch is set to false.
[INFO] Tagging release with the label democonsumer-parent-5.1.0...
[INFO] Executing: /bin/sh -c cd /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer && svn --non-interactive copy --file /tmp/maven-scm-247432815.commit . file:///work/tactbl2/di788/tmp/TESTREPO/tags/Demo/DemoConsumer/democonsumer-parent-5.1.0
[INFO] Working directory: /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer
[INFO] Transforming 'DemoConsumer (TP)'...
[INFO] Transforming 'Consumer (TS)'...
[INFO] Removing release POM for 'DemoConsumer (TP)'...
[INFO] Removing release POM for 'Consumer (TS)'...
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer && svn --non-interactive commit --file /tmp/maven-scm-2116850369.commit --targets /tmp/maven-scm-8006235259427407667-targets
[INFO] Working directory: /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] 
[INFO] DemoConsumer (TP) ................................. FAILURE [9.037s]
[INFO] Consumer (TS) ..................................... SUCCESS [0.013s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 9.701s
[INFO] Finished at: Tue Nov 20 09:34:26 CET 2012
[INFO] Final Memory: 34M/583M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.4-SNAPSHOT:prepare-with-pom (default-cli) on project democonsumer-parent: Unable to commit files
[ERROR] Provider message:
[ERROR] The svn command failed.
[ERROR] Command output:
[ERROR] svn: Commit failed (details follow):
[ERROR] svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control
[ERROR] -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.4-SNAPSHOT:prepare-with-pom (default-cli) on project democonsumer-parent: Unable to commit files
Provider message:
The svn command failed.
Command output:
svn: Commit failed (details follow):
svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control

	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213)
	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
	at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319)
	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
	at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:597)
	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: org.apache.maven.plugin.MojoFailureException: Unable to commit files
Provider message:
The svn command failed.
Command output:
svn: Commit failed (details follow):
svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control

	at org.apache.maven.plugins.release.PrepareReleaseMojo.prepareRelease(PrepareReleaseMojo.java:285)
	at org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.execute(PrepareWithPomReleaseMojo.java:47)
	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101)
	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209)
	... 19 more
Caused by: org.apache.maven.shared.release.scm.ReleaseScmCommandException: Unable to commit files
Provider message:
The svn command failed.
Command output:
svn: Commit failed (details follow):
svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control

	at org.apache.maven.shared.release.phase.AbstractScmCommitPhase.checkin(AbstractScmCommitPhase.java:165)
	at org.apache.maven.shared.release.phase.AbstractScmCommitPhase.performCheckins(AbstractScmCommitPhase.java:145)
	at org.apache.maven.shared.release.phase.ScmCommitDevelopmentPhase.runLogic(ScmCommitDevelopmentPhase.java:91)
	at org.apache.maven.shared.release.phase.AbstractScmCommitPhase.execute(AbstractScmCommitPhase.java:78)
	at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:234)
	at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:169)
	at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:146)
	at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:107)
	at org.apache.maven.plugins.release.PrepareReleaseMojo.prepareRelease(PrepareReleaseMojo.java:277)
	... 22 more
[ERROR] 
[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

Show

Erik Schepers added a comment - 20/Nov/12 3:14 AM Retested with 2.4-SNAPSHOT (based on r1411374 ). The build still fails. Now there are 2 problems: The tag is created, but the release-pom.xml is not part of the tag Committing the next development version to trunk fails (see logging below) [INFO] Modified POMs are not committed because suppressCommitBeforeTagOrBranch is set to false. [INFO] Tagging release with the label democonsumer-parent-5.1.0... [INFO] Executing: /bin/sh -c cd /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer && svn --non-interactive copy --file /tmp/maven-scm-247432815.commit . file:///work/tactbl2/di788/tmp/TESTREPO/tags/Demo/DemoConsumer/democonsumer-parent-5.1.0 [INFO] Working directory: /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer [INFO] Transforming 'DemoConsumer (TP)'... [INFO] Transforming 'Consumer (TS)'... [INFO] Removing release POM for 'DemoConsumer (TP)'... [INFO] Removing release POM for 'Consumer (TS)'... [INFO] Checking in modified POMs... [INFO] Executing: /bin/sh -c cd /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer && svn --non-interactive commit --file /tmp/maven-scm-2116850369.commit --targets /tmp/maven-scm-8006235259427407667-targets [INFO] Working directory: /work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] DemoConsumer (TP) ................................. FAILURE [9.037s] [INFO] Consumer (TS) ..................................... SUCCESS [0.013s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 9.701s [INFO] Finished at: Tue Nov 20 09:34:26 CET 2012 [INFO] Final Memory: 34M/583M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.4-SNAPSHOT:prepare-with-pom (default-cli) on project democonsumer-parent: Unable to commit files [ERROR] Provider message: [ERROR] The svn command failed. [ERROR] Command output: [ERROR] svn: Commit failed (details follow): [ERROR] svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.4-SNAPSHOT:prepare-with-pom (default-cli) on project democonsumer-parent: Unable to commit files Provider message: The svn command failed. Command output: svn: Commit failed (details follow): svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196) at org.apache.maven.cli.MavenCli.main(MavenCli.java:141) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352) Caused by: org.apache.maven.plugin.MojoFailureException: Unable to commit files Provider message: The svn command failed. Command output: svn: Commit failed (details follow): svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control at org.apache.maven.plugins.release.PrepareReleaseMojo.prepareRelease(PrepareReleaseMojo.java:285) at org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.execute(PrepareWithPomReleaseMojo.java:47) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 19 more Caused by: org.apache.maven.shared.release.scm.ReleaseScmCommandException: Unable to commit files Provider message: The svn command failed. Command output: svn: Commit failed (details follow): svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is not under version control at org.apache.maven.shared.release.phase.AbstractScmCommitPhase.checkin(AbstractScmCommitPhase.java:165) at org.apache.maven.shared.release.phase.AbstractScmCommitPhase.performCheckins(AbstractScmCommitPhase.java:145) at org.apache.maven.shared.release.phase.ScmCommitDevelopmentPhase.runLogic(ScmCommitDevelopmentPhase.java:91) at org.apache.maven.shared.release.phase.AbstractScmCommitPhase.execute(AbstractScmCommitPhase.java:78) at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:234) at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:169) at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:146) at org.apache.maven.shared.release.DefaultReleaseManager.prepare(DefaultReleaseManager.java:107) at org.apache.maven.plugins.release.PrepareReleaseMojo.prepareRelease(PrepareReleaseMojo.java:277) ... 22 more [ERROR] [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

Hide

Permalink

Robert Scholte added a comment - 24/Nov/12 1:05 PM

Erik,

[ERROR] svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is scheduled for addition, but is missing

Have you changed remoteTagging to false?

Show

Robert Scholte added a comment - 24/Nov/12 1:05 PM Erik, [ERROR] svn: '/work/tactbl2/di788/tmp/checkoutTESTREPO/TESTREPO/trunk/Demo/DemoConsumer/release-pom.xml' is scheduled for addition, but is missing Have you changed remoteTagging to false ?

Hide

Permalink

Erik Schepers added a comment - 26/Nov/12 9:15 AM

Robert,

I've set remoteTagging to false (had it set to false all the time).
According to the documentation it should be false when using suppressCommitBeforeTag=true

Show

Erik Schepers added a comment - 26/Nov/12 9:15 AM Robert, I've set remoteTagging to false (had it set to false all the time). According to the documentation it should be false when using suppressCommitBeforeTag=true

Hide

Permalink

Robert Scholte added a comment - 01/Dec/12 1:15 PM

I found the cause and fixed it in r1416042
This way the release will succeed, but there's one minor afterwards: the release-pom.xml is still marked as added, since that's required for the tagging. I haven't seen the option in SCM for reverting.

Show

Robert Scholte added a comment - 01/Dec/12 1:15 PM I found the cause and fixed it in r1416042 This way the release will succeed, but there's one minor afterwards: the release-pom.xml is still marked as added , since that's required for the tagging. I haven't seen the option in SCM for reverting.

People

Assignee:

Robert Scholte

Reporter:

Brian Albers

Vote (0)

Watch (4)

Dates

Created:

12/Aug/12 4:06 PM

Updated:

01/Dec/12 1:15 PM

Resolved:

01/Dec/12 1:15 PM