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/07/23 19:55:38 UTC
svn commit: r1364738 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/ lucene/backwards/ lucene/benchmark/ lucene/core/
lucene/demo/ lucene/facet/ lucene/grouping/ lucene/highlighter/
lucene/join/ lucene/memory/ lucene/misc/ l...
Author: hossman
Date: Mon Jul 23 17:55:36 2012
New Revision: 1364738
URL: http://svn.apache.org/viewvc?rev=1364738&view=rev
Log:
SOLR-3623: Fixed inconsistent treatment of third-party dependencies for solr contribs analysis-extras & uima (merge r1364728)
Added:
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-polish-LICENSE-BSD.txt
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-polish-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt
- copied unchanged from r1364728, lucene/dev/trunk/solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt
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/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/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (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 (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/contrib/analysis-extras/README.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/uima/README.txt
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/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/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1364738&r1=1364737&r2=1364738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jul 23 17:55:36 2012
@@ -127,6 +127,10 @@ Bug Fixes
* SOLR-3663: There are a couple of bugs in the sync process when a leader goes down and a
new leader is elected. (Mark Miller)
+* SOLR-3623: Fixed inconsistent treatment of third-party dependencies for
+ solr contribs analysis-extras & uima (hossman)
+
+
Other Changes
----------------------
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=1364738&r1=1364737&r2=1364738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Mon Jul 23 17:55:36 2012
@@ -70,21 +70,32 @@
-->
<property name="solr.spec.version" value="4.0.0.${dateversion}" />
+ <path id="solr.lucene.libs">
+ <!-- List of jars that will be used as the foundation for both
+ the base classpath, as well as copied into the lucene-libs dir
+ in the release.
+ -->
+ <!-- NOTE: lucene-core is explicitly not included because of the
+ base.classpath (compilation & tests are done directly against
+ the class files w/o needing to build the jar)
+ -->
+ <pathelement location="${analyzers-common.jar}"/>
+ <pathelement location="${analyzers-kuromoji.jar}"/>
+ <pathelement location="${analyzers-phonetic.jar}"/>
+ <pathelement location="${highlighter.jar}"/>
+ <pathelement location="${memory.jar}"/>
+ <pathelement location="${misc.jar}"/>
+ <pathelement location="${spatial.jar}"/>
+ <pathelement location="${suggest.jar}"/>
+ <pathelement location="${grouping.jar}"/>
+ <pathelement location="${queries.jar}"/>
+ <pathelement location="${queryparser.jar}"/>
+ </path>
+
<path id="solr.base.classpath">
- <pathelement path="${analyzers-common.jar}"/>
- <pathelement path="${analyzers-kuromoji.jar}"/>
- <pathelement path="${analyzers-phonetic.jar}"/>
- <pathelement path="${analyzers-uima.jar}"/>
- <pathelement path="${highlighter.jar}"/>
- <pathelement path="${memory.jar}"/>
- <pathelement path="${misc.jar}"/>
- <pathelement path="${spatial.jar}"/>
- <pathelement path="${suggest.jar}"/>
- <pathelement path="${grouping.jar}"/>
- <pathelement path="${queries.jar}"/>
- <pathelement path="${queryparser.jar}"/>
<pathelement location="${common-solr.dir}/build/solr-solrj/classes/java"/>
<pathelement location="${common-solr.dir}/build/solr-core/classes/java"/>
+ <path refid="solr.lucene.libs" />
<path refid="additional.dependencies"/>
<path refid="base.classpath"/>
</path>
@@ -125,7 +136,7 @@
</target>
<target name="prep-lucene-jars"
- depends="jar-lucene-core, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-analyzers-morfologik, jar-suggest, jar-highlighter, jar-memory,
+ depends="jar-lucene-core, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-suggest, jar-highlighter, jar-memory,
jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser">
<property name="solr.deps.compiled" value="true"/>
</target>
@@ -137,19 +148,11 @@
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<copy todir="${lucene-libs}" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
+ <path refid="solr.lucene.libs" />
+ <!-- NOTE: lucene-core is not already included in "solr.lucene.libs"
+ because of it's use in classpaths.
+ -->
<fileset file="${lucene-core.jar}" />
- <fileset file="${analyzers-common.jar}" />
- <fileset file="${analyzers-kuromoji.jar}" />
- <fileset file="${analyzers-phonetic.jar}" />
- <fileset file="${suggest.jar}" />
- <fileset file="${grouping.jar}" />
- <fileset file="${queries.jar}" />
- <fileset file="${queryparser.jar}" />
- <fileset file="${highlighter.jar}" />
- <fileset file="${memory.jar}" />
- <fileset file="${misc.jar}" />
- <fileset file="${spatial.jar}" />
- <fileset refid="analyzers-morfologik.fileset" />
</copy>
</sequential>
</target>
Modified: lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/README.txt?rev=1364738&r1=1364737&r2=1364738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/README.txt (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/README.txt Mon Jul 23 17:55:36 2012
@@ -9,8 +9,11 @@ Relies upon the following lucene compone
* lucene-analyzers-icu-X.Y.jar
* lucene-analyzers-smartcn-X.Y.jar
* lucene-analyzers-stempel-X.Y.jar
-
-And the ICU library (in lib/):
+ * lucene-analyzers-morfologik-X.Y.jar
+ * lucene-analyzers-smartcn-X.Y.jar
+
+And the following third-party library (in lib/):
* icu4j-X.Y.jar
+ * morfologik-*.jar
Modified: lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/build.xml?rev=1364738&r1=1364737&r2=1364738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/build.xml Mon Jul 23 17:55:36 2012
@@ -24,13 +24,17 @@
</description>
<import file="../contrib-build.xml"/>
+
+ <path id="analysis.extras.lucene.libs">
+ <pathelement location="${analyzers-icu.jar}"/>
+ <pathelement location="${analyzers-smartcn.jar}"/>
+ <pathelement location="${analyzers-stempel.jar}"/>
+ <pathelement location="${analyzers-morfologik.jar}"/>
+ </path>
<path id="classpath">
- <fileset dir="lib" excludes="${common.classpath.excludes}"/>
- <pathelement path="${analyzers-icu.jar}"/>
- <pathelement path="${analyzers-smartcn.jar}"/>
- <pathelement path="${analyzers-stempel.jar}"/>
- <fileset refid="analyzers-morfologik.fileset" />
+ <fileset dir="lib" excludes="${common.classpath.excludes}"/>
+ <path refid="analysis.extras.lucene.libs" />
<path refid="solr.base.classpath"/>
</path>
@@ -38,10 +42,7 @@
depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel, jar-analyzers-morfologik">
<mkdir dir="${build.dir}/lucene-libs"/>
<copy todir="${build.dir}/lucene-libs" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
- <fileset file="${analyzers-icu.jar}"/>
- <fileset file="${analyzers-smartcn.jar}"/>
- <fileset file="${analyzers-stempel.jar}"/>
- <fileset refid="analyzers-morfologik.fileset" />
+ <path refid="analysis.extras.lucene.libs" />
</copy>
</target>
Modified: lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml?rev=1364738&r1=1364737&r2=1364738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml Mon Jul 23 17:55:36 2012
@@ -20,6 +20,9 @@
<info organisation="org.apache.solr" module="analysis-extras"/>
<dependencies>
<dependency org="com.ibm.icu" name="icu4j" rev="4.8.1.1" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-polish" rev="1.5.3" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-fsa" rev="1.5.3" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-stemming" rev="1.5.3" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/contrib/uima/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/uima/README.txt?rev=1364738&r1=1364737&r2=1364738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/uima/README.txt (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/uima/README.txt Mon Jul 23 17:55:36 2012
@@ -6,6 +6,7 @@ To start using Solr UIMA Metadata Extrac
or set <lib/> tags in solrconfig.xml appropriately to point those jar files.
<lib dir="../../contrib/uima/lib" />
+ <lib dir="../../contrib/uima/lucene-libs" />
<lib dir="../../dist/" regex="apache-solr-uima-\d.*\.jar" />
2. modify your schema.xml adding the fields you want to be hold metadata specifying proper values for type, indexed, stored and multiValued options: