mirror of https://github.com/apache/lucene.git
LUCENE-5511: "ant precommit" / "ant check-svn-working-copy" now work again with any working copy format (thanks to svnkit 1.8.4).
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1575714 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3e397f0189
commit
8c4068413f
|
@ -92,7 +92,7 @@
|
|||
<svn-checker failonmodifications="true"/>
|
||||
</target>
|
||||
|
||||
<property name="svnkit.version" value="1.7.8"/>
|
||||
<property name="svnkit.version" value="1.8.4"/>
|
||||
|
||||
<macrodef xmlns:ivy="antlib:org.apache.ivy.ant" name="svn-checker">
|
||||
<attribute name="failonmodifications" default="true"/> <!-- false if file modifications are allowed -->
|
||||
|
@ -107,8 +107,6 @@
|
|||
import org.tmatesoft.svn.core.wc.*;
|
||||
import org.apache.tools.ant.Project;
|
||||
|
||||
def RECOMMENDED_SVNKIT_18 = '1.8.2';
|
||||
|
||||
SVNClientManager manager = SVNClientManager.newInstance();
|
||||
SVNStatusClient statusClient = manager.getStatusClient();
|
||||
SVNWCClient wcClient = manager.getWCClient();
|
||||
|
@ -124,11 +122,7 @@
|
|||
def ec = ex.getErrorMessage().getErrorCode();
|
||||
int code = ec.getCode();
|
||||
int category = ec.getCategory();
|
||||
if (code == SVNErrorCode.WC_UNSUPPORTED_FORMAT.getCode()) {
|
||||
task.log('WARNING: Unsupported SVN working copy version! Disabling checks...', Project.MSG_WARN);
|
||||
task.log('If your working copy is on version 1.8 already, please pass -Dsvnkit.version=' + RECOMMENDED_SVNKIT_18 + ' to successfully run checks.', Project.MSG_INFO);
|
||||
return;
|
||||
} else if (code == SVNErrorCode.WC_NOT_DIRECTORY.getCode() || code == SVNErrorCode.WC_NOT_FILE.getCode()) {
|
||||
if (code == SVNErrorCode.WC_NOT_DIRECTORY.getCode() || code == SVNErrorCode.WC_NOT_FILE.getCode()) {
|
||||
task.log('WARNING: Development directory is not an SVN checkout! Disabling checks...', Project.MSG_WARN);
|
||||
return;
|
||||
} else if (category == SVNErrorCode.WC_CATEGORY) {
|
||||
|
|
|
@ -162,6 +162,9 @@ Build
|
|||
* LUCENE-5463: RamUsageEstimator.(human)sizeOf(Object) is now a forbidden API.
|
||||
(Adrien Grand, Robert Muir)
|
||||
|
||||
* LUCENE-5511: "ant precommit" / "ant check-svn-working-copy" now work again
|
||||
with any working copy format (thanks to svnkit 1.8.4). (Uwe Schindler)
|
||||
|
||||
======================= Lucene 4.7.0 =======================
|
||||
|
||||
New Features
|
||||
|
|
Loading…
Reference in New Issue