Skip to content

Commit 1db6a12

Browse files
committed
Merge pull request #29 from egineering-llc/hotfix/1.2.4
Hotfix/1.2.4
2 parents bb75d66 + ee4c6af commit 1db6a12

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
*.versionsBackup
12
*.class
23

34
*.idea

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<groupId>com.e-gineering</groupId>
1010
<artifactId>gitflow-helper-maven-plugin</artifactId>
1111

12-
<version>1.2.3</version>
12+
<version>1.2.4</version>
1313
<packaging>maven-plugin</packaging>
1414

1515
<name>gitflow-helper-maven-plugin</name>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ public class TagMasterMojo extends AbstractGitflowBranchMojo {
4242

4343
@Override
4444
protected void execute(final GitBranchType type, final String gitBranch, final String branchPattern) throws MojoExecutionException, MojoFailureException {
45-
if (type.equals(GitBranchType.MASTER)) {
45+
if (project.isExecutionRoot() && type.equals(GitBranchType.MASTER)) {
4646
if (gitURLExpression == null) {
4747
gitURLExpression = "${env.GIT_URL}";
4848
}
4949
String gitURL = resolveExpression(gitURLExpression);
50-
getLog().info("gitURLExpression: '" + gitURLExpression + "' resolved to: '" + gitURL + "'");
50+
getLog().debug("gitURLExpression: '" + gitURLExpression + "' resolved to: '" + gitURL + "'");
5151
ExpansionBuffer eb = new ExpansionBuffer(gitURL);
5252
if (!eb.hasMoreLegalPlaceholders()) {
53+
5354
getLog().info("Invoking scm:tag for CI build matching branchPattern: [" + branchPattern + "]");
5455

5556
// Use the execute mojo to run the maven-scm-plugin...

0 commit comments

Comments
 (0)