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 2011/03/25 16:56:19 UTC
svn commit: r1085435 - in /lucene/dev/branches/lucene_solr_3_1: ./ lucene/
lucene/build.xml lucene/contrib/lucli/build.xml
lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java solr/
solr/build.xml solr/common-build.xml
Author: uschindler
Date: Fri Mar 25 15:56:18 2011
New Revision: 1085435
URL: http://svn.apache.org/viewvc?rev=1085435&view=rev
Log:
Merge LUCENE-2989, LUCENE-2973
Modified:
lucene/dev/branches/lucene_solr_3_1/ (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/build.xml
lucene/dev/branches/lucene_solr_3_1/lucene/contrib/lucli/build.xml (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java
lucene/dev/branches/lucene_solr_3_1/solr/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
Modified: lucene/dev/branches/lucene_solr_3_1/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/build.xml?rev=1085435&r1=1085434&r2=1085435&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/build.xml Fri Mar 25 15:56:18 2011
@@ -373,8 +373,14 @@
<target name="svn-export-source" depends="get-svn-info">
<delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/>
<mkdir dir="${build.dir}"/>
- <exec dir="." executable="svn" failonerror="true">
- <arg line="export --native-eol LF -r ${svn.Revision} ${svn.URL} ${svn.export.dir}"/>
+ <exec dir="." executable="${svn.exe}" failonerror="true">
+ <arg value="export"/>
+ <arg value="--native-eol"/>
+ <arg value="LF"/>
+ <arg value="-r"/>
+ <arg value="${svn.Revision}"/>
+ <arg value="${svn.URL}"/>
+ <arg value="${svn.export.dir}"/>
</exec>
<build-changes changes.src.dir="${svn.export.dir}/src/site/changes" changes.target.dir="${svn.export.dir}/docs/changes"/>
</target>
@@ -383,7 +389,7 @@
<!-- Populates properties svn.URL and svn.Revision using "svn info". -->
<!-- ================================================================== -->
<target name="get-svn-info">
- <exec dir="." executable="svn" outputproperty="svn.info" failonerror="true">
+ <exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
<arg value="info"/>
</exec>
<loadproperties>
Modified: lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java?rev=1085435&r1=1085434&r2=1085435&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java Fri Mar 25 15:56:18 2011
@@ -91,7 +91,7 @@ public class TestCollectionUtil extends
// should produce no exceptions
public void testEmptyArraySort() {
- List<Integer> list = Collections.emptyList();
+ List<Integer> list = Arrays.asList(new Integer[0]);
CollectionUtil.quickSort(list);
CollectionUtil.mergeSort(list);
CollectionUtil.insertionSort(list);
Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1085435&r1=1085434&r2=1085435&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Fri Mar 25 15:56:18 2011
@@ -761,14 +761,20 @@
<target name="svn-export-source" depends="get-svn-info">
<delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/>
<mkdir dir="${dest}"/>
- <exec dir="." executable="svn" failonerror="true">
- <arg line="export --native-eol LF -r ${svn.Revision} ${svn.URL} ${svn.export.dir}"/>
+ <exec dir="." executable="${svn.exe}" failonerror="true">
+ <arg value="export"/>
+ <arg value="--native-eol"/>
+ <arg value="LF"/>
+ <arg value="-r"/>
+ <arg value="${svn.Revision}"/>
+ <arg value="${svn.URL}"/>
+ <arg value="${svn.export.dir}"/>
</exec>
</target>
<!-- Populates properties svn.URL and svn.Revision using "svn info" -->
<target name="get-svn-info">
- <exec dir=".." executable="svn" outputproperty="svn.info" failonerror="true">
+ <exec dir=".." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
<arg value="info"/>
</exec>
<loadproperties>
@@ -868,7 +874,7 @@
</target>
<target name="svn-up">
- <exec executable="svn">
+ <exec executable="${svn.exe}">
<arg value="update"/>
</exec>
</target>
Modified: lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml?rev=1085435&r1=1085434&r2=1085435&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml Fri Mar 25 15:56:18 2011
@@ -80,6 +80,7 @@
default PATH. (this is useful for Hudson)
-->
<property name="svnversion.exe" value="svnversion" />
+ <property name="svn.exe" value="svn" />
<!-- Java Version we are compatible with -->
<property name="java.compat.version" value="1.5" />