upgrade to 7.7.0

0001-Disable-ivy-settings.patch

@@ -1,17 +1,17 @@
-From f80ad58a1f6d253b5dab2f78ad49881c6b0aa25d Mon Sep 17 00:00:00 2001
+From d409860c17a93f046ae55f34257f9e74fa5e45f5 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Thu, 25 Feb 2016 12:26:12 +0100
-Subject: [PATCH 1/2] Disable ivy-settings
+Subject: [PATCH 1/3] Disable ivy-settings
 
 ---
  lucene/common-build.xml | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/lucene/common-build.xml b/lucene/common-build.xml
-index 9e259e9..5416e1e 100644
+index 0bbd19a..6767ffe 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -394,7 +394,6 @@
+@@ -419,7 +419,6 @@
            you have an idea, fix it.
            unless="ivy.settings.uptodate" -->
      <!-- override: just for safety, should be unnecessary -->
@@ -20,4 +20,5 @@ index 9e259e9..5416e1e 100644
    </target>
  
 -- 
-2.5.0
+2.20.1
+

0002-Dependency-generation.patch

@@ -1,19 +1,19 @@
-From e345146f765c5f07db205694106b035866183b19 Mon Sep 17 00:00:00 2001
+From 521dc174c93efbe616dc5f573a5d293339df642b Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Thu, 25 Feb 2016 15:03:17 +0100
-Subject: [PATCH 2/2] Dependency generation
+Subject: [PATCH 2/3] Dependency generation
 
 ---
  lucene/build.xml                                            | 6 ++++--
  lucene/common-build.xml                                     | 4 ++--
- .../org/apache/lucene/dependencies/GetMavenDependenciesTask.java    | 2 ++
+ .../lucene/dependencies/GetMavenDependenciesTask.java       | 2 ++
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/lucene/build.xml b/lucene/build.xml
-index 8aef144..2318a78 100644
+index 3c1439c..23d291a 100644
 --- a/lucene/build.xml
 +++ b/lucene/build.xml
-@@ -421,12 +421,14 @@
+@@ -425,12 +425,14 @@
      </sequential>
    </target>
  
@@ -31,10 +31,10 @@ index 8aef144..2318a78 100644
    
    <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 5416e1e..783c63e 100644
+index 6767ffe..75f6579 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -1792,9 +1792,9 @@ ${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">
@@ -47,10 +47,10 @@ index 5416e1e..783c63e 100644
          module.dependencies.properties.file="${module.dependencies.properties.file}"
          maven.dependencies.filters.file="${maven.dependencies.filters.file}"/>
 diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
-index c998342..ddfd42c 100644
+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
-@@ -480,6 +480,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<>();
@@ -58,7 +58,7 @@ index c998342..ddfd42c 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()) {
-@@ -501,6 +502,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -556,6 +557,7 @@ public class GetMavenDependenciesTask extends Task {
                                + groupId + ':' + artifactId + ':' + version + " from "
                                + ivyXmlFile.getAbsolutePath(), e);
      }
@@ -67,5 +67,5 @@ index c998342..ddfd42c 100644
    }
  
 -- 
-2.5.0
+2.20.1
 

lucene.spec

@@ -1,28 +1,26 @@
 %bcond_with     jp_minimal
-
+Summary:             High-performance, full-featured text search engine
 Name:                lucene
-Version:        7.1.0
+Version:             7.7.0
-Release:        4
+Release:             1
 Epoch:               0
-Summary:        Ultra-fast Search Library
 License:             ASL 2.0
 URL:                 http://lucene.apache.org/
 Source0:             https://archive.apache.org/dist/lucene/solr/%{version}/solr-%{version}-src.tgz
-
+Patch0:              0001-Disable-ivy-settings.patch
-Patch0001:      0001-Disable-ivy-settings.patch
+Patch1:              0002-Dependency-generation.patch
-Patch0002:      0002-Dependency-generation.patch
+Patch2:              0003-Remove-dep-on-missing-google-geometry-library.patch
-
 BuildRequires:       ant ivy-local maven-local 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) mvn(commons-codec:commons-codec)
 BuildRequires:       mvn(commons-logging:commons-logging) mvn(javax.servlet:javax.servlet-api)
-BuildRequires:  mvn(javax.servlet:servlet-api) mvn(junit:junit) mvn(net.sourceforge.nekohtml:nekohtml)
+BuildRequires:       mvn(javax.servlet:servlet-api) mvn(junit:junit)
-BuildRequires:  mvn(org.antlr:antlr4-runtime) mvn(org.apache.commons:commons-compress)
+BuildRequires:       mvn(net.sourceforge.nekohtml:nekohtml) mvn(org.antlr:antlr4-runtime)
-BuildRequires:  mvn(org.apache.httpcomponents:httpclient) mvn(org.apache.httpcomponents:httpcore)
+BuildRequires:       mvn(org.apache.commons:commons-compress)
-BuildRequires:  mvn(org.apache.uima:Tagger) mvn(org.apache.uima:uimaj-core)
+BuildRequires:       mvn(org.apache.httpcomponents:httpclient)
-BuildRequires:  mvn(org.apache.uima:WhitespaceTokenizer) mvn(org.carrot2:morfologik-fsa)
+BuildRequires:       mvn(org.apache.httpcomponents:httpcore) mvn(org.carrot2:morfologik-fsa)
 BuildRequires:       mvn(org.carrot2:morfologik-polish) mvn(org.carrot2:morfologik-stemming)
 BuildRequires:       mvn(org.eclipse.jetty:jetty-continuation) mvn(org.eclipse.jetty:jetty-http)
 BuildRequires:       mvn(org.eclipse.jetty:jetty-io) mvn(org.eclipse.jetty:jetty-server)
@@ -30,238 +28,189 @@ BuildRequires:  mvn(org.eclipse.jetty:jetty-servlet) mvn(org.eclipse.jetty:jetty
 BuildRequires:       mvn(org.locationtech.spatial4j:spatial4j) mvn(org.ow2.asm:asm)
 BuildRequires:       mvn(org.ow2.asm:asm-commons) mvn(xerces:xercesImpl)
 %endif
-
 Provides:            %{name}-core = %{epoch}:%{version}-%{release}
-
 BuildArch:           noarch
-
 %description
-Apache Lucene is a high-performance, full-featured text search engine library written entirely in
+Apache Lucene is a high-performance, full-featured text search
-Java. It is a technology suitable for nearly any application that requires full-text search,
+engine library written entirely in Java. It is a technology suitable
-especially cross-platform.
+for nearly any application that requires full-text search, especially
+cross-platform.
 
 %package analysis
 Summary:             Lucene Common Analyzers
-
+Obsoletes:           %{name}-analyzers-uima < %{version}-%{release}
 %description analysis
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Common Analyzers.
-This package provides the "analysis" module for Lucene.
 
 %package analyzers-smartcn
 Summary:             Smart Chinese Analyzer
-
 %description analyzers-smartcn
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Smart Chinese Analyzer.
-This package provides the "analyzers-smartcn" module for Lucene.
 
 %package grouping
 Summary:             Lucene Grouping Module
-
 %description grouping
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Grouping Module.
-This package provides the "grouping" module for Lucene.
 
 %package highlighter
 Summary:             Lucene Highlighter Module
-
 %description highlighter
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Highlighter Module.
-This package provides the "highlighter" module for Lucene.
 
 %package join
 Summary:             Lucene Join Module
-
 %description join
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Join Module.
-This package provides the "join" module for Lucene.
 
 %package memory
 Summary:             Lucene Memory Module
-
 %description memory
-This package provides the high-performance single-document index to compare against Query.
+High-performance single-document index to compare against Query.
 
 %package misc
 Summary:             Miscellaneous Lucene extensions
-
 %description misc
-This package provides the miscellaneous extensions for Lucene.
+Miscellaneous Lucene extensions.
 
 %package queries
 Summary:             Lucene Queries Module
-
 %description queries
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Queries Module.
-This package provides the "queries" module for Lucene.
 
 %package queryparser
 Summary:             Lucene QueryParsers Module
-
 %description queryparser
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene QueryParsers Module.
-This package provides the "queryparser" module for Lucene.
 
 %package sandbox
 Summary:             Lucene Sandbox Module
-
 %description sandbox
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Sandbox Module.
-This package provides the "sandbox" module for Lucene.
-
 %if %{without jp_minimal}
+
 %package parent
 Summary:             Parent POM for Lucene
-
 %description parent
-This package provides the parent POM for Lucene.
+Parent POM for Lucene.
 
 %package solr-grandparent
 Summary:             Lucene Solr grandparent POM
-
 %description solr-grandparent
-This package provides the solr grandparent POM for Lucene.
+Lucene Solr grandparent POM.
 
 %package backward-codecs
 Summary:             Lucene Backward Codecs Module
-
 %description backward-codecs
-This package provides the codecs for older versions of Lucene.
+Codecs for older versions of Lucene.
 
 %package benchmark
 Summary:             Lucene Benchmarking Module
-
 %description benchmark
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Benchmarking Module.
-This package provides the "benchmark" module for Lucene.
 
 %package replicator
 Summary:             Lucene Replicator Module
-
 %description replicator
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Replicator Module.
-This package provides the "replicator" module for Lucene.
 
 %package test-framework
 Summary:             Apache Lucene Java Test Framework
-
 %description test-framework
-This package provides the Java Test Framework for Apache Lucene Java.
+Apache Lucene Java Test Framework.
 
 %package expressions
 Summary:             Lucene Expressions Module
-
 %description expressions
-This package provides the dynamically computed values to sort/facet/search on based on pluggable grammars.
+Dynamically computed values to sort/facet/search on based on a pluggable
+grammar.
 
 %package demo
 Summary:             Lucene Demo Module
-
 %description demo
-This package provides the demo for Apache Lucene Java.
+Demo for Apache Lucene Java.
 
 %package classification
 Summary:             Lucene Classification Module
-
 %description classification
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Classification Module.
-This package provides the "classification" module for Lucene.
 
 %package suggest
 Summary:             Lucene Suggest Module
-
 %description suggest
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Suggest Module.
-This package provides the "suggest" module for Lucene.
 
 %package facet
 Summary:             Lucene Facets Module
-
 %description facet
-This package provides the Faceted Indexing and Search.
+Package for Faceted Indexing and Search.
 
 %package spatial
 Summary:             Geospatial indexing APIs for Apache Lucene
-
 %description spatial
-This package provides the geospatial indexing APIs for Apache Lucene.
+Geospatial indexing APIs for Apache Lucene.
 
 %package spatial-extras
 Summary:             Spatial Strategies for Apache Lucene
-
 %description spatial-extras
-This package provides the spatial Strategies for Apache Lucene.
+Spatial Strategies for Apache Lucene.
 
 %package spatial3d
 Summary:             Lucene Spatial 3D
-
 %description spatial3d
-This package provides the spatial shapes implemented using 3D planar geometry.
+Spatial shapes implemented using 3D planar geometry
 
 %package codecs
 Summary:             Codecs and postings formats for Apache Lucene
-
 %description codecs
-This package provides the codecs and postings formats for Apache Lucene.
+Codecs and postings formats for Apache Lucene.
 
 %package analyzers-phonetic
 Summary:             Lucene Phonetic Filters
-
 %description analyzers-phonetic
-This package provides the phonetic encoding via Commons Codec.
+Provides phonetic encoding via Commons Codec.
 
 %package analyzers-icu
 Summary:             Lucene ICU Analysis Components
-
 %description analyzers-icu
-This package provides the integration with ICU (International Components for Unicode) for stronger
+Provides integration with ICU (International Components for Unicode) for
-Unicode and internationalization support.
+stronger Unicode and internationalization support.
 
 %package analyzers-morfologik
 Summary:             Lucene Morfologik Polish Lemmatizer
-
 %description analyzers-morfologik
-This package provides a dictionary-driven lemmatizer for Polish (includes morphosyntactic annotations).
+A dictionary-driven lemmatizer for Polish (includes morphosyntactic
+annotations).
 
-%package        analyzers-uima
+%package analyzers-nori
-Summary:        Lucene UIMA Analysis Components
+Summary:             An analyzer with morphological analysis for Korean
-
+%description analyzers-nori
-%description    analyzers-uima
+An analyzer with morphological analysis for Korean.
-This package provides the integration with UIMA for extracting metadata from arbitrary (text) fields
-and enrich document with features extracted from UIMA types (language,sentences, concepts, named
-entities, etc.).
 
 %package analyzers-kuromoji
 Summary:             Lucene Kuromoji Japanese Morphological Analyzer
-
 %description analyzers-kuromoji
-This package provides a Kuromoji Japanese Morphological Analyzer for Apache Lucene.
+Lucene Kuromoji Japanese Morphological Analyzer.
 
 %package analyzers-stempel
 Summary:             Lucene Stempel Analyzer
-
 %description analyzers-stempel
-Apache Lucene is a full-text search engine written entirely in Java.
+Lucene Stempel Analyzer.
-This package provides the "analyzers-stempel" module for Lucene.
+%endif # without jp_minimal
 
-%endif
+%package javadoc
-
+Summary:             Javadoc for Lucene
-%package        help
+%description javadoc
-Summary:        Help documents for Lucene
+%{summary}.
-Provides:       %{name}-javadoc = %{epoch}:%{version}-%{release}
-Obsoletes:      %{name}-javadoc < %{epoch}:%{version}-%{release}
-
-%description    help
-Manauals of API and other help documents for %{name}.
 
 %prep
-%autosetup -n solr-%{version} -p1
+%setup -q -n solr-%{version}
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 rm -rf solr
-find -name "*.jar" | xargs rm -f
+find -name "*.jar" -delete
-
 sed -i -e "/<Export-Package>/a<_nouses>true</_nouses>" dev-tools/maven/pom.xml.template
 sed -i 's/-filter-pom-templates/filter-pom-templates/' lucene/common-build.xml
-
 %mvn_alias :%{name}-suggest :%{name}-spellchecker
 %mvn_alias :%{name}-analyzers-common :%{name}-analyzers
 %mvn_package ":%{name}-analysis-modules-aggregator" %{name}-analysis
@@ -269,24 +218,19 @@ sed -i 's/-filter-pom-templates/filter-pom-templates/' lucene/common-build.xml
 %mvn_package ":{*}-aggregator" @1
 
 %build
-cd %{name}
+pushd %{name}
 find -maxdepth 2 -type d -exec mkdir -p '{}/lib' \;
 ant -f common-build.xml filter-pom-templates -Divy.mode=local -Dversion=%{version} -Divy.available=true
-
+for pom in `find build/poms/%{name} -name pom.xml`; do
-for pom in `find build/poms/%{name} -name pom.xml`
-do
     sed 's/\${module-path}/${basedir}/g' "$pom" > "${pom##build/poms/%{name}/}"
 done
-
 %pom_disable_module src/test core
 %pom_disable_module src/test codecs
 %pom_remove_dep org.locationtech.spatial4j:spatial4j::test spatial-extras
 %pom_remove_dep ua.net.nlp:morfologik-ukrainian-search analysis/morfologik
 %pom_add_dep org.antlr:antlr-runtime::test demo
-cd -
+popd
-
 mv lucene/build/poms/pom.xml .
-
 %pom_xpath_set "pom:Export-Package" "*;version=\"%{version}\""
 %pom_add_plugin org.apache.felix:maven-bundle-plugin lucene/misc \
 "<configuration><instructions>
@@ -306,79 +250,120 @@ mv lucene/build/poms/pom.xml .
  org.apache.lucene.analysis.standard;version=\"%{version}\";analysis=split;mandatory:=analysis,
  *;version=\"%{version}\"</Export-Package>
 </instructions></configuration>"
-
 %pom_disable_module solr
-
+%pom_remove_plugin -r :gmaven-plugin
-for plugin in buildnumber-maven-plugin forbiddenapis gmaven-plugin maven-enforcer-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
-do
+%pom_remove_plugin -r :forbiddenapis
-    %pom_remove_plugin -r :$plugin
+%pom_remove_plugin -r :buildnumber-maven-plugin
-done
-
 %if %{with jp_minimal}
-cd lucene
+pushd lucene
-for module in backward-codecs benchmark classification codecs demo expressions facet\
+%pom_disable_module backward-codecs
-              replicator spatial spatial-extras spatial3d suggest test-framework
+%pom_disable_module codecs
-do
+%pom_disable_module test-framework
-    %pom_disable_module $module
+%pom_disable_module benchmark
-done
+%pom_disable_module classification
-
+%pom_disable_module demo
-for module in icu kuromoji morfologik phonetic stempel uima
+%pom_disable_module expressions
-do
+%pom_disable_module facet
-    %pom_disable_module $module analysis
+%pom_disable_module replicator
-done
+%pom_disable_module spatial
-cd -
+%pom_disable_module spatial-extras
-
+%pom_disable_module spatial3d
+%pom_disable_module suggest
+%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
+popd
 %mvn_package :lucene-parent __noinstall
 %mvn_package :lucene-solr-grandparent __noinstall
 %endif
-
+pushd lucene
+%pom_disable_module opennlp analysis
+popd
 %mvn_build -s -f
 
 %install
 %mvn_install
-
 %global _docdir_fmt %{name}
 
 %files -f .mfiles-%{name}-core
-%license lucene/{LICENSE,NOTICE}.txt
+%doc lucene/CHANGES.txt lucene/README.txt
+%doc lucene/MIGRATE.txt lucene/JRE_VERSION_MIGRATION.txt
+%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
 %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 backward-codecs -f .mfiles-%{name}-backward-codecs
+
 %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-uima -f .mfiles-%{name}-analyzers-uima
+
+%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
 
-%files help -f .mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
-%doc lucene/{CHANGES,README,MIGRATE,JRE_VERSION_MIGRATION}.txt
+%license lucene/LICENSE.txt lucene/NOTICE.txt
 
 %changelog
+* Tue Aug 18 2020 Sunguoshuai <sunguoshuai@huawei.com> - 7.7.0-1
+- Upgrade to 7.7.0
+
 * Mon Dec 23 2019 zhouyihang <zhouyihang1@huawei.com> - 0:7.1.0-4
 - Package init