You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/12/05 12:53:59 UTC
[maven-scm] branch master updated: Provide version type constants
(revision, branch and tag)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new 761f7ba Provide version type constants (revision, branch and tag)
761f7ba is described below
commit 761f7babd827f35775dd92d75cf97b6dfe351309
Author: Clemens Quoss <cl...@quoss.de>
AuthorDate: Sat Dec 5 13:39:50 2020 +0100
Provide version type constants (revision, branch and tag)
This closes #108
---
.../org/apache/maven/scm/plugin/AbstractScmMojo.java | 16 +++++++++++++---
.../java/org/apache/maven/scm/plugin/ChangeLogMojo.java | 8 ++++----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
index a18e319..b0a3aea 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
@@ -60,6 +60,16 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
public abstract class AbstractScmMojo
extends AbstractMojo
{
+
+ protected static final String VERSION_TYPE_BRANCH = "branch";
+
+ protected static final String VERSION_TYPE_REVISION = "revision";
+
+ protected static final String VERSION_TYPE_TAG = "tag";
+
+ protected static final String[] VALID_VERSION_TYPES = { VERSION_TYPE_BRANCH,
+ VERSION_TYPE_REVISION, VERSION_TYPE_TAG };
+
/**
* The SCM connection URL.
*/
@@ -472,17 +482,17 @@ public abstract class AbstractScmMojo
return null;
}
- if ( "branch".equals( versionType ) )
+ if ( VERSION_TYPE_BRANCH.equals( versionType ) )
{
return new ScmBranch( version );
}
- if ( "tag".equals( versionType ) )
+ if ( VERSION_TYPE_TAG.equals( versionType ) )
{
return new ScmTag( version );
}
- if ( "revision".equals( versionType ) )
+ if ( VERSION_TYPE_REVISION.equals( versionType ) )
{
return new ScmRevision( version );
}
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
index 1f777a2..8de8056 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
@@ -126,11 +126,11 @@ public class ChangeLogMojo
ScmProvider provider = getScmManager().getProviderByRepository( repository );
ScmVersion startRev =
- getScmVersion( StringUtils.isEmpty( startScmVersionType ) ? "revision" : startScmVersionType,
- startScmVersion );
+ getScmVersion( StringUtils.isEmpty( startScmVersionType ) ? VERSION_TYPE_REVISION
+ : startScmVersionType, startScmVersion );
ScmVersion endRev =
- getScmVersion( StringUtils.isEmpty( endScmVersionType ) ? "revision" : endScmVersionType,
- endScmVersion );
+ getScmVersion( StringUtils.isEmpty( endScmVersionType ) ? VERSION_TYPE_REVISION
+ : endScmVersionType, endScmVersion );
ChangeLogScmResult result;
if ( startRev != null || endRev != null )