[MRELEASE-812] "prepare" does not commit before tagging and therefore deploys snapshot instead of release

[jira-importer]

Andrei Pozolotin opened MRELEASE-812 and commented

thank you very much for new release!
http://mail-archives.apache.org/mod_mbox/maven-announce/201212.mbox/%3Cop.wpjbptp1kdkhrr@columbia%3E

it seems we need an emergency fix:

attached are 2 logs:

1. mvn-2.3.2.txt invocation that works fine with 2.3.2
2. mvn-2.4.0.txt invocation that fails with 2.4

problem:

"perform" does not commit tags, deploys snapshot instead of release

here is project parent:
http://search.maven.org/remotecontent?filepath=com/barchart/base/barchart-archon/2.3.6/barchart-archon-2.3.6.pom

build is invoked both times with this:

mvn --define resume=false release:prepare
mvn --define resume=false release:perform

---

Affects: 2.3.2, 2.4

Attachments:

• mvn-2.3.2.txt (24.95 kB)
• mvn-2.4.0.txt (26.91 kB)

Issue Links:

• MRELEASE-859 release:prepare fails to commit before tagging when using git 1.8.5
  ("is duplicated by")

• SCM-686 Maven SCM failed to parse "git status" output if git messages are translated

• MRELEASE-875 release:prepare does not commit pom.xml if not in the git root

• SCM-740 Maven Release Plugin releases SNAPSHOT instead of STABLE version

• MRELEASE-883 Upgrade SCM to 1.9.1

• MRELEASE-875 release:prepare does not commit pom.xml if not in the git root

• SCM-709 REGRESSION: git status doesn't work if repository root is not the working directory
  ("depends upon")

13 votes, 27 watchers

[jira-importer]

Robert Scholte commented

"perform" does not commit tags, deploys snapshot instead of release
It's the prepare which does the commits, never the perform.

Since the tests run with the release-version during the prepare it's not a transformation issue.
So it looks more like a GIT-specific issue. Could it be an issue with SCM-1.8? Could you try to use the 1.7 dependencies?

<plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-release-plugin</artifactId>
  <version>2.4</version>
  <dependencies>
    <dependency>
      <groupId>org.apache.maven.scm</groupId>
      <artifactId>maven-scm-api</artifactId>
      <version>1.7</version>
    </dependency>
  </dependencies>
</plugin>

[jira-importer]

Fred Cooke commented

Additionally, in git a tag is not a commit as such, it's a label on an existing commit. So:

"perform" does not commit tags, deploys snapshot instead of release

Should be changed to

"prepare" does not commit before tagging and therefore deploys snapshot instead of release, as this is what the tag points at.

[jira-importer]

Fred Cooke commented

I just tried to reproduce this behaviour on a simple git-maven project locally and couldn't:

commit c658aaec37369f040ba77deb05382bbe5284ee1c
Author: Fred Cooke <email>
Date:   Thu Jan 3 10:46:21 2013 +0100

    Update to 2.4 to assist testing MRELEASE-812.

diff --git a/pom.xml b/pom.xml
index ec5cfe2..9271b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
-               <plugin.version.release>2.3.2</plugin.version.release>
+               <plugin.version.release>2.4</plugin.version.release>

[INFO] --- maven-release-plugin:2.4:prepare (default-cli) @ parent ---

fred@dauntless:~/workspace/parent$ git show 0.4
tag 0.4
Tagger: Fred Cooke <email>
Date:   Thu Jan 3 10:47:08 2013 +0100

[maven-release-plugin]  copy for tag 0.4

commit bf9e44d196c5735cb4fc585ed33e76496064f2a4
Author: Fred Cooke <email>
Date:   Thu Jan 3 10:47:08 2013 +0100

    [maven-release-plugin] prepare release 0.4

diff --git a/pom.xml b/pom.xml
index 9271b8d..d413c19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
        <groupId>com.?</groupId>
        <artifactId>parent</artifactId>
-       <version>0.4-SNAPSHOT</version>
+       <version>0.4</version>
        <packaging>pom</packaging>
 
        <name>Parent Project</name>
@@ -16,7 +16,7 @@
 
        <scm>
                <developerConnection>scm:git:?:parent.git</developerConnection>
-               <tag>HEAD</tag>
+               <tag>0.4</tag>
        </scm>
 
        <distributionManagement>

[jira-importer]

Robert Scholte commented

Based on the logs I see the following differences:

[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git add -- pom.xml
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git status
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git commit --verbose -F /tmp/maven-scm-886620709.commit pom.xml
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git symbolic-ref HEAD
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git push ssh://git@github.com/barchart/barchart-libraries.git master:master
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Tagging release with the label barchart-build-test-1-1.0.14...
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git tag -F /tmp/maven-scm-2056845372.commit barchart-build-test-1-1.0.14
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git push ssh://git@github.com/barchart/barchart-libraries.git barchart-build-test-1-1.0.14
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git ls-files
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Transforming 'barchart-build-test-1'...
[INFO] Not removing release POMs
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git add -- pom.xml
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git status
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git commit --verbose -F /tmp/maven-scm-839755101.commit pom.xml
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git symbolic-ref HEAD
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git push ssh://git@github.com/barchart/barchart-libraries.git master:master
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Release preparation complete.

[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git add -- pom.xml
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git status --porcelain
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Tagging release with the label barchart-build-test-1-1.0.13...
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git tag -F /tmp/maven-scm-1489330697.commit barchart-build-test-1-1.0.13
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git push ssh://git@github.com/barchart/barchart-libraries.git barchart-build-test-1-1.0.13
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git ls-files
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Transforming 'barchart-build-test-1'...
[INFO] Not removing release POMs
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git add -- pom.xml
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git status --porcelain
[INFO] Working directory: /work/git/barchart-libraries/build-tester/barchart-build-test-1
[INFO] Release preparation complete.

[jira-importer]

Robert Scholte commented

It has probably to do with SCM-686, so I'm thinking that the GIT-version could be an issue.
Fred Cooke is using git 1.7.10.4

It looks like the result of Executing: /bin/sh -c cd /work/git/barchart-libraries/build-tester/barchart-build-test-1 && git status --porcelain isn't parsed correctly.
Anyhow, this should be solved at https://jira.codehaus.org/browse/SCM
Would be nice if you could create an issue there with the GIT version and the result of the git status --porcelain

Once fixed and released, the plugin needs that version of the maven-scm-api

[jira-importer]

Andrei Pozolotin commented

Robert:

thank you for looking into this; here is a test case:

1. repo to clone
   https://github.com/barchart/barchart-bugs

2. project with v 2.3.2, which works
   https://github.com/barchart/barchart-bugs/tree/master/barchart-bugs-MRELEA[SE-812](https://issues.apache.org/jira/browse/SE-812)/build-tester/barchart-bugs-MRELEASE-812-case-01
   and maven log
   https://raw.github.com/barchart/barchart-bugs/master/barchart-bugs-MRELEA[SE-812](https://issues.apache.org/jira/browse/SE-812)/build-tester/barchart-bugs-MRELEASE-812-case-01/doc/mvn.log.txt
   run from eclipse:
   https://github.com/barchart/barchart-bugs/blob/master/barchart-bugs-MRELEA[SE-812](https://issues.apache.org/jira/browse/SE-812)/build-tester/barchart-bugs-MRELEASE-812-case-01/build/maven-release.ant

3. project with v 2.4, which is broken
   https://github.com/barchart/barchart-bugs/tree/master/barchart-bugs-MRELEA[SE-812](https://issues.apache.org/jira/browse/SE-812)/build-tester/barchart-bugs-MRELEASE-812-case-02
   and maven log
   https://raw.github.com/barchart/barchart-bugs/master/barchart-bugs-MRELEA[SE-812](https://issues.apache.org/jira/browse/SE-812)/build-tester/barchart-bugs-MRELEASE-812-case-02/doc/mvn.log.txt
   run from eclipse:
   https://github.com/barchart/barchart-bugs/blob/master/barchart-bugs-MRELEA[SE-812](https://issues.apache.org/jira/browse/SE-812)/build-tester/barchart-bugs-MRELEASE-812-case-02/build/maven-release.ant

thank you.

Andrei.

[jira-importer]

Christoph Kutzinski commented

Contrary to other comments here I had the same problem with maven-release-plugin 2.3.2. The workaround described here http://www.shredzone.de/cilla/page/373/maven-release-plugin-and-git-fix.html - i.e. setting LANG to english - worked.

[jira-importer]

Christoph Kutzinski commented

SCM-686 is fixed for several months, but still not included in the release-plugin.
When will this finally be fixed? IMO it's really critical.

[jira-importer]

Stefan Fleiter commented

Stumbled upon this and wasted several hours on it.
Wanting to report the bug I see this one, known for far too long.
What a shame!

[jira-importer]

Catalin Patruica commented

I had the same problems but after some hours of search i was finding a sollution that was working for me:
just add the dependencies of the maven-release-plugin
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.8.1</version>
</dependency>
</dependencies>

for testing I have created a test project on github
https://github.com/duderoot/maven.release.plugin
and also make a more detailed description under
http://xlab-iq.blogspot.de/2013/10/maven-release-plugin.html
I hope it helps.
cheers,
cp

[jira-importer]

Jeremie H commented

I lost so mush time on this...

[jira-importer]

Catalin Patruica commented

@Jeremie H
has the solution work for you or you are still having problems?
because if it has work, then the issue can be close, right?

ceers,
cp

[jira-importer]

Richard Eckart de Castilho commented

Last time I checked, it was necessary to change the system language to English for releases to work.

In any case, I think this should only be closed when/if the maven-release-plugin itself chooses providers that work. The user should not need to manually upgrade dependencies of a plugin for it to work.

[jira-importer]

Jeremie H commented

@Catalin Patruica
Yes, setting the system language to English worked. But I strongly agree with Richard Eckart de Castilho : the plugin should work regardless of the system language.

[jira-importer]

Robert Scholte commented

Current status: SCM-686 was an attempt to fix this, but it did more harm than good. Projects which weren't located at the root of the project couldn't be released. SCM-709 should fix this. It is probably fixed with the current snapshot of the SCM project, but there's still no good feedback.