| commit | d1e39332e8bbb2298498a2c4e43c13951474a3ed | [log] [tgz] |
|---|---|---|
| author | Michael Osipov <michaelo@apache.org> | Fri Mar 30 02:43:43 2018 +0200 |
| committer | Michael Osipov <michaelo@apache.org> | Sun Sep 09 22:23:15 2018 +0200 |
| tree | 9862d1b8bb18be90d409921f75b10dacc6df8917 | |
| parent | 66a260a9107b6cec0c4ebfb9a42e9cc808512e90 [diff] |
[SCM-877] AbstractSvnScmProvider#parseScmUrl() accepts file URLs with backslashes while SvnTagBranchUtils cannot handle them
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 @@ 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 @@ throws Exception { testIllegalUrl( "file:/tmp/svn" ); + testIllegalUrl( "file:///C:\\tmp\\svn" ); } // ----------------------------------------------------------------------