From db673e243ebbf413d2ea1f344633fd46c76afa57 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Jun 23 2015 09:32:49 +0000 Subject: Update to upstream 5.2.1. --- diff --git a/.gitignore b/.gitignore index 9574aef..d882d52 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ dev-tools.tar.xz /lucene-4.10.3-src.tgz /dev-tools-4.10.4.tar.xz /lucene-4.10.4-src.tgz +/dev-tools-5.2.1.tar.xz +/lucene-5.2.1-src.tgz diff --git a/lucene-4.10.4-analysis-OSGi-MANIFEST.MF b/lucene-4.10.4-analysis-OSGi-MANIFEST.MF deleted file mode 100644 index 12135fa..0000000 --- a/lucene-4.10.4-analysis-OSGi-MANIFEST.MF +++ /dev/null @@ -1,63 +0,0 @@ -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-SymbolicName: org.apache.lucene.analysis -Require-Bundle: org.apache.lucene.core;bundle-version="4.10.4" -Export-Package: org.apache.lucene.analysis.ar;version="4.10.4", - org.apache.lucene.analysis.core;version="4.10.4", - org.apache.lucene.analysis.bg;version="4.10.4", - org.apache.lucene.analysis.br;version="4.10.4", - org.apache.lucene.analysis.ca;version="4.10.4", - org.apache.lucene.analysis.cjk;version="4.10.4", - org.apache.lucene.analysis.cn;version="4.10.4", - org.apache.lucene.analysis.compound;version="4.10.4", - org.apache.lucene.analysis.compound.hyphenation;version="4.10.4", - org.apache.lucene.analysis.cz;version="4.10.4", - org.apache.lucene.analysis.da;version="4.10.4", - org.apache.lucene.analysis.de;version="4.10.4", - org.apache.lucene.analysis.el;version="4.10.4", - org.apache.lucene.analysis.en;version="4.10.4", - org.apache.lucene.analysis.es;version="4.10.4", - org.apache.lucene.analysis.eu;version="4.10.4", - org.apache.lucene.analysis.fa;version="4.10.4", - org.apache.lucene.analysis.fi;version="4.10.4", - org.apache.lucene.analysis.fr;version="4.10.4", - org.apache.lucene.analysis.gl;version="4.10.4", - org.apache.lucene.analysis.hi;version="4.10.4", - org.apache.lucene.analysis.hu;version="4.10.4", - org.apache.lucene.analysis.hunspell;version="4.10.4", - org.apache.lucene.analysis.hy;version="4.10.4", - org.apache.lucene.analysis.id;version="4.10.4", - org.apache.lucene.analysis.in;version="4.10.4", - org.apache.lucene.analysis.it;version="4.10.4", - org.apache.lucene.analysis.lv;version="4.10.4", - org.apache.lucene.analysis.miscellaneous;version="4.10.4", - org.apache.lucene.analysis.ngram;version="4.10.4", - org.apache.lucene.analysis.nl;version="4.10.4", - org.apache.lucene.analysis.no;version="4.10.4", - org.apache.lucene.analysis.path;version="4.10.4", - org.apache.lucene.analysis.payloads;version="4.10.4", - org.apache.lucene.analysis.position;version="4.10.4", - org.apache.lucene.analysis.pt;version="4.10.4", - org.apache.lucene.analysis.query;version="4.10.4", - org.apache.lucene.analysis.reverse;version="4.10.4", - org.apache.lucene.analysis.ro;version="4.10.4", - org.apache.lucene.analysis.ru;version="4.10.4", - org.apache.lucene.analysis.shingle;version="4.10.4", - org.apache.lucene.analysis.sinks;version="4.10.4", - org.apache.lucene.analysis.snowball;version="4.10.4", - org.apache.lucene.analysis.standard;version="4.10.4", - org.apache.lucene.analysis.sv;version="4.10.4", - org.apache.lucene.analysis.synonym;version="4.10.4", - org.apache.lucene.analysis.th;version="4.10.4", - org.apache.lucene.analysis.tr;version="4.10.4", - org.apache.lucene.analysis.util;version="4.10.4", - org.apache.lucene.analysis.wikipedia;version="4.10.4", - org.apache.lucene.collation;version="4.10.4" -Bundle-Version: 4.10.4 -Bundle-Vendor: fedoraproject.org -Bundle-Name: Lucene contributed extensions -Import-Package: org.xml.sax;resolution:=optional, - javax.xml.parsers;resolution:=optional, - org.xml.sax.helpers;resolution:=optional -Bundle-ManifestVersion: 2 - diff --git a/lucene-4.10.4-core-OSGi-MANIFEST.MF b/lucene-4.10.4-core-OSGi-MANIFEST.MF deleted file mode 100644 index 430231e..0000000 --- a/lucene-4.10.4-core-OSGi-MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-SymbolicName: org.apache.lucene.core -Import-Package: javax.management -Export-Package: org.apache.lucene;version="4.10.4", - org.apache.lucene.analysis;version="4.10.4", - org.apache.lucene.analysis.tokenattributes;version="4.10.4", - org.apache.lucene.document;version="4.10.4", - org.apache.lucene.index;version="4.10.4", - org.apache.lucene.search;version="4.10.4", - org.apache.lucene.search.payloads;version="4.10.4", - org.apache.lucene.search.spans;version="4.10.4", - org.apache.lucene.search.similarities;version="4.10.4", - org.apache.lucene.store;version="4.10.4", - org.apache.lucene.util;version="4.10.4", - org.apache.lucene.util.fst;version="4.10.4", - org.apache.lucene.util.packed;version="4.10.4", - org.apache.lucene.util.mutable;version="4.10.4", - org.apache.lucene.util.automaton;version="4.10.4" -Bundle-Version: 4.10.4 -Bundle-Vendor: fedoraproject.org -Bundle-Name: High-performance, full-featured text search engine -Bundle-ManifestVersion: 2 diff --git a/lucene-4.10.4-queryparser-OSGi-MANIFEST.MF b/lucene-4.10.4-queryparser-OSGi-MANIFEST.MF deleted file mode 100644 index 5e19fff..0000000 --- a/lucene-4.10.4-queryparser-OSGi-MANIFEST.MF +++ /dev/null @@ -1,30 +0,0 @@ -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-SymbolicName: org.apache.lucene.queryparser -Require-Bundle: org.apache.lucene.core;bundle-version="4.10.4" -Export-Package: org.apache.lucene.queryparser.analyzing;version="4.10.4", - org.apache.lucene.queryparser.classic;version="4.10.4", - org.apache.lucene.queryparser.complexPhrase;version="4.10.4", - org.apache.lucene.queryparser.ext;version="4.10.4", - org.apache.lucene.queryparser.flexible.core;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.builders;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.config;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.messages;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.nodes;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.parser;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.processors;version="4.10.4", - org.apache.lucene.queryparser.flexible.core.util;version="4.10.4", - org.apache.lucene.queryparser.simple;version="4.10.4", - org.apache.lucene.queryparser.surround.parser;version="4.10.4", - org.apache.lucene.queryparser.surround.query;version="4.10.4", - org.apache.lucene.queryparser.xml;version="4.10.4", - org.apache.lucene.queryparser.xml.builders;version="4.10.4" -Bundle-Version: 4.10.4 -Bundle-Vendor: fedoraproject.org -Bundle-Name: Lucene Query parsers and parsing framework -Import-Package: org.xml.sax;resolution:=optional, - javax.xml.parsers;resolution:=optional, - org.xml.sax.helpers;resolution:=optional -Bundle-ManifestVersion: 2 - - diff --git a/lucene.spec b/lucene.spec index 89428f8..0724d58 100644 --- a/lucene.spec +++ b/lucene.spec @@ -33,17 +33,14 @@ Summary: High-performance, full-featured text search engine Name: %{?scl_prefix}lucene -Version: 4.10.4 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ Source0: http://www.apache.org/dist/lucene/java/%{version}/lucene-%{version}-src.tgz -Source1: lucene-%{version}-core-OSGi-MANIFEST.MF -Source2: lucene-%{version}-analysis-OSGi-MANIFEST.MF -Source3: lucene-%{version}-queryparser-OSGi-MANIFEST.MF -#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_10_4/dev-tools/ -#tar caf dev-tools-4.10.4.tar.xz dev-tools/ +#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_5_2_1/dev-tools/ +#tar caf dev-tools-5.2.1.tar.xz dev-tools/ Source4: dev-tools-%{version}.tar.xz Patch0: 0001-disable-ivy-settings.patch @@ -71,6 +68,7 @@ BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.antlr:antlr-runtime) BuildRequires: maven-local BuildRequires: apache-parent +BuildRequires: forbidden-apis # test-framework deps BuildRequires: junit @@ -107,6 +105,12 @@ Summary: Lucene Solr grandparent POM %description solr-grandparent Lucene Solr grandparent POM. +%package backward-codecs +Summary: Lucene Backward Codecs Module + +%description backward-codecs +Codecs for older versions of Lucene. + %package benchmark Summary: Lucene Benchmarking Module @@ -292,6 +296,8 @@ pushd %{pkg_name} find . -name "*.jar" -exec rm -f {} \; rm sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestJakartaRegexpCapabilities.java +rm -r queryparser/src/java/org/apache/lucene/queryparser/xml/ +rm demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java # old API rm -r replicator/src/test/* @@ -305,7 +311,6 @@ popd %mvn_package ":%{pkg_name}-analyzers-common" %{pkg_name}-analysis %mvn_package ":{*}-aggregator" @1 - %build pushd %{pkg_name} # generate dependencies @@ -315,10 +320,8 @@ ant filter-pom-templates -Divy.mode=local -Dversion=%{version} for pom in `find build/poms/%{pkg_name} -name pom.xml`; do sed 's/\${module-path}/${basedir}/g' "$pom" > "${pom##build/poms/%{pkg_name}/}" done - -for module in benchmark misc test-framework demo core/src/java facet \ - analysis/stempel codecs/src/java codecs/src/test queryparser \ - core/src/test memory .; do +%pom_remove_plugin :forbiddenapis +for module in test-framework; do %pom_remove_plugin :forbiddenapis ${module} done @@ -337,33 +340,13 @@ mv lucene/build/poms/pom.xml . %pom_disable_module solr %pom_remove_plugin :gmaven-plugin %pom_remove_plugin :forbiddenapis +%pom_remove_plugin :maven-enforcer-plugin %{?scl:scl enable %{scl} - <<"EOF"} # For some reason TestHtmlParser.testTurkish fails when building inside SCLs %mvn_build -s -f %{?scl:EOF} -pushd %{pkg_name} - -# add missing OSGi metadata to manifests -mkdir META-INF -unzip -o core/src/java/target/lucene-core-%{version}.jar META-INF/MANIFEST.MF -cat %{SOURCE1} >> META-INF/MANIFEST.MF -sed -i '/^\r$/d' META-INF/MANIFEST.MF -zip -u core/src/java/target/lucene-core-%{version}.jar META-INF/MANIFEST.MF - -unzip -o analysis/common/target/lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF -cat %{SOURCE2} >> META-INF/MANIFEST.MF -sed -i '/^\r$/d' META-INF/MANIFEST.MF -zip -u analysis/common/target/lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF - -unzip -o queryparser/target/lucene-queryparser-%{version}.jar META-INF/MANIFEST.MF -cat %{SOURCE3} >> META-INF/MANIFEST.MF -sed -i '/^\r$/d' META-INF/MANIFEST.MF -zip -u queryparser/target/lucene-queryparser-%{version}.jar META-INF/MANIFEST.MF - -popd - %install %{?scl:scl enable %{scl} - <<"EOF"} @@ -383,6 +366,7 @@ popd %files parent -f .mfiles-%{pkg_name}-parent %files solr-grandparent -f .mfiles-%{pkg_name}-solr-grandparent %files benchmark -f .mfiles-%{pkg_name}-benchmark +%files backward-codecs -f .mfiles-%{pkg_name}-backward-codecs %files replicator -f .mfiles-%{pkg_name}-replicator %files grouping -f .mfiles-%{pkg_name}-grouping %files highlighter -f .mfiles-%{pkg_name}-highlighter @@ -413,6 +397,9 @@ popd %doc LICENSE.txt %changelog +* Tue Jun 23 2015 Alexander Kurtakov 0:5.2.1-1 +- Update to upstream 5.2.1. + * Wed Jun 17 2015 Fedora Release Engineering - 0:4.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index a1ade6d..7c8a0c2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ae37248800456c80969684a5edbc6937 dev-tools-4.10.4.tar.xz -c4b9b3410b72217380c1f90d40cfe330 lucene-4.10.4-src.tgz +22a797cd15af796ac9666b421a2eedb0 dev-tools-5.2.1.tar.xz +632932c8f13cc543331729594dbf6be1 lucene-5.2.1-src.tgz