From 74a7af86e35408f39dcb61c2103dbab088b414f0 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mar 21 2020 18:45:41 +0000
Subject: Update to latest upstream release


---

diff --git a/.gitignore b/.gitignore
index 52d9054..dd24dba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ dev-tools.tar.xz
 /solr-7.1.0-src.tgz
 /solr-7.7.0-src.tgz
 /solr-8.1.1-src.tgz
+/solr-8.4.1-src.tgz
diff --git a/0001-Disable-ivy-settings.patch b/0001-Disable-ivy-settings.patch
index 717e5ab..68ecb0b 100644
--- a/0001-Disable-ivy-settings.patch
+++ b/0001-Disable-ivy-settings.patch
@@ -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
-@@ -419,7 +419,6 @@
+@@ -438,7 +438,6 @@
            you have an idea, fix it.
            unless="ivy.settings.uptodate" -->
      <!-- override: just for safety, should be unnecessary -->
diff --git a/0002-Dependency-generation.patch b/0002-Dependency-generation.patch
index 07be6eb..e90a4dc 100644
--- a/0002-Dependency-generation.patch
+++ b/0002-Dependency-generation.patch
@@ -9,40 +9,46 @@ 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 3c1439c..23d291a 100644
+index e3cf905..facc19b 100644
 --- a/lucene/build.xml
 +++ b/lucene/build.xml
-@@ -425,12 +425,14 @@
+@@ -427,12 +427,8 @@
      </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 6767ffe..75f6579 100644
+index 41da3f2..d2f9d16 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -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"/>
- 
+@@ -1876,7 +1876,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
    <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-module-dependencies-properties" inheritall="false"/>
+     <ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/>
      <get-maven-dependencies-macro
 -        dir="${common.dir}/.."
-+        dir="."
++        dir="${common.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}"/>
@@ -50,7 +56,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
-@@ -535,6 +535,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -537,6 +537,7 @@ public class GetMavenDependenciesTask extends Task {
    private Collection<String> getTransitiveDependenciesFromIvyCache
    (String groupId, String artifactId, String version) {
      SortedSet<String> transitiveDependencies = new TreeSet<>();
@@ -58,7 +64,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()) {
-@@ -556,6 +557,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -558,6 +559,7 @@ public class GetMavenDependenciesTask extends Task {
                                + groupId + ':' + artifactId + ':' + version + " from "
                                + ivyXmlFile.getAbsolutePath(), e);
      }
diff --git a/lucene.spec b/lucene.spec
index 8eadf86..4e903ea 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -2,8 +2,8 @@
 
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
-Version:        8.1.1
-Release:        4%{?dist}
+Version:        8.4.1
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -161,6 +161,12 @@ Summary:      Lucene Suggest Module
 %description suggest
 Lucene Suggest Module.
 
+%package monitor
+Summary:      Lucene Monitor Module
+
+%description monitor
+Lucene Monitor Module.
+
 %if %{without jp_minimal}
 %package parent
 Summary:      Parent POM for Lucene
@@ -236,12 +242,11 @@ 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
-
 # compatibility with existing packages
 %mvn_alias :%{name}-analyzers-common :%{name}-analyzers
 
@@ -252,8 +257,9 @@ sed -i 's/-filter-pom-templates/filter-pom-templates/' lucene/common-build.xml
 %build
 pushd %{name}
 find -maxdepth 2 -type d -exec mkdir -p '{}/lib' \;
-# generate dependencies
-ant -f common-build.xml filter-pom-templates -Divy.mode=local -Dversion=%{version} -Divy.available=true
+
+# generate maven dependencies
+ant -f build.xml generate-maven-artifacts -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
@@ -351,6 +357,7 @@ popd
 %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
@@ -367,6 +374,9 @@ popd
 %license lucene/LICENSE.txt lucene/NOTICE.txt
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 18b8990..bc1694c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (solr-8.1.1-src.tgz) = cd0e5f90cdf97e9de786ab969cb894af8564afeb31522f35c8b73a6d959115d50a812019cfe2476479a74197772525d20c6d0a8174b31b7c8517743caa46efef
+SHA512 (solr-8.4.1-src.tgz) = 29df94ce5ee571b3cdb9738b1d05ed3e1abe4bc171b4407789100f338671a539d5751f27c12c3317f064354d5cb96df7cd0cf7d03de6882d06b5db4501e278ce