import lucene-8.1.1-2.module_el8.1.0+280+b8d347df

c8-stream-rhel8 imports/c8-stream-rhel8/lucene-8.1.1-2.module_el8.1.0+280+b8d347df
MSVSphere Packaging Team 9 months ago
parent 99d39508d3
commit 7dbd54f6c1

2
.gitignore vendored

@ -1 +1 @@
SOURCES/solr-8.4.1-src.tgz
SOURCES/solr-8.1.1-src.tgz

@ -1 +1 @@
7531a8e6e5e0b289bf781e1e0a80de79ee0176d0 SOURCES/solr-8.4.1-src.tgz
47e53290e1f5db5d0ee769d38d64e3875f2578d7 SOURCES/solr-8.1.1-src.tgz

@ -11,7 +11,7 @@ diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 0bbd19a..6767ffe 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -438,7 +438,6 @@
@@ -419,7 +419,6 @@
you have an idea, fix it.
unless="ivy.settings.uptodate" -->
<!-- override: just for safety, should be unnecessary -->

@ -9,46 +9,40 @@ Subject: [PATCH 2/3] Dependency generation
.../lucene/dependencies/GetMavenDependenciesTask.java | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 3d7ee87..33e5f07 100644
--- a/build.xml
+++ b/build.xml
@@ -615,7 +615,6 @@ File | Project Structure | Platform Settings | SDKs):
<delete file="lucene/build/module.dependencies.properties"/>
<subant target="-append-module-dependencies-properties" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
- <fileset dir="solr" includes="build.xml" />
<propertyset refid="uptodate.and.compiled.properties"/>
</subant>
</target>
diff --git a/lucene/build.xml b/lucene/build.xml
index e3cf905..facc19b 100644
index 3c1439c..23d291a 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -427,12 +427,8 @@
@@ -425,12 +425,14 @@
</sequential>
</target>
- <target name="generate-maven-artifacts" depends="-unpack-lucene-tgz">
- <ant dir=".." target="resolve" inheritall="false"/>
+ <target name="generate-maven-artifacts">
+ <ant dir="." target="resolve" inheritall="false"/>
<antcall target="-filter-pom-templates" inheritall="false"/>
- <antcall target="-dist-maven" inheritall="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </antcall>
+ <!--
<antcall target="-dist-maven" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</antcall>
+ -->
</target>
<target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 41da3f2..d2f9d16 100644
index 6767ffe..75f6579 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1876,7 +1876,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
@@ -1855,9 +1855,9 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<property name="maven.dependencies.filters.file" location="${common.build.dir}/maven.dependencies.filters.properties"/>
<target name="-get-maven-dependencies" depends="compile-tools,load-custom-tasks">
<ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/>
- <ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/>
+ <ant dir="${common.dir}" target="-append-module-dependencies-properties" inheritall="false"/>
<get-maven-dependencies-macro
- dir="${common.dir}/.."
+ dir="${common.dir}"
+ dir="."
centralized.versions.file="${common.dir}/ivy-versions.properties"
module.dependencies.properties.file="${module.dependencies.properties.file}"
maven.dependencies.filters.file="${maven.dependencies.filters.file}"/>
@ -56,7 +50,7 @@ diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDepend
index 610323f..13bde29 100644
--- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
+++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
@@ -537,6 +537,7 @@ public class GetMavenDependenciesTask extends Task {
@@ -535,6 +535,7 @@ public class GetMavenDependenciesTask extends Task {
private Collection<String> getTransitiveDependenciesFromIvyCache
(String groupId, String artifactId, String version) {
SortedSet<String> transitiveDependencies = new TreeSet<>();
@ -64,7 +58,7 @@ index 610323f..13bde29 100644
// E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml
File ivyXmlFile = new File(new File(new File(ivyCacheDir, groupId), artifactId), "ivy-" + version + ".xml");
if ( ! ivyXmlFile.exists()) {
@@ -558,6 +559,7 @@ public class GetMavenDependenciesTask extends Task {
@@ -556,6 +557,7 @@ public class GetMavenDependenciesTask extends Task {
+ groupId + ':' + artifactId + ':' + version + " from "
+ ivyXmlFile.getAbsolutePath(), e);
}

@ -2,8 +2,8 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 8.4.1
Release: 5%{?dist}
Version: 8.1.1
Release: 2%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@ -13,25 +13,40 @@ Source0: https://archive.apache.org/dist/lucene/solr/%{version}/solr-%{ve
Patch0: 0001-Disable-ivy-settings.patch
Patch1: 0002-Dependency-generation.patch
# io.sgr:s2-geometry-library-java is not present on Fedora
# This patch reverts these two commits:
# https://github.com/apache/lucene-solr/commit/e3032dd3fcc28570c5f9d2dab4961b5b07555912
# https://github.com/apache/lucene-solr/commit/e0d6465af94b6c6f7b8d570dee97c98de572c876
Patch2: 0003-Remove-dep-on-missing-google-geometry-library.patch
BuildRequires: ant
BuildRequires: ivy-local
BuildRequires: maven-local
BuildRequires: mvn(com.ibm.icu:icu4j)
BuildRequires: mvn(org.apache:apache:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
%if %{without jp_minimal}
BuildRequires: mvn(com.carrotsearch.randomizedtesting:randomizedtesting-runner)
BuildRequires: mvn(com.ibm.icu:icu4j)
BuildRequires: mvn(commons-codec:commons-codec)
BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.sourceforge.nekohtml:nekohtml)
BuildRequires: mvn(org.antlr:antlr4-runtime)
BuildRequires: mvn(org.apache.commons:commons-compress)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
BuildRequires: mvn(org.apache.httpcomponents:httpcore)
BuildRequires: mvn(org.carrot2:morfologik-fsa)
BuildRequires: mvn(org.carrot2:morfologik-polish)
BuildRequires: mvn(org.carrot2:morfologik-stemming)
BuildRequires: mvn(org.eclipse.jetty:jetty-continuation)
BuildRequires: mvn(org.eclipse.jetty:jetty-http)
BuildRequires: mvn(org.eclipse.jetty:jetty-io)
BuildRequires: mvn(org.eclipse.jetty:jetty-server)
BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
BuildRequires: mvn(org.eclipse.jetty:jetty-util)
BuildRequires: mvn(org.locationtech.spatial4j:spatial4j)
BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.ow2.asm:asm-commons)
BuildRequires: mvn(xerces:xercesImpl)
@ -39,29 +54,6 @@ BuildRequires: mvn(xerces:xercesImpl)
Provides: %{name}-core = %{epoch}:%{version}-%{release}
# Obsolete since F32
# Required deps were removed from fedora
Obsoletes: %{name}-benchmark < 8.1.1-3
Obsoletes: %{name}-demo < 8.1.1-3
Obsoletes: %{name}-facet < 8.1.1-3
Obsoletes: %{name}-replicator < 8.1.1-3
Obsoletes: %{name}-spatial < 8.1.1-3
Obsoletes: %{name}-spatial-extras < 8.1.1-3
Obsoletes: %{name}-spatial3d < 8.1.1-3
Obsoletes: %{name}-test-framework < 8.4.1-4
%if %{with jp_minimal}
# Remove left-over packages that would have broken deps when built in minimal mode
Obsoletes: %{name}-parent < %{version}-%{release}
Obsoletes: %{name}-solr-grandparent < %{version}-%{release}
Obsoletes: %{name}-expressions < %{version}-%{release}
Obsoletes: %{name}-analyzers-phonetic < %{version}-%{release}
Obsoletes: %{name}-analyzers-icu < %{version}-%{release}
Obsoletes: %{name}-analyzers-nori < %{version}-%{release}
Obsoletes: %{name}-analyzers-kuromoji < %{version}-%{release}
Obsoletes: %{name}-analyzers-stempel < %{version}-%{release}
%endif
BuildArch: noarch
%description
@ -72,12 +64,9 @@ cross-platform.
%package analysis
Summary: Lucene Common Analyzers
# Obsoletes since F30
# Obsoletes added in F30
# This module was removed upstream and no replacement exists
Obsoletes: %{name}-analyzers-uima < 8.1.1-3
# Obsolete since F32
# Required deps were removed from fedora
Obsoletes: %{name}-analyzers-morfologik < 8.1.1-3
Obsoletes: %{name}-analyzers-uima < %{version}-%{release}
%description analysis
Lucene Common Analyzers.
@ -142,11 +131,49 @@ Summary: Lucene Backward Codecs Module
%description backward-codecs
Codecs for older versions of Lucene.
%package codecs
Summary: Codecs and postings formats for Apache Lucene
%if %{without jp_minimal}
%package parent
Summary: Parent POM for Lucene
%description codecs
Codecs and postings formats for Apache Lucene.
%description parent
Parent POM for Lucene.
%package solr-grandparent
Summary: Lucene Solr grandparent POM
%description solr-grandparent
Lucene Solr grandparent POM.
%package benchmark
Summary: Lucene Benchmarking Module
%description benchmark
Lucene Benchmarking Module.
%package replicator
Summary: Lucene Replicator Module
%description replicator
Lucene Replicator Module.
%package test-framework
Summary: Apache Lucene Java Test Framework
%description test-framework
Apache Lucene Java Test Framework.
%package expressions
Summary: Lucene Expressions Module
%description expressions
Dynamically computed values to sort/facet/search on based on a pluggable
grammar.
%package demo
Summary: Lucene Demo Module
%description demo
Demo for Apache Lucene Java.
%package classification
Summary: Lucene Classification Module
@ -160,32 +187,35 @@ Summary: Lucene Suggest Module
%description suggest
Lucene Suggest Module.
%package monitor
Summary: Lucene Monitor Module
%package facet
Summary: Lucene Facets Module
%description monitor
Lucene Monitor Module.
%description facet
Package for Faceted Indexing and Search.
%if %{without jp_minimal}
%package spatial
Summary: Geospatial indexing APIs for Apache Lucene
%package parent
Summary: Parent POM for Lucene
%description spatial
Geospatial indexing APIs for Apache Lucene.
%description parent
Parent POM for Lucene.
%package spatial-extras
Summary: Spatial Strategies for Apache Lucene
%package solr-grandparent
Summary: Lucene Solr grandparent POM
%description spatial-extras
Spatial Strategies for Apache Lucene.
%description solr-grandparent
Lucene Solr grandparent POM.
%package spatial3d
Summary: Lucene Spatial 3D
%package expressions
Summary: Lucene Expressions Module
%description spatial3d
Spatial shapes implemented using 3D planar geometry
%description expressions
Dynamically computed values to sort/facet/search on based on a pluggable
grammar.
%package codecs
Summary: Codecs and postings formats for Apache Lucene
%description codecs
Codecs and postings formats for Apache Lucene.
%package analyzers-phonetic
Summary: Lucene Phonetic Filters
@ -200,6 +230,13 @@ Summary: Lucene ICU Analysis Components
Provides integration with ICU (International Components for Unicode) for
stronger Unicode and internationalization support.
%package analyzers-morfologik
Summary: Lucene Morfologik Polish Lemmatizer
%description analyzers-morfologik
A dictionary-driven lemmatizer for Polish (includes morphosyntactic
annotations).
%package analyzers-nori
Summary: An analyzer with morphological analysis for Korean
@ -218,7 +255,7 @@ Summary: Lucene Stempel Analyzer
%description analyzers-stempel
Lucene Stempel Analyzer.
%endif
%endif # without jp_minimal
%package javadoc
Summary: Javadoc for Lucene
@ -231,16 +268,21 @@ Summary: Javadoc for Lucene
%patch0 -p1
%patch1 -p1
%patch2 -p1
rm -rf solr
find -name "*.jar" -delete
mkdir -p lucene/build/analysis/{kuromoji,nori}
# don't generate uses clauses in osgi metadata
sed -i -e "/<Export-Package>/a<_nouses>true</_nouses>" dev-tools/maven/pom.xml.template
# make the target public
sed -i 's/-filter-pom-templates/filter-pom-templates/' lucene/common-build.xml
# suggest provides spellchecker
%mvn_alias :%{name}-suggest :%{name}-spellchecker
# compatibility with existing packages
%mvn_alias :%{name}-analyzers-common :%{name}-analyzers
@ -251,9 +293,8 @@ sed -i -e "/<Export-Package>/a<_nouses>true</_nouses>" dev-tools/maven/pom.xml.t
%build
pushd %{name}
find -maxdepth 2 -type d -exec mkdir -p '{}/lib' \;
# generate maven dependencies
ant -f build.xml generate-maven-artifacts -Divy.mode=local -Dversion=%{version} -Divy.available=true
# generate dependencies
ant -f common-build.xml filter-pom-templates -Divy.mode=local -Dversion=%{version} -Divy.available=true
# fix source dir + move to expected place
for pom in `find build/poms/%{name} -name pom.xml`; do
@ -262,6 +303,15 @@ done
%pom_disable_module src/test core
%pom_disable_module src/test codecs
# unresolvable test dep
%pom_remove_dep org.locationtech.spatial4j:spatial4j::test spatial-extras
# currently unavailable in Fedora
%pom_remove_dep ua.net.nlp:morfologik-ukrainian-search analysis/morfologik
# test deps
%pom_add_dep org.antlr:antlr-runtime::test demo
popd
mv lucene/build/poms/pom.xml .
@ -294,26 +344,24 @@ mv lucene/build/poms/pom.xml .
%pom_remove_plugin -r :forbiddenapis
%pom_remove_plugin -r :buildnumber-maven-plugin
# don't build modules for which deps are not in fedora or not new enough in fedora
%if %{with jp_minimal}
pushd lucene
%pom_disable_module codecs
%pom_disable_module test-framework
%pom_disable_module benchmark
%pom_disable_module classification
%pom_disable_module demo
%pom_disable_module test-framework
%pom_disable_module expressions
%pom_disable_module facet
%pom_disable_module replicator
%pom_disable_module spatial
%pom_disable_module spatial-extras
%pom_disable_module spatial3d
%pom_disable_module suggest
%pom_disable_module opennlp analysis
%pom_disable_module morfologik analysis
popd
%if %{with jp_minimal}
pushd lucene
%pom_disable_module expressions
%pom_disable_module icu analysis
%pom_disable_module kuromoji analysis
%pom_disable_module morfologik analysis
%pom_disable_module phonetic analysis
%pom_disable_module stempel analysis
%pom_disable_module nori analysis
@ -323,6 +371,11 @@ popd
%mvn_package :lucene-solr-grandparent __noinstall
%endif
# OpenNLP is not new enough in Fedora, always disable for now
pushd lucene
%pom_disable_module opennlp analysis
popd
# For some reason TestHtmlParser.testTurkish fails when building inside SCLs
%mvn_build -s -f
@ -338,50 +391,36 @@ popd
%license lucene/LICENSE.txt lucene/NOTICE.txt
%files analysis -f .mfiles-%{name}-analysis
%files analyzers-smartcn -f .mfiles-%{name}-analyzers-smartcn
%files grouping -f .mfiles-%{name}-grouping
%files highlighter -f .mfiles-%{name}-highlighter
%files join -f .mfiles-%{name}-join
%files memory -f .mfiles-%{name}-memory
%files misc -f .mfiles-%{name}-misc
%files queries -f .mfiles-%{name}-queries
%files queryparser -f .mfiles-%{name}-queryparser
%files sandbox -f .mfiles-%{name}-sandbox
%files backward-codecs -f .mfiles-%{name}-backward-codecs
%files codecs -f .mfiles-%{name}-codecs
%files classification -f .mfiles-%{name}-classification
%files suggest -f .mfiles-%{name}-suggest
%files monitor -f .mfiles-%{name}-monitor
%if %{without jp_minimal}
%files parent -f .mfiles-%{name}-parent
%files solr-grandparent -f .mfiles-%{name}-solr-grandparent
%files benchmark -f .mfiles-%{name}-benchmark
%files replicator -f .mfiles-%{name}-replicator
%files test-framework -f .mfiles-%{name}-test-framework
%files expressions -f .mfiles-%{name}-expressions
%files demo -f .mfiles-%{name}-demo
%files classification -f .mfiles-%{name}-classification
%files suggest -f .mfiles-%{name}-suggest
%files facet -f .mfiles-%{name}-facet
%files spatial -f .mfiles-%{name}-spatial
%files spatial-extras -f .mfiles-%{name}-spatial-extras
%files spatial3d -f .mfiles-%{name}-spatial3d
%files codecs -f .mfiles-%{name}-codecs
%files analyzers-phonetic -f .mfiles-%{name}-analyzers-phonetic
%files analyzers-icu -f .mfiles-%{name}-analyzers-icu
%files analyzers-morfologik -f .mfiles-%{name}-analyzers-morfologik
%files analyzers-nori -f .mfiles-%{name}-analyzers-nori
%files analyzers-kuromoji -f .mfiles-%{name}-analyzers-kuromoji
%files analyzers-stempel -f .mfiles-%{name}-analyzers-stempel
%endif
@ -389,28 +428,6 @@ popd
%license lucene/LICENSE.txt lucene/NOTICE.txt
%changelog
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:8.4.1-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed May 06 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-4
- Fix jp_minimal mode
* Tue May 5 2020 Alexander Kurtakov <akurtako@redhat.com> - 0:8.4.1-3
- Disable test-framework as its dependency (randomizedtesting) is removed.
* Sat Mar 21 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-2
- Fix deps for minimal mode
* Sat Mar 21 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-1
- Update to latest upstream release
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:8.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Nov 28 2019 Mat Booth <mat.booth@redhat.com> - 0:8.1.1-3
- Drop spatial, morfologik, replicator, demo and benchmark modules due to missing deps
- Fix obsoletes when built in minimal mode
* Thu Jun 13 2019 Mat Booth <mat.booth@redhat.com> - 0:8.1.1-2
- Enable additional module in jp_minimal mode
@ -513,4 +530,4 @@ popd
- Drop old workarounds.
* Tue Jun 23 2015 Alexander Kurtakov <akurtako@redhat.com> 0:5.2.1-1
- Update to upstream 5.2.1.
- Update to upstream 5.2.1.

Loading…
Cancel
Save