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 2019/01/02 10:55:27 UTC
[maven-scm] 01/01: [SCM-777] scm:validate ignores
scmCheckWorkingDirectoryUrl configuration in favor of system property
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-777
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit c212d867cd9af265f99c1f7391d4cd5e5a27f96c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jan 2 11:55:19 2019 +0100
[SCM-777] scm:validate ignores scmCheckWorkingDirectoryUrl configuration in favor of system property
---
.../src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java | 6 ++----
.../org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
index ae6989c..c894d76 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
@@ -56,12 +56,10 @@ public class ValidateMojo
private String scmDeveloperConnection;
/**
- * <em>(Subversion specific)</em> Enables checking that "URL" field returned by svn info matches what is specified
- * under the scm tag.
+ * <em>(Subversion specific)</em> Enables checking that "URL" field returned by 'svn info' matches what is
+ * specified under the scm tag.
*/
@Parameter( property = "scmCheckWorkingDirectoryUrl", defaultValue = "false" )
- // Actually unused in the code here. Present for doc purpose,
- // see org.apache.maven.scm.provider.svn.AbstractSvnScmProvider.CHECK_WORKING_DIRECTORY_URL
private boolean scmCheckWorkingDirectoryUrl;
/**
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
index 013afad..c65495b 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
@@ -72,8 +72,6 @@ public abstract class AbstractSvnScmProvider
private ScmProviderRepository repository;
}
- private static final String CHECK_WORKING_DIRECTORY_URL = "scmCheckWorkingDirectoryUrl";
-
// ----------------------------------------------------------------------
// ScmProvider Implementation
// ----------------------------------------------------------------------
@@ -127,7 +125,7 @@ public abstract class AbstractSvnScmProvider
private boolean checkWorkingDirectoryUrl()
{
- return Boolean.getBoolean( CHECK_WORKING_DIRECTORY_URL );
+ return StringUtils.isNotEmpty( System.getProperty( "scmCheckWorkingDirectoryUrl.currentWorkingDirectory" ) );
}
private String findUrlInfoItem( InfoScmResult infoScmResult )