Skip to content

Commit db919f6

Browse files
committed
If the project has no SCM connection URL available, fallback to "${env.GIT_BRANCH}" as the gitBranchExpression.
1 parent 77dd080 commit db919f6

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ public abstract class ScmUtils {
1616
public static String getGitBranch(ScmManager scmManager, MavenProject project) throws ScmException {
1717
String scmConnectionUrl = project.getScm().getConnection();
1818
String scmDeveloperConnectionUrl = project.getScm().getDeveloperConnection();
19-
ScmRepository repository = scmManager.makeScmRepository(StringUtils.isNotBlank(scmDeveloperConnectionUrl) ? scmDeveloperConnectionUrl : scmConnectionUrl);
19+
String connectionUrl = StringUtils.isNotBlank(scmDeveloperConnectionUrl) ? scmDeveloperConnectionUrl : scmConnectionUrl;
20+
if (StringUtils.isBlank(connectionUrl)) {
21+
return "${env.GIT_BRANCH}";
22+
}
23+
24+
ScmRepository repository = scmManager.makeScmRepository(connectionUrl);
2025
ScmProvider provider = scmManager.getProviderByRepository(repository);
2126
if (!GitScmProviderRepository.PROTOCOL_GIT.equals(provider.getScmType())) {
2227
return null;

0 commit comments

Comments
 (0)