You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "Jeremy Norris (JIRA)" <ji...@codehaus.org> on 2012/06/02 07:27:21 UTC
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Jeremy Norris created MRELEASE-767:
--------------------------------------
Summary: releasing flat multi-module projects using git
Key: MRELEASE-767
URL: https://jira.codehaus.org/browse/MRELEASE-767
Project: Maven 2.x Release Plugin
Issue Type: Bug
Components: prepare
Affects Versions: 2.3.1
Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
Maven home: /usr/share/maven
Java version: 1.6.0_31, vendor: Apple Inc.
Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
Default locale: en_US, platform encoding: MacRoman
OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
Reporter: Jeremy Norris
When releasing a project as follows:
./parent/pom.xml
./module-a/pom.xml
./module-b/pom.xml
>From the parent directory, with an scm config in the parent pom.xml (only) as follows:
<scm>
<connection>scm:git:ssh://github.com/repox.git</connection>
<developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
<tag>master</tag>
<url>https://github.com/view/repox.git</url>
</scm>
In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
url = realignScmUrl( parentLevels, url );
This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Jeremy Norris (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=300216#comment-300216 ]
Jeremy Norris commented on MRELEASE-767:
----------------------------------------
Here is example output of the failure:
[INFO] Checking in modified POMs...
[INFO Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git add -- pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git status
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git commit --verbose -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-361212730.commit pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git symbolic-ref HEAD
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git push ssh://github.com/repox.git master:master
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Tagging release with the label 1.0...
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git tag -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-2040311054.commit 1.0
[INFO] Working directory: /Users/jnorris/git/repox
*[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git push ssh://github.com 1.0*
[INFO] Working directory: /Users/jnorris/git/repox
Notice that when it changes to the top-level directory to perform the tagging operation, the scm url becomes corrupted.
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Robert Scholte (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Robert Scholte reassigned MRELEASE-767:
---------------------------------------
Assignee: Mark Struberg
I've talked with Mark about this. He'll have a look at it once he has some more time.
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
> Assignee: Mark Struberg
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Kelly Davis (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=315374#comment-315374 ]
Kelly Davis commented on MRELEASE-767:
--------------------------------------
Ran into this same issue today. The workaround I am currently using is to set pushChanges=false and then manually git push; git push --tags between the release:prepare and release:perform steps.
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
> Assignee: Mark Struberg
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Jeremy Norris (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=300341#comment-300341 ]
Jeremy Norris commented on MRELEASE-767:
----------------------------------------
The workaround I am using for now (although a more proper fix is needed wrt the maven scm API and the release manager):
--- a/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
+++ b/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -179,7 +179,12 @@ public class ReleaseUtil
FileUtils.normalize( releaseDescriptor.getWorkingDirectory() ) );
String url = releaseDescriptor.getScmSourceUrl();
- url = realignScmUrl( parentLevels, url );
+ if (!url.matches("scm:git.*")) {
+ String urlOrig = url;
+ url = realignScmUrl( parentLevels, url );
+ // No logger available:
+ System.out.println("SCM source URL realignment: " + urlOrig + " => " + url);
+ }
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setWorkingDirectory( basedir );
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Jeremy Norris (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=300216#comment-300216 ]
Jeremy Norris edited comment on MRELEASE-767 at 6/2/12 12:39 AM:
-----------------------------------------------------------------
Here is example output of the failure:
[INFO] Checking in modified POMs...
[INFO Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git add -- pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git status
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git commit --verbose -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-361212730.commit pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git symbolic-ref HEAD
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git push ssh://github.com/repox.git master:master
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Tagging release with the label 1.0...
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git tag -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-2040311054.commit 1.0
[INFO] Working directory: /Users/jnorris/git/repox
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git push *ssh://github.com* 1.0
[INFO] Working directory: /Users/jnorris/git/repox
Notice that when it changes to the top-level directory to perform the tagging operation, the scm url becomes corrupted (in *bold* above).
was (Author: jnorris):
Here is example output of the failure:
[INFO] Checking in modified POMs...
[INFO Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git add -- pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git status
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git commit --verbose -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-361212730.commit pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git symbolic-ref HEAD
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git push ssh://github.com/repox.git master:master
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Tagging release with the label 1.0...
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git tag -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-2040311054.commit 1.0
[INFO] Working directory: /Users/jnorris/git/repox
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git push *ssh://github.com* 1.0
[INFO] Working directory: /Users/jnorris/git/repox
Notice that when it changes to the top-level directory to perform the tagging operation, the scm url becomes corrupted.
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Jeremy Norris (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=300216#comment-300216 ]
Jeremy Norris edited comment on MRELEASE-767 at 6/2/12 12:39 AM:
-----------------------------------------------------------------
Here is example output of the failure:
[INFO] Checking in modified POMs...
[INFO Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git add -- pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git status
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git commit --verbose -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-361212730.commit pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git symbolic-ref HEAD
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git push ssh://github.com/repox.git master:master
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Tagging release with the label 1.0...
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git tag -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-2040311054.commit 1.0
[INFO] Working directory: /Users/jnorris/git/repox
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git push *ssh://github.com* 1.0
[INFO] Working directory: /Users/jnorris/git/repox
Notice that when it changes to the top-level directory to perform the tagging operation, the scm url becomes corrupted.
was (Author: jnorris):
Here is example output of the failure:
[INFO] Checking in modified POMs...
[INFO Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git add -- pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git status
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git commit --verbose -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-361212730.commit pom.xml /Users/jnorris/git/repox/module-a/pom.xml /Users/jnorris/git/repox/module-b/pom.xml
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git symbolic-ref HEAD
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox/parent && git push ssh://github.com/repox.git master:master
[INFO] Working directory: /Users/jnorris/git/repox/parent
[INFO] Tagging release with the label 1.0...
[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git tag -F /var/folders/lr/l5tc63_n0tq4dln8yxj_3p_c0000gn/T/maven-scm-2040311054.commit 1.0
[INFO] Working directory: /Users/jnorris/git/repox
*[INFO] Executing: /bin/sh -c cd /Users/jnorris/git/repox && git push ssh://github.com 1.0*
[INFO] Working directory: /Users/jnorris/git/repox
Notice that when it changes to the top-level directory to perform the tagging operation, the scm url becomes corrupted.
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] (MRELEASE-767) releasing flat multi-module projects using
git
Posted by "Jeremy Norris (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/MRELEASE-767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=300341#comment-300341 ]
Jeremy Norris edited comment on MRELEASE-767 at 6/4/12 4:09 PM:
----------------------------------------------------------------
The workaround I am using for now (although a more proper fix is needed wrt the maven scm API and the release manager):
{noformat}
--- a/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
+++ b/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -179,7 +179,12 @@ public class ReleaseUtil
FileUtils.normalize( releaseDescriptor.getWorkingDirectory() ) );
String url = releaseDescriptor.getScmSourceUrl();
- url = realignScmUrl( parentLevels, url );
+ if (!url.matches("scm:git.*")) {
+ String urlOrig = url;
+ url = realignScmUrl( parentLevels, url );
+ // No logger available:
+ System.out.println("SCM source URL realignment: " + urlOrig + " => " + url);
+ }
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setWorkingDirectory( basedir );
{noformat}
was (Author: jnorris):
The workaround I am using for now (although a more proper fix is needed wrt the maven scm API and the release manager):
--- a/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
+++ b/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -179,7 +179,12 @@ public class ReleaseUtil
FileUtils.normalize( releaseDescriptor.getWorkingDirectory() ) );
String url = releaseDescriptor.getScmSourceUrl();
- url = realignScmUrl( parentLevels, url );
+ if (!url.matches("scm:git.*")) {
+ String urlOrig = url;
+ url = realignScmUrl( parentLevels, url );
+ // No logger available:
+ System.out.println("SCM source URL realignment: " + urlOrig + " => " + url);
+ }
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setWorkingDirectory( basedir );
> releasing flat multi-module projects using git
> ----------------------------------------------
>
> Key: MRELEASE-767
> URL: https://jira.codehaus.org/browse/MRELEASE-767
> Project: Maven 2.x Release Plugin
> Issue Type: Bug
> Components: prepare
> Affects Versions: 2.3.1
> Environment: Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800)
> Maven home: /usr/share/maven
> Java version: 1.6.0_31, vendor: Apple Inc.
> Java home: /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
> Default locale: en_US, platform encoding: MacRoman
> OS name: "mac os x", version: "10.7.4", arch: "x86_64", family: "mac"
> Reporter: Jeremy Norris
>
> When releasing a project as follows:
> ./parent/pom.xml
> ./module-a/pom.xml
> ./module-b/pom.xml
> From the parent directory, with an scm config in the parent pom.xml (only) as follows:
> <scm>
> <connection>scm:git:ssh://github.com/repox.git</connection>
> <developerConnection>scm:git:ssh://github.com/repox.git</developerConnection>
> <tag>master</tag>
> <url>https://github.com/view/repox.git</url>
> </scm>
> In org/apache/maven/shared/release/util/ReleaseUtils.java:182 it does this indiscriminately:
> url = realignScmUrl( parentLevels, url );
> This will trim the repo url from 'ssh://github.com/repox.git' -> 'ssh://github.com', which will cause a failure when pushing the tag.
> This type of realignment is not appropriate when using a git scm type.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira