Skip to content

Commit 4ba878c

Browse files
committed
Updated documentation
1 parent 54e19b8 commit 4ba878c

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ The following properties change the behavior of this goal:
104104
| Property | Default Value | SNAPSHOT allowed? | Description |
105105
| -------------------- | ------------- | --------------------------- | ----------- |
106106
| gitBranchExpression | current git branch resolved from SCM or ${env.GIT_BRANCH} | n/a | Maven property expression to resolve in order to determine the current git branch |
107-
| masterBranchPattern | origin/master | No | Regex. When matched, signals the master branch is being built. Note the lack of a subgroup. |
108-
| releaseBranchPattern | origin/release/(.*) | No | Regex. When matched, signals a release branch being built. Last subgroup, if present, must match the Maven project version. |
109-
| hotfixBranchPattern | origin/hotfix/(.*) | No | Regex. When matched, signals a hotfix branch is being built. Last subgroup, if present, must match the Maven project version. |
110-
| developmentBranchPattern | origin/develop | Yes | Regex. When matched, signals a development branch is being built. Note the lack of a subgroup. |
107+
| masterBranchPattern | (origin/)?master | No | Regex. When matched, signals the master branch is being built. |
108+
| releaseBranchPattern | (origin/)?release/(.*) | No | Regex. When matched, signals a release branch being built. Last subgroup, if present, must match the Maven project version. |
109+
| hotfixBranchPattern | (origin/)?hotfix/(.*) | No | Regex. When matched, signals a hotfix branch is being built. Last subgroup, if present, must match the Maven project version. |
110+
| developmentBranchPattern | (origin/)?develop | Yes | Regex. When matched, signals a development branch is being built. Note the lack of a subgroup. |
111111

112112
## Goal: `retarget-deploy` (Branch Specific Deploy Targets & Staging)
113113

@@ -190,11 +190,8 @@ The following properties can be configured for this goal:
190190
| -------------------- | ------------- | ----------- |
191191
| gitBranchExpression | current git branch resolved from SCM or ${env.GIT_BRANCH} | Maven property expression to resolve in order to determine the current git branch |
192192
| gitURLExpression | current git branch resolved from SCM or ${env.GIT_URL} | Maven property expression to resolve for the GIT URL connection to use. |
193-
| masterBranchPattern | origin/master | Regex. When matched against the resolved value of `gitBranchExpression` this plugin executes the scm:tag goal using the `gitURLExpression` to resolve the git URL to use. |
193+
| masterBranchPattern | (origin/)?master | Regex. When matched against the resolved value of `gitBranchExpression` this plugin executes the scm:tag goal using the `gitURLExpression` to resolve the git URL to use. |
194194
| tag | ${project.version} | An expression to use for the SCM tag. |
195-
| tag.plugin.groupId | org.apache.maven.plugins | The groupId of the plugin to use for tagging. |
196-
| tag.plugin.artifactId | maven-scm-plugin | The artifactId of the plugin to use for tagging. |
197-
| tag.plugin.version | 1.9.4 | The version of the plugin to use for tagging. |
198195

199196

200197
## Goal: `promote-master` and the Build Extension. (Copy Staged Artifacts to Releases)

0 commit comments

Comments
 (0)