You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/03/09 16:43:23 UTC
svn commit: r1575714 - in /lucene/dev/trunk: extra-targets.xml
lucene/CHANGES.txt
Author: uschindler
Date: Sun Mar 9 15:43:22 2014
New Revision: 1575714
URL: http://svn.apache.org/r1575714
Log:
LUCENE-5511: "ant precommit" / "ant check-svn-working-copy" now work again with any working copy format (thanks to svnkit 1.8.4).
Modified:
lucene/dev/trunk/extra-targets.xml
lucene/dev/trunk/lucene/CHANGES.txt
Modified: lucene/dev/trunk/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/extra-targets.xml?rev=1575714&r1=1575713&r2=1575714&view=diff
==============================================================================
--- lucene/dev/trunk/extra-targets.xml (original)
+++ lucene/dev/trunk/extra-targets.xml Sun Mar 9 15:43:22 2014
@@ -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) {
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1575714&r1=1575713&r2=1575714&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sun Mar 9 15:43:22 2014
@@ -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