[
https://jira.codehaus.org/browse/MRELEASE-875?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=344724#comment-344724
]
john ten Den commented on MRELEASE-875:
---------------------------------------
I retested m-release-p2.4.2 with git 1.7.0 and its working well.
Added trace of the indirectory/pom.xml below.
I see that the git status 1.7.0 is returning the filelist relatieve to the path
running from in this test case "indirectory")
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git status
[INFO] Working directory:
/Users/johntenden/projecten/git/bier/indirectory
[DEBUG] # On branch master
[DEBUG] # Your branch is ahead of 'origin/master' by 6 commits.
[DEBUG] #
[DEBUG] # Changes to be committed:
[DEBUG] # (use "git reset HEAD <file>..." to unstage)
[DEBUG] #
[DEBUG] # modified: pom.xml
[DEBUG] #
[DEBUG] # Untracked files:
[DEBUG] # (use "git add <file>..." to include in what will be
committed)
[DEBUG] #
[DEBUG] # pom.xml.releaseBackup
[DEBUG] # release.properties
where the 1.9.0 is returning the filefiles relative to the git root:
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git status --porcelain .
[INFO] Working directory:
/Users/johntenden/projecten/git/bier/indirectory
[DEBUG] M indirectory/pom.xml
[DEBUG] ?? indirectory/pom.xml.releaseBackup
[WARNING] Ignoring unrecognized line: ??
indirectory/pom.xml.releaseBackup
[DEBUG] ?? indirectory/release.properties
[WARNING] Ignoring unrecognized line: ?? indirectory/release.properties
trace : m-release-p2.4.2 with git 1.7.0
==============================
[INFO] [INFO]
------------------------------------------------------------------------
[INFO] [INFO] BUILD SUCCESS
[INFO] [INFO]
------------------------------------------------------------------------
[INFO] [INFO] Total time: 0.534 s
[INFO] [INFO] Finished at: 2014-04-11T09:42:37+01:00
[INFO] [INFO] Final Memory: 6M/156M
[INFO] [INFO]
------------------------------------------------------------------------
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git add -- pom.xml
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git status
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[DEBUG] # On branch master
[DEBUG] # Your branch is ahead of 'origin/master' by 6 commits.
[DEBUG] #
[DEBUG] # Changes to be committed:
[DEBUG] # (use "git reset HEAD <file>..." to unstage)
[DEBUG] #
[DEBUG] # modified: pom.xml
[DEBUG] #
[DEBUG] # Untracked files:
[DEBUG] # (use "git add <file>..." to include in what will be committed)
[DEBUG] #
[DEBUG] # pom.xml.releaseBackup
[DEBUG] # release.properties
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git commit --verbose -F
/var/folders/s6/8zrhrmyj28d6smh9dm9sw9000000gn/T/maven-scm-1159491710.commit
pom.xml
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git symbolic-ref HEAD
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git push
[email protected]:john/bier.git master:master
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Tagging release with the label johntest2-0.0.3...
[DEBUG] ScmTagPhase :: scmTagParameters remotingTag true
[DEBUG] ScmTagPhase :: scmTagParameters scmRevision null
[DEBUG] ScmTagPhase :: fileSet basedir =
/Users/johntenden/projecten/git/bier/indirectory; files = []
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git tag -F
/var/folders/s6/8zrhrmyj28d6smh9dm9sw9000000gn/T/maven-scm-1210701058.commit
johntest2-0.0.3
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git push
[email protected]:john/bier.git johntest2-0.0.3
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git ls-files
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[DEBUG] pom.xml
[INFO] Transforming 'johntest'...
[INFO] Not removing release POMs
[INFO] Checking in modified POMs...
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git add -- pom.xml
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git status
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[DEBUG] # On branch master
[DEBUG] # Your branch is ahead of 'origin/master' by 7 commits.
[DEBUG] #
[DEBUG] # Changes to be committed:
[DEBUG] # (use "git reset HEAD <file>..." to unstage)
[DEBUG] #
[DEBUG] # modified: pom.xml
[DEBUG] #
[DEBUG] # Untracked files:
[DEBUG] # (use "git add <file>..." to include in what will be committed)
[DEBUG] #
[DEBUG] # pom.xml.releaseBackup
[DEBUG] # release.properties
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git commit --verbose -F
/var/folders/s6/8zrhrmyj28d6smh9dm9sw9000000gn/T/maven-scm-927421259.commit
pom.xml
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git symbolic-ref HEAD
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Executing: /bin/sh -c cd
/Users/johntenden/projecten/git/bier/indirectory && git push
[email protected]:john/bier.git master:master
[INFO] Working directory: /Users/johntenden/projecten/git/bier/indirectory
[INFO] Release preparation complete.
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 18.936 s
[INFO] Finished at: 2014-04-11T09:42:49+01:00
[INFO] Final Memory: 10M/156M
> release:prepare does not commit pom.xml if not in the git root
> --------------------------------------------------------------
>
> Key: MRELEASE-875
> URL: https://jira.codehaus.org/browse/MRELEASE-875
> Project: Maven Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.5
> Environment: git 1.9.0
> Reporter: john ten Den
>
> When the project pom.xml is not in the Git project root (f.e. in the "src"
> directory) the pom.xml not committed and pushed (before tagging)
> Commit of the pom.xml during release:prepare works fine if it is in the /
> (root) of the git repository
> Using the pom.xml in a subdirectory worked well with version 2.4.2 using git
> 1.7.
--
This message was sent by Atlassian JIRA
(v6.1.6#6162)
