[jira] [Updated] (MRELEASE-1016) mvn release:branch fails on Windows to commit changed pom in branch
[
https://issues.apache.org/jira/browse/MRELEASE-1016?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Robert Scholte updated MRELEASE-1016:
-
Fix Version/s: (was: 2.5.3)
> mvn release:branch fails on Windows to commit changed pom in branch
> ---
>
> Key: MRELEASE-1016
> URL: https://issues.apache.org/jira/browse/MRELEASE-1016
> Project: Maven Release Plugin
> Issue Type: Bug
> Components: branch
>Affects Versions: 2.5.3
> Environment: Apache Maven 3.3.9
> Java version: 1.8.0_60, vendor: Oracle Corporation
> OS name: "windows 7", version: "6.1", arch: "amd64", family: "dos"
> git version 2.16.2.windows.1
>Reporter: Anthony Whitford
>Assignee: Robert Scholte
>Priority: Blocker
>
> I need to create a branch from a tag. Imagine branching from a 1.0 tag, the
> following should work:
> {noformat}
> git checkout project-1.0
> mvn release:branch -DupdateBranchVersions=true
> -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
> -DbranchName=1.0.x -DreleaseVersion=1.0.1-SNAPSHOT
> git checkout 1.0.x
> {noformat}
> Alas, the {{pom.xml}} in the new branch still references version 1.0 (not
> 1.0.1-SNAPSHOT), and the {{}} references the tag, not the branch.
> (!) This looks like MRELEASE-881 was simply never resolved.
> If I run a _Dry Run_, like:
> {noformat}
> mvn release:branch -DupdateBranchVersions=true
> -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
> -DbranchName=1.0.x -DreleaseVersion=1.0.1-SNAPSHOT -DpushChanges=false
> -DdryRun=true
> {noformat}
> I can see the correct updates in {{pom.xml.branch}}.
> Note that there are no differences between {{pom.xml}} and {{pom.xml.next}}.
> _Why is {{pom.xml.branch}} not being captured in the branch?_
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Updated] (MRELEASE-1016) mvn release:branch fails on Windows to commit changed pom in branch
[
https://issues.apache.org/jira/browse/MRELEASE-1016?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Anthony Whitford updated MRELEASE-1016:
---
Environment:
Apache Maven 3.3.9
Java version: 1.8.0_60, vendor: Oracle Corporation
OS name: "windows 7", version: "6.1", arch: "amd64", family: "dos"
git version 2.16.2.windows.1
was:
git version 1.9.4.msysgit.0;
Apache Maven 3.2.1 (ea8b2b07643dbb1b84b6d16e1f08391b666bc1e9; 2014-02-14T18:37:5
2+01:00)
Maven home: D:\Dev\maven\apache-maven-3.2.1\bin\..
Java version: 1.7.0_51, vendor: Oracle Corporation
Java home: D:\Dev\Java\jdk7_51_x64\jre
Default locale: de_DE, platform encoding: Cp1252
OS name: "windows 7", version: "6.1", arch: "amd64", family: "windows"
> mvn release:branch fails on Windows to commit changed pom in branch
> ---
>
> Key: MRELEASE-1016
> URL: https://issues.apache.org/jira/browse/MRELEASE-1016
> Project: Maven Release Plugin
> Issue Type: Bug
> Components: branch
>Affects Versions: 2.5.3
> Environment: Apache Maven 3.3.9
> Java version: 1.8.0_60, vendor: Oracle Corporation
> OS name: "windows 7", version: "6.1", arch: "amd64", family: "dos"
> git version 2.16.2.windows.1
>Reporter: Anthony Whitford
>Assignee: Robert Scholte
>Priority: Blocker
> Fix For: 2.5.3
>
>
> I need to create a branch from a tag. Imagine branching from a 1.0 tag, the
> following should work:
> {noformat}
> git checkout project-1.0
> mvn release:branch -DupdateBranchVersions=true
> -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
> -DbranchName=1.0.x -DreleaseVersion=1.0.1-SNAPSHOT
> git checkout 1.0.x
> {noformat}
> Alas, the {{pom.xml}} in the new branch still references version 1.0 (not
> 1.0.1-SNAPSHOT), and the {{}} references the tag, not the branch.
> (!) This looks like MRELEASE-881 was simply never resolved.
> If I run a _Dry Run_, like:
> {noformat}
> mvn release:branch -DupdateBranchVersions=true
> -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
> -DbranchName=1.0.x -DreleaseVersion=1.0.1-SNAPSHOT -DpushChanges=false
> -DdryRun=true
> {noformat}
> I can see the correct updates in {{pom.xml.branch}}.
> Note that there are no differences between {{pom.xml}} and {{pom.xml.next}}.
> _Why is {{pom.xml.branch}} not being captured in the branch?_
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Updated] (MRELEASE-1016) mvn release:branch fails on Windows to commit changed pom in branch
[
https://issues.apache.org/jira/browse/MRELEASE-1016?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Anthony Whitford updated MRELEASE-1016:
---
Description:
I need to create a branch from a tag. Imagine branching from a 1.0 tag, the
following should work:
{noformat}
git checkout project-1.0
mvn release:branch -DupdateBranchVersions=true
-DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
-DbranchName=1.0.x -DreleaseVersion=1.0.1-SNAPSHOT
git checkout 1.0.x
{noformat}
Alas, the {{pom.xml}} in the new branch still references version 1.0 (not
1.0.1-SNAPSHOT), and the {{}} references the tag, not the branch.
(!) This looks like MRELEASE-881 was simply never resolved.
If I run a _Dry Run_, like:
{noformat}
mvn release:branch -DupdateBranchVersions=true
-DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
-DbranchName=1.0.x -DreleaseVersion=1.0.1-SNAPSHOT -DpushChanges=false
-DdryRun=true
{noformat}
I can see the correct updates in {{pom.xml.branch}}.
Note that there are no differences between {{pom.xml}} and {{pom.xml.next}}.
_Why is {{pom.xml.branch}} not being captured in the branch?_
was:
I have tried this with 2.5 version ... also with 1.9 git:scm dependency.
I guess it has to do with the WARNINGS shown below. Git itself works without
any problems.
The branch is created, but still has the version 1.0-SNAPSHOT. It should have
the version 1.0-copy-SNAPSHOT. The version was correct updated in the
pom.xml.branch has the correct version information (which I can see with
-DdryRun=true)
Following command fails to commit the "next pom" into the branch:
{noformat}
mvn release:branch -DbranchName=copy-repo-settings -DremoteTagging=false
-DupdateBranchVersions=true -DupdateWorking
CopyVersions=false -DreleaseVersion=1.0-copy-SNAPSHOT
.
[INFO] --- maven-release-plugin:2.5:branch (default-cli) @ monthly-update ---
[INFO] Verifying that there are no local modifications...
[INFO] ignoring changes on: **\release.properties, **\pom.xml.next, **\pom.xml
.releaseBackup, **\pom.xml.backup, **\pom.xml.branch, **\pom.xml.tag
[INFO] Executing: cmd.exe /X /C "git rev-parse --show-toplevel"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git status --porcelain ."
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Transforming 'montly DevOpts Plugin'...
[INFO] Checking in modified POMs...
[INFO] Executing: cmd.exe /X /C "git add -- pom.xml"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git rev-parse --show-toplevel"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git status --porcelain ."
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[WARNING] Ignoring unrecognized line: ?? monthly-update/pom.xml.releaseBackup
[INFO] Branching release with the label null...
[INFO] Executing: cmd.exe /X /C "git branch copy-repo-settings"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git push https://user:pass@dev/git/devopts.git
refs/heads/copy-repo-settings"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git ls-files"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Transforming 'montly DevOpts Plugin'...
[INFO] Checking in modified POMs...
[INFO] Executing: cmd.exe /X /C "git add -- pom.xml"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git rev-parse --show-toplevel"
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[INFO] Executing: cmd.exe /X /C "git status --porcelain ."
[INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
[WARNING] Ignoring unrecognized line: ?? monthly-update/pom.xml.releaseBackup
[INFO] Release preparation complete.
[INFO] Cleaning up after release...
[INFO]
[INFO] BUILD SUCCESS
[INFO]
[INFO] Total time: 11.853 s
[INFO] Finished at: 2014-07-09T09:03:58+01:00
[INFO] Final Memory: 11M/307M
[INFO]
{noformat}
> mvn release:branch fails on Windows to commit changed pom in branch
> ---
>
> Key: MRELEASE-1016
> URL: https://issues.apache.org/jira/browse/MRELEASE-1016
> Project: Maven Release Plugin
> Issue Type: Bug
> Components: branch
>Affects Versions: 2.5.3
> Environment: git version 1.9.4.msysgit.0;
> Apache Maven 3.2.1 (ea8b2b07643dbb1b84b6d16e1f08391b666bc1e9;
> 2014-02-14T18:37:5
> 2+01:00)
> Maven home:
[jira] [Updated] (MRELEASE-1016) mvn release:branch fails on Windows to commit changed pom in branch
[
https://issues.apache.org/jira/browse/MRELEASE-1016?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Anthony Whitford updated MRELEASE-1016:
---
Affects Version/s: (was: 2.5)
(was: 2.3.2)
2.5.3
> mvn release:branch fails on Windows to commit changed pom in branch
> ---
>
> Key: MRELEASE-1016
> URL: https://issues.apache.org/jira/browse/MRELEASE-1016
> Project: Maven Release Plugin
> Issue Type: Bug
> Components: branch
>Affects Versions: 2.5.3
> Environment: git version 1.9.4.msysgit.0;
> Apache Maven 3.2.1 (ea8b2b07643dbb1b84b6d16e1f08391b666bc1e9;
> 2014-02-14T18:37:5
> 2+01:00)
> Maven home: D:\Dev\maven\apache-maven-3.2.1\bin\..
> Java version: 1.7.0_51, vendor: Oracle Corporation
> Java home: D:\Dev\Java\jdk7_51_x64\jre
> Default locale: de_DE, platform encoding: Cp1252
> OS name: "windows 7", version: "6.1", arch: "amd64", family: "windows"
>Reporter: Anthony Whitford
>Assignee: Robert Scholte
>Priority: Blocker
> Fix For: 2.5.3
>
>
> I have tried this with 2.5 version ... also with 1.9 git:scm dependency.
> I guess it has to do with the WARNINGS shown below. Git itself works without
> any problems.
> The branch is created, but still has the version 1.0-SNAPSHOT. It should have
> the version 1.0-copy-SNAPSHOT. The version was correct updated in the
> pom.xml.branch has the correct version information (which I can see with
> -DdryRun=true)
> Following command fails to commit the "next pom" into the branch:
> {noformat}
> mvn release:branch -DbranchName=copy-repo-settings -DremoteTagging=false
> -DupdateBranchVersions=true -DupdateWorking
> CopyVersions=false -DreleaseVersion=1.0-copy-SNAPSHOT
> .
> [INFO] --- maven-release-plugin:2.5:branch (default-cli) @ monthly-update ---
> [INFO] Verifying that there are no local modifications...
> [INFO] ignoring changes on: **\release.properties, **\pom.xml.next,
> **\pom.xml
> .releaseBackup, **\pom.xml.backup, **\pom.xml.branch, **\pom.xml.tag
> [INFO] Executing: cmd.exe /X /C "git rev-parse --show-toplevel"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git status --porcelain ."
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Transforming 'montly DevOpts Plugin'...
> [INFO] Checking in modified POMs...
> [INFO] Executing: cmd.exe /X /C "git add -- pom.xml"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git rev-parse --show-toplevel"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git status --porcelain ."
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [WARNING] Ignoring unrecognized line: ?? monthly-update/pom.xml.releaseBackup
> [INFO] Branching release with the label null...
> [INFO] Executing: cmd.exe /X /C "git branch copy-repo-settings"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git push
> https://user:pass@dev/git/devopts.git refs/heads/copy-repo-settings"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git ls-files"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Transforming 'montly DevOpts Plugin'...
> [INFO] Checking in modified POMs...
> [INFO] Executing: cmd.exe /X /C "git add -- pom.xml"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git rev-parse --show-toplevel"
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [INFO] Executing: cmd.exe /X /C "git status --porcelain ."
> [INFO] Working directory: D:\Dev\projects\git\devopts\monthly-update
> [WARNING] Ignoring unrecognized line: ?? monthly-update/pom.xml.releaseBackup
> [INFO] Release preparation complete.
> [INFO] Cleaning up after release...
> [INFO]
>
> [INFO] BUILD SUCCESS
> [INFO]
>
> [INFO] Total time: 11.853 s
> [INFO] Finished at: 2014-07-09T09:03:58+01:00
> [INFO] Final Memory: 11M/307M
> [INFO]
>
> {noformat}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
