[ 
https://jira.codehaus.org/browse/MRELEASE-885?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=353400#comment-353400
 ] 

Bradley Baetz commented on MRELEASE-885:
----------------------------------------

Its the same setup as the original comment - 
https://github.com/bbaetz/maven-release-bug/

I have a "fix" that I'm using locally. Which is totally wrong, but works for me 
:)

--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -263,6 +263,10 @@ public class ReleaseUtil
 
     public static String realignScmUrl( int parentLevels, String url )
     {
+        // Don't touch git
+        if (url.startsWith("scm:git:")) {
+            return url;
+        }
         if ( !StringUtils.isEmpty( url ) )
         {
             int index = url.length();


> When the base pom is a subdirectory, tagging fails in GIT
> ---------------------------------------------------------
>
>                 Key: MRELEASE-885
>                 URL: https://jira.codehaus.org/browse/MRELEASE-885
>             Project: Maven Release Plugin
>          Issue Type: Bug
>          Components: Git, scm
>    Affects Versions: 2.3.2, 2.5
>         Environment: linux (fedora 20)
>            Reporter: Bradley Baetz
>            Assignee: Benson Margulies
>             Fix For: 2.5.1
>
>
> (NOTE, this is not the same as MRELEASE-875. I think)
> Given a GIT checkout with a project structure of:
> project/
>   dir1/pom.xml
>   dir2/pom.xml
> Given an <scm> config of:
> <developerConnection>scm:git:ssh://g...@github.com:bbaetz/maven-release-bug.git</developerConnection>
> the maven-release plugin correctly commits the pom file, but fails to tag. 
> The problem is that its stripping off one level of the URL, and doing:
> [INFO] Executing: /bin/sh -c cd /home/bbaetz/src/subdir-project && git push 
> ssh://g...@github.com:bbaetz refs/tags/project-1.0.0
> which is wrong for git
> To reproduce, fork https://github.com/bbaetz/maven-release-bug/, change the 
> scm settings to your own, and run:
> mvn -X -B -f build/pom.xml -DdevelopmentVersion=1.0.1-SNAPSHOT 
> -DreleaseVersion=1.0.0 -Dresume=false release:prepare release:perform
> I've tried various combinations of maven-release-plugin and maven-scm-plugin 
> versions, with no luck



--
This message was sent by Atlassian JIRA
(v6.1.6#6162)

Reply via email to