You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/08/15 20:35:37 UTC
svn commit: r1373557 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/core/ lucene/demo/ lucene/facet/ lucene/grouping/
luce...
Author: hossman
Date: Wed Aug 15 18:35:23 2012
New Revision: 1373557
URL: http://svn.apache.org/viewvc?rev=1373557&view=rev
Log:
SOLR-3690: Fixed binary release packages to include dependencies needed for the solr-test-framework (merge r1373553)
Added:
lucene/dev/branches/branch_4x/solr/test-framework/README.txt
- copied unchanged from r1373553, lucene/dev/trunk/solr/test-framework/README.txt
lucene/dev/branches/branch_4x/solr/test-framework/lib/ (props changed)
- copied from r1373553, lucene/dev/trunk/solr/test-framework/lib/
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/build.xml
lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/module-build.xml?rev=1373557&r1=1373556&r2=1373557&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/module-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/module-build.xml Wed Aug 15 18:35:23 2012
@@ -90,6 +90,28 @@
</sequential>
</macrodef>
+ <property name="test-framework.jar" value="${common.dir}/build/test-framework/lucene-test-framework-${version}.jar"/>
+ <target name="check-test-framework-uptodate" unless="test-framework.uptodate">
+ <module-uptodate name="test-framework" jarfile="${test-framework.jar}" property="test-framework.uptodate"/>
+ </target>
+ <target name="jar-test-framework" unless="test-framework.uptodate" depends="check-test-framework-uptodate">
+ <ant dir="${common.dir}/test-framework" target="jar-core" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="test-framework.uptodate" value="true"/>
+ </target>
+
+ <property name="test-framework-javadoc.jar" value="${common.dir}/build/test-framework/lucene-test-framework-${version}-javadoc.jar"/>
+ <target name="check-test-framework-javadocs-uptodate" unless="test-framework-javadocs.uptodate">
+ <module-uptodate name="test-framework" jarfile="${test-framework-javadoc.jar}" property="test-framework-javadocs.uptodate"/>
+ </target>
+ <target name="javadocs-test-framework" unless="test-framework-javadocs.uptodate" depends="check-test-framework-javadocs-uptodate">
+ <ant dir="${common.dir}/test-framework" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="test-framework-javadocs.uptodate" value="true"/>
+ </target>
+
<property name="queryparser.jar" value="${common.dir}/build/queryparser/lucene-queryparser-${version}.jar"/>
<target name="check-queryparser-uptodate" unless="queryparser.uptodate">
<module-uptodate name="queryparser" jarfile="${queryparser.jar}" property="queryparser.uptodate"/>
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1373557&r1=1373556&r2=1373557&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Aug 15 18:35:23 2012
@@ -62,6 +62,12 @@ Bug Fixes
* SOLR-3730: Rollback is not implemented quite right and can cause corner case fails in
SolrCloud tests. (rmuir, Mark Miller)
+Other Changes
+----------------------
+
+* SOLR-3690: Fixed binary release packages to include dependencie needed for
+ the solr-test-framework (hossman)
+
================== 4.0.0-BETA ===================
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1373557&r1=1373556&r2=1373557&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Wed Aug 15 18:35:23 2012
@@ -386,8 +386,9 @@
<tarfileset dir="."
prefix="${fullnamever}"
includes="LICENSE.txt NOTICE.txt CHANGES.txt README.txt example/**
- client/README.txt client/ruby/solr-ruby/** contrib/**/lib/**
- contrib/**/README.txt licenses/**"
+ client/README.txt client/ruby/solr-ruby/**
+ contrib/**/lib/** contrib/**/README.txt
+ licenses/**"
excludes="lib/README.committers.txt **/data/ **/logs/*
**/classes/ **/*.sh **/ivy.xml **/build.xml
**/bin/ **/*.iml **/*.ipr **/*.iws **/pom.xml
@@ -401,7 +402,9 @@
includes="example/**/*.sh example/**/bin/" />
<tarfileset dir="."
prefix="${fullnamever}"
- includes="dist/*.jar dist/*.war dist/solrj-lib/*"
+ includes="dist/*.jar dist/*.war
+ dist/solrj-lib/*
+ dist/test-framework/**"
excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar **/*.sha1" />
<tarfileset dir="${dest}/docs"
prefix="${fullnamever}/docs" />
Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1373557&r1=1373556&r2=1373557&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Wed Aug 15 18:35:23 2012
@@ -193,7 +193,7 @@
<property name="lucenedocs" location="${common.dir}/build/docs"/>
<!-- dependency to ensure all lucene javadocs are present -->
- <target name="lucene-javadocs" depends="javadocs-lucene-core,javadocs-analyzers-common,javadocs-analyzers-icu,javadocs-analyzers-kuromoji,javadocs-analyzers-phonetic,javadocs-analyzers-smartcn,javadocs-analyzers-morfologik,javadocs-analyzers-stempel,javadocs-analyzers-uima,javadocs-suggest,javadocs-grouping,javadocs-queries,javadocs-queryparser,javadocs-highlighter,javadocs-memory,javadocs-misc,javadocs-spatial"/>
+ <target name="lucene-javadocs" depends="javadocs-lucene-core,javadocs-analyzers-common,javadocs-analyzers-icu,javadocs-analyzers-kuromoji,javadocs-analyzers-phonetic,javadocs-analyzers-smartcn,javadocs-analyzers-morfologik,javadocs-analyzers-stempel,javadocs-analyzers-uima,javadocs-suggest,javadocs-grouping,javadocs-queries,javadocs-queryparser,javadocs-highlighter,javadocs-memory,javadocs-misc,javadocs-spatial,javadocs-test-framework"/>
<!-- create javadocs for the current module -->
<target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs">
Modified: lucene/dev/branches/branch_4x/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/build.xml?rev=1373557&r1=1373556&r2=1373557&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/build.xml Wed Aug 15 18:35:23 2012
@@ -20,10 +20,14 @@
<import file="../common-build.xml"/>
- <path id="javadoc.classpath">
- <path refid="test.classpath"/>
- <pathelement location="${common.dir}/build/test-framework/classes/java"/>
- <pathelement location="${build.dir}/classes/java"/>
+ <path id="solr.test.framework.lucene.libs">
+ <pathelement location="${test-framework.jar}"/>
+ </path>
+
+ <path id="classpath">
+ <fileset dir="lib" excludes="${common.classpath.excludes}"/>
+ <path refid="solr.test.framework.lucene.libs" />
+ <path refid="solr.base.classpath"/>
</path>
<!-- Redefine Lucene test-framework compilation here to avoid circular dependency on compile-core -->
@@ -39,19 +43,26 @@
</compile>
</target>
- <!-- Override common-solr.javadocs to include JUnit,test-framework links -->
+ <!-- Override common-solr.javadocs to include JUnit links -->
<!-- and to copy the built javadocs to ${dest}/docs/api/test-framework -->
<target name="javadocs"
- depends="compile-core,lucene-javadocs,javadocs-test-framework,define-lucene-javadoc-url">
+ depends="compile-core,jar-test-framework,lucene-javadocs,javadocs-test-framework,define-lucene-javadoc-url">
<sequential>
<mkdir dir="${javadoc.dir}"/>
+ <!-- NOTE: explicitly not using solr-invoke-javadoc, or attempting to
+ link to lucene-test-framework because if we did javadoc would
+ attempt to link class refs in in org.apache.lucene, causing
+ broken links. (either broken links to things like "Directory" if
+ lucene-test-framework was first, or broken links to things like
+ LuceneTestCase if lucene-core was first)
+ -->
<invoke-javadoc destdir="${javadoc.dir}"
- title="${Name}" overview="${src.dir}/overview.html">
- <sources>
- <link offline="true" href="${javadoc.link.junit}"
- packagelistLoc="${javadoc.packagelist.dir}/junit"/>
- <packageset dir="${src.dir}"/>
- </sources>
+ title="${Name} ${version} Test Framework API">
+ <sources>
+ <link offline="true" href="${javadoc.link.junit}"
+ packagelistLoc="${javadoc.packagelist.dir}/junit"/>
+ <packageset dir="${src.dir}"/>
+ </sources>
</invoke-javadoc>
<solr-jarify basedir="${javadoc.dir}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
<mkdir dir="${dest}/docs/api/test-framework"/>
@@ -60,5 +71,28 @@
</copy>
</sequential>
</target>
+
+ <target name="module-jars-to-solr"
+ depends="jar-test-framework">
+ <mkdir dir="${build.dir}/lucene-libs"/>
+ <copy todir="${build.dir}/lucene-libs" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
+ <path refid="solr.test.framework.lucene.libs" />
+ </copy>
+ </target>
+
+ <target name="dist" depends="module-jars-to-solr, common-solr.dist">
+ <!-- we're not a contrib, our lucene-libs and go in a special place -->
+ <mkdir dir="${dist}/test-framework" />
+ <copy todir="${dist}/test-framework">
+ <fileset dir="${build.dir}">
+ <include name="lucene-libs/*.jar" />
+ </fileset>
+ <fileset dir=".">
+ <include name="lib/*" />
+ <include name="README.txt" />
+ </fileset>
+ </copy>
+ </target>
+
</project>
Modified: lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml?rev=1373557&r1=1373556&r2=1373557&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml Wed Aug 15 18:35:23 2012
@@ -17,5 +17,25 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.solr" module="core-test-framework"/>
+ <info organisation="org.apache.solr" module="solr-test-framework"/>
+
+ <configurations>
+ <conf name="default" />
+ <!--
+ JUnit4 ANT task only, no ANT.
+ This is used from build scripts for taskdefs.
+ -->
+ <conf name="junit4-stdalone" />
+ </configurations>
+
+ <dependencies defaultconf="default">
+ <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.8.2" transitive="false" />
+
+ <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.0.rc5" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.0.rc5" transitive="false" conf="default->*;junit4-stdalone->*" />
+
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>