From 715e51bd33d0720647786600a9548898919337c5 Mon Sep 17 00:00:00 2001 From: Konrad Windszus Date: Sat, 6 Nov 2021 11:53:16 +0100 Subject: [PATCH] [MRELEASE-1072] - Reuse original tag for next development version in case translator does not support resolving --- .../phase/RewritePomsForDevelopmentPhase.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java index 834ca0ebd..c9adda63a 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java +++ b/maven-release-manager/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 {