[lucene] Update to upstream 3.6.0 release.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Jul 3 20:58:57 UTC 2012
commit e530045e3cc1cbedb3ee978c12d49f5c18075fbc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Jul 3 23:50:28 2012 +0300
Update to upstream 3.6.0 release.
.gitignore | 2 +
ivy-conf.xml | 20 ++++++
lucene-2.9.4-analysis-OSGi-MANIFEST.MF | 24 -------
lucene-2.9.4-core-OSGi-MANIFEST.MF | 24 -------
lucene-3.6.0-analysis-OSGi-MANIFEST.MF | 56 ++++++++++++++++
lucene-3.6.0-core-OSGi-MANIFEST.MF | 34 ++++++++++
lucene.spec | 114 ++++++++++++++++----------------
sources | 3 +-
8 files changed, 171 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac94ef8..6f9b43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
lucene-2.4.1-src.tar.gz
/lucene-2.9.4-src.tar.gz
+/lucene-3.6.0-src.tgz
+dev-tools.tar.xz
diff --git a/ivy-conf.xml b/ivy-conf.xml
new file mode 100644
index 0000000..161f723
--- /dev/null
+++ b/ivy-conf.xml
@@ -0,0 +1,20 @@
+<ivy-conf>
+ <properties file="build.properties" />
+
+ <conf defaultResolver="default-resolver" checkUpToDate="true" />
+
+ <resolvers>
+ <filesystem name="local">
+ <ivy pattern="${ivy.conf.dir}/lib/[module]/apache-ivy-[revision].xml" />
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ </filesystem>
+
+ <ivyrep name="ivyrep" ivyroot="."/>
+
+ <chain name="default-resolver">
+ <resolver ref="local" />
+ <resolver ref="ivyrep" />
+ </chain>
+ </resolvers>
+
+</ivy-conf>
\ No newline at end of file
diff --git a/lucene-3.6.0-analysis-OSGi-MANIFEST.MF b/lucene-3.6.0-analysis-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..48bd0c5
--- /dev/null
+++ b/lucene-3.6.0-analysis-OSGi-MANIFEST.MF
@@ -0,0 +1,56 @@
+Manifest-Version: 1.0
+Implementation-Vendor: The Apache Software Foundation
+Bundle-Localization: plugin
+X-Compile-Target-JDK: 1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-SymbolicName: org.apache.lucene.analysis
+Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
+ ls:org.eclipse.orbit/org.apache.lucene.analysis;tag=v20120319-2345
+Require-Bundle: org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)"
+Export-Package: org.apache.lucene.analysis.ar;version="3.5.0",org.apac
+ he.lucene.analysis.bg;version="3.5.0",org.apache.lucene.analysis.br;v
+ ersion="3.5.0",org.apache.lucene.analysis.ca;version="3.5.0",org.apac
+ he.lucene.analysis.cjk;version="3.5.0",org.apache.lucene.analysis.cn;
+ version="3.5.0",org.apache.lucene.analysis.compound;version="3.5.0",o
+ rg.apache.lucene.analysis.compound.hyphenation;version="3.5.0",org.ap
+ ache.lucene.analysis.cz;version="3.5.0",org.apache.lucene.analysis.da
+ ;version="3.5.0",org.apache.lucene.analysis.de;version="3.5.0",org.ap
+ ache.lucene.analysis.el;version="3.5.0",org.apache.lucene.analysis.en
+ ;version="3.5.0",org.apache.lucene.analysis.es;version="3.5.0",org.ap
+ ache.lucene.analysis.eu;version="3.5.0",org.apache.lucene.analysis.fa
+ ;version="3.5.0",org.apache.lucene.analysis.fi;version="3.5.0",org.ap
+ ache.lucene.analysis.fr;version="3.5.0",org.apache.lucene.analysis.gl
+ ;version="3.5.0",org.apache.lucene.analysis.hi;version="3.5.0",org.ap
+ ache.lucene.analysis.hu;version="3.5.0",org.apache.lucene.analysis.hu
+ nspell;version="3.5.0",org.apache.lucene.analysis.hy;version="3.5.0",
+ org.apache.lucene.analysis.id;version="3.5.0",org.apache.lucene.analy
+ sis.in;version="3.5.0",org.apache.lucene.analysis.it;version="3.5.0",
+ org.apache.lucene.analysis.lv;version="3.5.0",org.apache.lucene.analy
+ sis.miscellaneous;version="3.5.0",org.apache.lucene.analysis.ngram;ve
+ rsion="3.5.0",org.apache.lucene.analysis.nl;version="3.5.0",org.apach
+ e.lucene.analysis.no;version="3.5.0",org.apache.lucene.analysis.path;
+ version="3.5.0",org.apache.lucene.analysis.payloads;version="3.5.0",o
+ rg.apache.lucene.analysis.position;version="3.5.0",org.apache.lucene.
+ analysis.pt;version="3.5.0",org.apache.lucene.analysis.query;version=
+ "3.5.0",org.apache.lucene.analysis.reverse;version="3.5.0",org.apache
+ .lucene.analysis.ro;version="3.5.0",org.apache.lucene.analysis.ru;ver
+ sion="3.5.0",org.apache.lucene.analysis.shingle;version="3.5.0",org.a
+ pache.lucene.analysis.sinks;version="3.5.0",org.apache.lucene.analysi
+ s.snowball;version="3.5.0",org.apache.lucene.analysis.sv;version="3.5
+ .0",org.apache.lucene.analysis.synonym;version="3.5.0",org.apache.luc
+ ene.analysis.th;version="3.5.0",org.apache.lucene.analysis.tr;version
+ ="3.5.0",org.apache.lucene.analysis.util;version="3.5.0",org.apache.l
+ ucene.analysis.wikipedia;version="3.5.0"
+Bundle-Version: 3.5.0.v20120319-2345
+X-Compile-Source-JDK: 1.5
+Specification-Version: 3.5.0
+Specification-Title: Lucene Search Engine: analyzers
+Specification-Vendor: The Apache Software Foundation
+Bundle-Vendor: %providerName
+Bundle-Name: %pluginName
+Extension-Name: org.apache.lucene
+Implementation-Title: org.apache.lucene
+Implementation-Version: 3.5.0 1204988 - simon - 2011-11-22 14:48:16
+Import-Package: org.xml.sax;resolution:=optional
+Bundle-ManifestVersion: 2
+
diff --git a/lucene-3.6.0-core-OSGi-MANIFEST.MF b/lucene-3.6.0-core-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..c8bb448
--- /dev/null
+++ b/lucene-3.6.0-core-OSGi-MANIFEST.MF
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Implementation-Vendor: The Apache Software Foundation
+Bundle-Localization: plugin
+X-Compile-Target-JDK: 1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-SymbolicName: org.apache.lucene.core
+Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
+ ls:org.eclipse.orbit/org.apache.lucene.core;tag=v20120319-2345
+Export-Package: org.apache.lucene;version="3.5.0",org.apache.lucene.an
+ alysis;version="3.5.0",org.apache.lucene.analysis.standard;version="3
+ .5.0",org.apache.lucene.analysis.standard.std31;version="3.5.0",org.a
+ pache.lucene.analysis.tokenattributes;version="3.5.0",org.apache.luce
+ ne.collation;version="3.5.0",org.apache.lucene.document;version="3.5.
+ 0",org.apache.lucene.index;core=split;version="3.5.0";mandatory:=core
+ ,org.apache.lucene.messages;version="3.5.0",org.apache.lucene.queryPa
+ rser;version="3.5.0",org.apache.lucene.search;core=split;version="3.5
+ .0";mandatory:=core,org.apache.lucene.search.function;version="3.5.0"
+ ,org.apache.lucene.search.payloads;version="3.5.0",org.apache.lucene.
+ search.spans;version="3.5.0",org.apache.lucene.store;core=split;versi
+ on="3.5.0";mandatory:=core,org.apache.lucene.util;version="3.5.0",org
+ .apache.lucene.util.fst;version="3.5.0",org.apache.lucene.util.packed
+ ;version="3.5.0"
+Bundle-Version: 3.5.0.v20120319-2345
+X-Compile-Source-JDK: 1.5
+Specification-Version: 3.5.0
+Specification-Title: Lucene Search Engine: core
+Specification-Vendor: The Apache Software Foundation
+Bundle-Vendor: %provider.name
+Bundle-Name: %bundle.name
+Extension-Name: org.apache.lucene
+Implementation-Title: org.apache.lucene
+Implementation-Version: 3.5.0 1204988 - simon - 2011-11-22 14:46:51
+Bundle-ManifestVersion: 2
+
diff --git a/lucene.spec b/lucene.spec
index 389124b..54218c5 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -30,15 +30,19 @@
Summary: High-performance, full-featured text search engine
Name: lucene
-Version: 2.9.4
-Release: 8%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
Group: Development/Libraries
-Source0: http://archive.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
+Source0: http://www.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz
Source1: lucene-%{version}-core-OSGi-MANIFEST.MF
Source2: lucene-%{version}-analysis-OSGi-MANIFEST.MF
+Source3: ivy-conf.xml
+#svn checkout http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_0/dev-tools
+#tar caf dev-tools.tar.xz dev-tools/
+Source4: dev-tools.tar.xz
Patch1: 0001-Remove-bdb-packageset.patch
Patch2: 0002-Fix-version-string.patch
Patch3: 0003-Remove-classpath.patch
@@ -57,12 +61,15 @@ BuildRequires: zip
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: apache-commons-compress
BuildRequires: icu4j
+BuildRequires: apache-ivy
+BuildRequires: lucene
# for tests
BuildRequires: subversion
Provides: lucene-core = %{epoch}:%{version}-%{release}
# previously used by eclipse but no longer needed
-Obsoletes: lucene-devel < %{version}
+Obsoletes: lucene-devel < %{epoch}:%{version}-%{release}
+Obsoletes: lucene-demo < %{epoch}:%{version}-%{release}
BuildArch: noarch
Requires: jpackage-utils
@@ -81,14 +88,6 @@ Requires: jpackage-utils
%description javadoc
%{summary}.
-%package demo
-Summary: Lucene demonstration library
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-%{summary}.
-
%package contrib
Summary: Lucene contributed extensions
Group: Development/Libraries
@@ -102,9 +101,14 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
-%patch1 -p1 -b .db-javadoc
-%patch2 -p1 -b .fixmanifests
-%patch3 -p1 -b .removeclasspath
+tar xfs %{SOURCE4}
+pushd dev-tools
+find . -name "pom.xml.template" -exec sed -i "s/@version@/%{version}/g" '{}' \;
+popd
+
+#%patch1 -p1 -b .db-javadoc
+#%patch2 -p1 -b .fixmanifests
+#%patch3 -p1 -b .removeclasspath
iconv --from=ISO-8859-1 --to=UTF-8 CHANGES.txt > CHANGES.txt.new
@@ -112,32 +116,41 @@ iconv --from=ISO-8859-1 --to=UTF-8 CHANGES.txt > CHANGES.txt.new
find contrib -iname '*.pom.xml.template' -exec \
sed -i "s:@version@:%{version}:g" \{\} \;
+cp %{SOURCE3} .
+
+#modify artifactIds to make it easier to map to fedora
+sed -i -e "s|ant-junit|ant/ant-junit|g" test-framework/ivy.xml
+sed -i -e "s|xercesImpl|xerces-j2|g" contrib/benchmark/ivy.xml
+sed -i -e "s|jakarta-regexp|regexp|g" contrib/queries/ivy.xml
+
+
%build
mkdir -p docs
mkdir -p lib
export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress icu4j)
-rm -r contrib/db
+export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress icu4j ivy)
-ant -Dbuild.sysclasspath=first \
+ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
-Djavacc.home=%{_bindir}/javacc \
-Djavacc.jar=%{_javadir}/javacc.jar \
-Djavacc.jar.dir=%{_javadir} \
- -Djavadoc.link=%{_javadocdir}/java \
+ -Djavadoc.link=file://%{_javadocdir}/java \
-Dversion=%{version} \
- package
+ -Dfailonjavadocwarning=false \
+ -Dmaven-tasks.uptodate=true \
+ jar-lucene-core jar-test-framework docs javadocs build-contrib
# add missing OSGi metadata to manifests
mkdir META-INF
-unzip -o build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
+unzip -o build/core/lucene-core-%{version}.jar META-INF/MANIFEST.MF
cat %{SOURCE1} >> META-INF/MANIFEST.MF
sed -i '/^\r$/d' META-INF/MANIFEST.MF
-zip -u build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
+zip -u build/core/lucene-core-%{version}.jar META-INF/MANIFEST.MF
unzip -o build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
cat %{SOURCE2} >> META-INF/MANIFEST.MF
sed -i '/^\r$/d' META-INF/MANIFEST.MF
zip -u build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
-cp contrib/analyzers/common/pom.xml.template contrib/analyzers/
+cp dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template contrib/analyzers/
cp build/contrib/analyzers/common/lucene-analyzers-%{version}.jar build/contrib/analyzers/
%install
@@ -145,60 +158,47 @@ cp build/contrib/analyzers/common/lucene-analyzers-%{version}.jar build/contrib/
# jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 0644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 0644 build/core/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 0644 dev-tools/maven/lucene/core/pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-core.pom
ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
-install -m 0644 build/%{name}-demos-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demos.jar
+%add_maven_depmap JPP-lucene-core.pom %{name}-core.jar
# contrib jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib
-for c in analyzers ant benchmark collation fast-vector-highlighter highlighter \
- instantiated lucli memory misc queries queryparser regex remote \
- snowball spatial spellchecker surround swing wikipedia wordnet \
- xml-query-parser; do
+for c in analyzers benchmark demo facet grouping highlighter \
+ icu instantiated join memory misc pruning queries queryparser remote \
+ spatial spellchecker xml-query-parser; do
install -m 0644 build/contrib/$c/%{name}-${c}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-contrib/%{name}-${c}.jar
- install -m 0644 contrib/$c/pom.xml.template \
+ install -m 0644 dev-tools/maven/lucene/contrib/$c/pom.xml.template \
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.lucene-contrib-lucene-$c.pom
- %add_to_maven_depmap org.apache.lucene lucene-$c %{version} JPP/lucene-contrib lucene-$c
+ %add_maven_depmap JPP.lucene-contrib-lucene-$c.pom %{name}-contrib/%{name}-${c}.jar
done
# main poms
-for pom in contrib core demos parent; do
- install -m 0644 lucene-$pom-pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-$pom.pom
- %add_to_maven_depmap org.apache.lucene lucene-$pom %{version} JPP lucene-$pom
-done
+install -m 0644 dev-tools/maven/lucene/contrib/pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-contrib.pom
+%add_maven_depmap JPP-lucene-contrib.pom
+install -m 0644 dev-tools/maven/lucene/pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-parent.pom
+%add_maven_depmap JPP-lucene-parent.pom
+install -m 0644 dev-tools/maven/pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-solr-grandparent.pom
+%add_maven_depmap JPP-lucene-solr-grandparent.pom
# javadoc
install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/api/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# webapp
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-install -m 0644 build/%{name}web.war \
- $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-
%files
%doc CHANGES.txt LICENSE.txt README.txt NOTICE.txt
%{_mavenpomdir}/JPP*pom
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-core.jar
-%{_datadir}/%{name}-%{version}
%files javadoc
%doc LICENSE.txt
@@ -208,10 +208,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadir}/%{name}-contrib
%doc contrib/CHANGES.txt
-%files demo
-%{_javadir}/%{name}-demos.jar
-
%changelog
+* Tue Jul 3 2012 Alexander Kurtakov <akurtako at redhat.com> 0:3.6.0-1
+- Update to upstream 3.6.0.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.9.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 0cfc836..d1fb0b3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-17960f35b2239654ba608cf1f3e256b3 lucene-2.9.4-src.tar.gz
+8bb2ef25734828bcc41e5a0768e45c4a lucene-3.6.0-src.tgz
+3aa353e39ccc917a5293c880157eb760 dev-tools.tar.xz
More information about the scm-commits
mailing list