[MRELEASE-1072] - Reuse original tag for next development version in

case translator does not support resolving
apache · Nov 6, 2021 · 715e51b · 715e51b
1 parent 468520a
commit 715e51b
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...r/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java b/...r/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
@@ -65,7 +65,19 @@ protected void transformScm( MavenProject project, Model modelTarget, ReleaseDes
                         scmRoot.setConnection( scm.getConnection() );
                         scmRoot.setDeveloperConnection( scm.getDeveloperConnection() );
                         scmRoot.setUrl( scm.getUrl() );
-                        scmRoot.setTag( translator.resolveTag( scm.getTag() ) );
+                        String tag = translator.resolveTag( scm.getTag() );
+                        // reuse unresolved tag from original in case ScmTranslator does not support tags
+                        if ( tag == null )
+                        {
+                            tag = scm.getTag();
+                        }
+                        // never give out default value as there is no way to distinguish it from an the
+                        // explicitly set tag with the same value
+                        if ( "HEAD".equals( tag ) )
+                        {
+                            tag = null;
+                        }
+                        scmRoot.setTag( tag );
                     }
                     else
                     {