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 2018/03/30 01:16:17 UTC
[maven-scm] 01/01: [SCM-877] AbstractSvnScmProvider#parseScmUrl()
accepts file URLs with backslashes while SvnTagBranchUtils cannot handle
them
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-877
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 8ea5e028936267418e5621c99ba66ae51fb99a52
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Mar 30 02:43:43 2018 +0200
[SCM-877] AbstractSvnScmProvider#parseScmUrl() accepts file URLs with backslashes while SvnTagBranchUtils cannot handle them
---
.../org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java | 7 +++++++
.../scm/provider/svn/repository/SvnScmProviderRepositoryTest.java | 1 +
2 files changed, 8 insertions(+)
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..ba78306 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
@@ -226,6 +226,13 @@ public abstract class AbstractSvnScmProvider
return result;
}
+ else if ( url.contains( "\\" ) )
+ {
+ result.messages.add( "A svn 'file' url must be on the form 'file:///C:/path/to/repo'." );
+
+ return result;
+ }
+
}
else if ( url.startsWith( "https" ) )
{
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
index f34f5a2..19d9eda 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
@@ -178,6 +178,7 @@ public class SvnScmProviderRepositoryTest
throws Exception
{
testIllegalUrl( "file:/tmp/svn" );
+ testIllegalUrl( "file:///C:\\tmp\\svn" );
}
// ----------------------------------------------------------------------
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.