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/17 19:59:05 UTC
svn commit: r1578514 - in /lucene/dev/branches/lucene_solr_4_7: ./
extra-targets.xml lucene/ lucene/CHANGES.txt
Author: uschindler
Date: Mon Mar 17 18:59:04 2014
New Revision: 1578514
URL: http://svn.apache.org/r1578514
Log:
Merged revision(s) 1575715 from lucene/dev/branches/branch_4x:
Merged revision(s) 1575714 from lucene/dev/trunk:
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/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/extra-targets.xml
lucene/dev/branches/lucene_solr_4_7/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt (contents, props changed)
Modified: lucene/dev/branches/lucene_solr_4_7/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/extra-targets.xml?rev=1578514&r1=1578513&r2=1578514&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/extra-targets.xml (original)
+++ lucene/dev/branches/lucene_solr_4_7/extra-targets.xml Mon Mar 17 18:59:04 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/branches/lucene_solr_4_7/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt?rev=1578514&r1=1578513&r2=1578514&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt Mon Mar 17 18:59:04 2014
@@ -19,6 +19,11 @@ Bug Fixes
* LUCENE-5532: AutomatonQuery.hashCode was not thread-safe. (Robert Muir)
+Build
+
+* 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