From 80537ec7dd098e7de9a83791d00c386cda0b8c99eefcfadd1d60d9f8024d1d66 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 6 Apr 2020 11:45:51 +0000
Subject: [PATCH 1/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/lucene?expand=0&rev=59

---
 0001-Disable-ivy-settings.patch               |  11 +-
 0002-Dependency-generation.patch              |  41 ++--
 lucene-7.1.0-src.tgz                          |   3 -
 lucene-8.5.0-src.tgz                          |   3 +
 ...0.pom => lucene-analyzers-common-8.5.0.pom |   4 +-
 ....pom => lucene-analyzers-smartcn-8.5.0.pom |   4 +-
 ....pom => lucene-analyzers-stempel-8.5.0.pom |   4 +-
 ....0.pom => lucene-backward-codecs-8.5.0.pom |   4 +-
 ...1.0.pom => lucene-classification-8.5.0.pom |   4 +-
 ...odecs-7.1.0.pom => lucene-codecs-8.5.0.pom |   4 +-
 ...ne-core-7.1.0.pom => lucene-core-8.5.0.pom |   4 +-
 ...ing-7.1.0.pom => lucene-grouping-8.5.0.pom |   4 +-
 ...-7.1.0.pom => lucene-highlighter-8.5.0.pom |  17 +-
 lucene-java8compat.patch                      |  76 +++----
 ...ne-join-7.1.0.pom => lucene-join-8.5.0.pom |   4 +-
 ...emory-7.1.0.pom => lucene-memory-8.5.0.pom |   4 +-
 ...ne-misc-7.1.0.pom => lucene-misc-8.5.0.pom |   4 +-
 lucene-missing-dependencies.patch             | 158 ++++++++++++++
 ...acet-7.1.0.pom => lucene-monitor-8.5.0.pom |  27 +--
 lucene-osgi-manifests.patch                   | 196 +++++++-----------
 ...ries-7.1.0.pom => lucene-queries-8.5.0.pom |  25 ++-
 ...-7.1.0.pom => lucene-queryparser-8.5.0.pom |   4 +-
 ...dbox-7.1.0.pom => lucene-sandbox-8.5.0.pom |   4 +-
 lucene-spatial-7.1.0.pom                      |  82 --------
 ...3d-7.1.0.pom => lucene-spatial3d-8.5.0.pom |   4 +-
 lucene.spec                                   |  99 ++++-----
 26 files changed, 419 insertions(+), 375 deletions(-)
 delete mode 100644 lucene-7.1.0-src.tgz
 create mode 100644 lucene-8.5.0-src.tgz
 rename lucene-analyzers-common-7.1.0.pom => lucene-analyzers-common-8.5.0.pom (97%)
 rename lucene-analyzers-smartcn-7.1.0.pom => lucene-analyzers-smartcn-8.5.0.pom (97%)
 rename lucene-analyzers-stempel-7.1.0.pom => lucene-analyzers-stempel-8.5.0.pom (97%)
 rename lucene-backward-codecs-7.1.0.pom => lucene-backward-codecs-8.5.0.pom (97%)
 rename lucene-classification-7.1.0.pom => lucene-classification-8.5.0.pom (97%)
 rename lucene-codecs-7.1.0.pom => lucene-codecs-8.5.0.pom (97%)
 rename lucene-core-7.1.0.pom => lucene-core-8.5.0.pom (97%)
 rename lucene-grouping-7.1.0.pom => lucene-grouping-8.5.0.pom (97%)
 rename lucene-highlighter-7.1.0.pom => lucene-highlighter-8.5.0.pom (94%)
 rename lucene-join-7.1.0.pom => lucene-join-8.5.0.pom (97%)
 rename lucene-memory-7.1.0.pom => lucene-memory-8.5.0.pom (97%)
 rename lucene-misc-7.1.0.pom => lucene-misc-8.5.0.pom (97%)
 create mode 100644 lucene-missing-dependencies.patch
 rename lucene-facet-7.1.0.pom => lucene-monitor-8.5.0.pom (82%)
 rename lucene-queries-7.1.0.pom => lucene-queries-8.5.0.pom (80%)
 rename lucene-queryparser-7.1.0.pom => lucene-queryparser-8.5.0.pom (97%)
 rename lucene-sandbox-7.1.0.pom => lucene-sandbox-8.5.0.pom (97%)
 delete mode 100644 lucene-spatial-7.1.0.pom
 rename lucene-spatial3d-7.1.0.pom => lucene-spatial3d-8.5.0.pom (97%)

diff --git a/0001-Disable-ivy-settings.patch b/0001-Disable-ivy-settings.patch
index ca17441..6f3dd1d 100644
--- a/0001-Disable-ivy-settings.patch
+++ b/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 @@
+@@ -438,7 +438,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
+
diff --git a/0002-Dependency-generation.patch b/0002-Dependency-generation.patch
index 1836c07..4bb9e2e 100644
--- a/0002-Dependency-generation.patch
+++ b/0002-Dependency-generation.patch
@@ -1,56 +1,49 @@
-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/common-build.xml                                     | 4 ++--
+ .../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 e3cf905..facc19b 100644
 --- a/lucene/build.xml
 +++ b/lucene/build.xml
-@@ -421,12 +421,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 5416e1e..783c63e 100644
+index 41da3f2..d2f9d16 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -1792,9 +1792,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}"/>
 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 {
+@@ -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 +51,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 {
+@@ -558,6 +559,7 @@ public class GetMavenDependenciesTask extends Task {
                                + groupId + ':' + artifactId + ':' + version + " from "
                                + ivyXmlFile.getAbsolutePath(), e);
      }
@@ -67,5 +60,5 @@ index c998342..ddfd42c 100644
    }
  
 -- 
-2.5.0
+2.20.1
 
diff --git a/lucene-7.1.0-src.tgz b/lucene-7.1.0-src.tgz
deleted file mode 100644
index 58a97c7..0000000
--- a/lucene-7.1.0-src.tgz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:004e7f5cb6f8ecce448420b69b7de59f4dec291351f43d72600018fc475e87a7
-size 32441767
diff --git a/lucene-8.5.0-src.tgz b/lucene-8.5.0-src.tgz
new file mode 100644
index 0000000..dc3f097
--- /dev/null
+++ b/lucene-8.5.0-src.tgz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:079dacd9ab777b168d7e26ca80b50455018e63ff12b28d4500bc34a753ba65b1
+size 43734203
diff --git a/lucene-analyzers-common-7.1.0.pom b/lucene-analyzers-common-8.5.0.pom
similarity index 97%
rename from lucene-analyzers-common-7.1.0.pom
rename to lucene-analyzers-common-8.5.0.pom
index 8a4d536..c06aca7 100644
--- a/lucene-analyzers-common-7.1.0.pom
+++ b/lucene-analyzers-common-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-analyzers-smartcn-7.1.0.pom b/lucene-analyzers-smartcn-8.5.0.pom
similarity index 97%
rename from lucene-analyzers-smartcn-7.1.0.pom
rename to lucene-analyzers-smartcn-8.5.0.pom
index 76e8a1d..bb26d80 100644
--- a/lucene-analyzers-smartcn-7.1.0.pom
+++ b/lucene-analyzers-smartcn-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-analyzers-stempel-7.1.0.pom b/lucene-analyzers-stempel-8.5.0.pom
similarity index 97%
rename from lucene-analyzers-stempel-7.1.0.pom
rename to lucene-analyzers-stempel-8.5.0.pom
index b353d40..64fa0f0 100644
--- a/lucene-analyzers-stempel-7.1.0.pom
+++ b/lucene-analyzers-stempel-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-backward-codecs-7.1.0.pom b/lucene-backward-codecs-8.5.0.pom
similarity index 97%
rename from lucene-backward-codecs-7.1.0.pom
rename to lucene-backward-codecs-8.5.0.pom
index b3ea171..ddd073d 100644
--- a/lucene-backward-codecs-7.1.0.pom
+++ b/lucene-backward-codecs-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-classification-7.1.0.pom b/lucene-classification-8.5.0.pom
similarity index 97%
rename from lucene-classification-7.1.0.pom
rename to lucene-classification-8.5.0.pom
index 483c2b7..1747d91 100644
--- a/lucene-classification-7.1.0.pom
+++ b/lucene-classification-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-codecs-7.1.0.pom b/lucene-codecs-8.5.0.pom
similarity index 97%
rename from lucene-codecs-7.1.0.pom
rename to lucene-codecs-8.5.0.pom
index fe6f062..96191b4 100644
--- a/lucene-codecs-7.1.0.pom
+++ b/lucene-codecs-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-core-7.1.0.pom b/lucene-core-8.5.0.pom
similarity index 97%
rename from lucene-core-7.1.0.pom
rename to lucene-core-8.5.0.pom
index ae921ba..d4b9d93 100644
--- a/lucene-core-7.1.0.pom
+++ b/lucene-core-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-grouping-7.1.0.pom b/lucene-grouping-8.5.0.pom
similarity index 97%
rename from lucene-grouping-7.1.0.pom
rename to lucene-grouping-8.5.0.pom
index 20c84cd..81e5909 100644
--- a/lucene-grouping-7.1.0.pom
+++ b/lucene-grouping-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-highlighter-7.1.0.pom b/lucene-highlighter-8.5.0.pom
similarity index 94%
rename from lucene-highlighter-7.1.0.pom
rename to lucene-highlighter-8.5.0.pom
index c57196e..b5f1b4e 100644
--- a/lucene-highlighter-7.1.0.pom
+++ b/lucene-highlighter-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
@@ -50,18 +50,10 @@
       <artifactId>lucene-test-framework</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-join</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-memory</artifactId>
@@ -71,6 +63,11 @@
       <artifactId>lucene-queries</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-codecs</artifactId>
diff --git a/lucene-java8compat.patch b/lucene-java8compat.patch
index 7f295d5..dcc6805 100644
--- a/lucene-java8compat.patch
+++ b/lucene-java8compat.patch
@@ -1,14 +1,14 @@
---- lucene-7.1.0/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java	2017-10-13 18:14:40.000000000 +0200
-+++ lucene-7.1.0.new/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java	2019-09-26 09:19:44.404112874 +0200
-@@ -22,6 +22,7 @@
- import java.io.FileOutputStream;
+--- lucene-8.5.0/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java	2020-03-13 10:35:54.000000000 +0100
++++ lucene-8.5.0/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java	2020-04-06 11:47:37.590300471 +0200
+@@ -20,6 +20,7 @@
+ import java.io.BufferedOutputStream;
  import java.io.IOException;
  import java.io.OutputStream;
 +import java.nio.Buffer;
  import java.nio.ByteBuffer;
  import java.nio.channels.Channels;
  import java.nio.channels.WritableByteChannel;
-@@ -94,7 +95,7 @@
+@@ -98,7 +99,7 @@
      int worstCase = 4 + 3 + 2*(baseForm.length() + reading.length() + pronunciation.length());
      if (worstCase > left) {
        ByteBuffer newBuffer = ByteBuffer.allocate(ArrayUtil.oversize(buffer.limit() + worstCase - left, 1));
@@ -17,17 +17,17 @@
        newBuffer.put(buffer);
        buffer = newBuffer;
      }
-@@ -306,7 +307,7 @@
+@@ -321,7 +322,7 @@
        out.writeVInt(buffer.position());
-       final WritableByteChannel channel = Channels.newChannel(os);
+       final WritableByteChannel channel = Channels.newChannel(bos);
        // Write Buffer
 -      buffer.flip();  // set position to 0, set limit to current position
 +      ((Buffer)buffer).flip();  // set position to 0, set limit to current position
        channel.write(buffer);
        assert buffer.remaining() == 0L;
-     } finally {
---- lucene-7.1.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java	2017-10-13 18:14:40.000000000 +0200
-+++ lucene-7.1.0.new/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java	2019-09-26 09:19:44.404112874 +0200
+     }
+--- lucene-8.5.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java	2020-04-06 11:49:45.810989724 +0200
 @@ -19,6 +19,7 @@
  
  import java.io.EOFException;
@@ -35,26 +35,26 @@
 +import java.nio.Buffer;
  import java.nio.BufferUnderflowException;
  import java.nio.ByteBuffer;
- 
-@@ -75,7 +76,7 @@
+ import java.nio.ByteOrder;
+@@ -85,7 +86,7 @@
            throw new EOFException("read past EOF: " + this);
          }
-         curBuf = buffers[curBufIndex];
+         setCurBuf(buffers[curBufIndex]);
 -        curBuf.position(0);
 +        ((Buffer)curBuf).position(0);
        } while (!curBuf.hasRemaining());
        return guard.getByte(curBuf);
      } catch (NullPointerException npe) {
-@@ -98,7 +99,7 @@
+@@ -108,7 +109,7 @@
            throw new EOFException("read past EOF: " + this);
          }
-         curBuf = buffers[curBufIndex];
+         setCurBuf(buffers[curBufIndex]);
 -        curBuf.position(0);
 +        ((Buffer)curBuf).position(0);
          curAvail = curBuf.remaining();
        }
        guard.getBytes(curBuf, b, offset, len);
-@@ -156,10 +157,10 @@
+@@ -204,10 +205,10 @@
      final int bi = (int) (pos >> chunkSizePower);
      try {
        if (bi == curBufIndex) {
@@ -66,17 +66,17 @@
 +        ((Buffer)b).position((int) (pos & chunkSizeMask));
          // write values, on exception all is unchanged
          this.curBufIndex = bi;
-         this.curBuf = b;
-@@ -187,7 +188,7 @@
+         setCurBuf(b);
+@@ -235,7 +236,7 @@
    private void setPos(long pos, int bi) throws IOException {
      try {
        final ByteBuffer b = buffers[bi];
 -      b.position((int) (pos & chunkSizeMask));
 +      ((Buffer)b).position((int) (pos & chunkSizeMask));
        this.curBufIndex = bi;
-       this.curBuf = b;
+       setCurBuf(b);
      } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException aioobe) {
-@@ -287,7 +288,7 @@
+@@ -335,7 +336,7 @@
    @SuppressWarnings("resource")
    protected ByteBufferIndexInput newCloneInstance(String newResourceDescription, ByteBuffer[] newBuffers, int offset, long length) {
      if (newBuffers.length == 1) {
@@ -85,7 +85,7 @@
        return new SingleBufferImpl(newResourceDescription, newBuffers[0].slice(), length, chunkSizePower, this.guard);
      } else {
        return new MultiBufferImpl(newResourceDescription, newBuffers, offset, length, chunkSizePower, guard);
-@@ -311,7 +312,7 @@
+@@ -359,7 +360,7 @@
      }
  
      // set the last buffer's limit for the sliced view.
@@ -94,16 +94,16 @@
      
      return slices;
    }
-@@ -350,7 +351,7 @@
+@@ -399,7 +400,7 @@
        super(resourceDescription, new ByteBuffer[] { buffer }, length, chunkSizePower, guard);
        this.curBufIndex = 0;
-       this.curBuf = buffer;
+       setCurBuf(buffer);
 -      buffer.position(0);
 +      ((Buffer)buffer).position(0);
      }
      
      // TODO: investigate optimizing readByte() & Co?
-@@ -358,7 +359,7 @@
+@@ -407,7 +408,7 @@
      @Override
      public void seek(long pos) throws IOException {
        try {
@@ -112,8 +112,8 @@
        } catch (IllegalArgumentException e) {
          if (pos < 0) {
            throw new IllegalArgumentException("Seeking to negative position: " + this, e);
---- lucene-7.1.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java	2017-10-13 18:14:40.000000000 +0200
-+++ lucene-7.1.0.new/core/src/java/org/apache/lucene/store/NIOFSDirectory.java	2019-09-26 09:19:44.404112874 +0200
+--- lucene-8.5.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java	2020-04-06 11:47:37.590300471 +0200
 @@ -18,6 +18,7 @@
  
  import java.io.EOFException;
@@ -140,8 +140,8 @@
            assert bb.remaining() == toRead;
            final int i = channel.read(bb, pos);
            if (i < 0) { // be defensive here, even though we checked before hand, something could have changed
---- lucene-7.1.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java	2017-10-13 18:14:40.000000000 +0200
-+++ lucene-7.1.0.new/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java	2019-09-26 09:19:44.404112874 +0200
+--- lucene-8.5.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java	2020-04-06 11:47:37.590300471 +0200
 @@ -19,6 +19,7 @@
  
  import java.io.EOFException;
@@ -159,8 +159,8 @@
        } else {
          bb = ByteBuffer.wrap(b, offset, len);
        }
---- lucene-7.1.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java	2017-10-13 18:14:41.000000000 +0200
-+++ lucene-7.1.0.new/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java	2019-09-26 09:19:44.408112899 +0200
+--- lucene-8.5.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java	2020-04-06 11:47:37.590300471 +0200
 @@ -21,6 +21,7 @@
  import java.io.FileInputStream;
  import java.io.FileOutputStream;
@@ -169,7 +169,7 @@
  import java.nio.ByteBuffer;
  import java.nio.channels.FileChannel;
  import java.nio.file.Path;
-@@ -212,7 +213,7 @@
+@@ -211,7 +212,7 @@
      //}
  
      private void dump() throws IOException {
@@ -178,7 +178,7 @@
        final long limit = filePos + buffer.limit();
        if (limit > fileLength) {
          // this dump extends the file
-@@ -222,7 +223,7 @@
+@@ -221,7 +222,7 @@
        }
  
        // must always round to next block
@@ -187,7 +187,7 @@
  
        assert (buffer.limit() & ALIGN_NOT_MASK) == buffer.limit() : "limit=" + buffer.limit() + " vs " + (buffer.limit() & ALIGN_NOT_MASK);
        assert (filePos & ALIGN_NOT_MASK) == filePos;
-@@ -230,7 +231,7 @@
+@@ -229,7 +230,7 @@
        channel.write(buffer, filePos);
        filePos += bufferPos;
        bufferPos = 0;
@@ -196,7 +196,7 @@
        //System.out.println("dump: done");
  
        // TODO: the case where we'd seek'd back, wrote an
-@@ -341,7 +342,7 @@
+@@ -340,7 +341,7 @@
          final int delta = (int) (pos - alignedPos);
          if (delta != 0) {
            refill();
@@ -205,7 +205,7 @@
            bufferPos = delta;
          } else {
            // force refill on next read
-@@ -373,7 +374,7 @@
+@@ -372,7 +373,7 @@
      }
  
      private void refill() throws IOException {
@@ -214,7 +214,7 @@
        filePos += bufferSize;
        bufferPos = 0;
        assert (filePos & ALIGN_NOT_MASK) == filePos : "filePos=" + filePos + " anded=" + (filePos & ALIGN_NOT_MASK);
-@@ -387,7 +388,7 @@
+@@ -386,7 +387,7 @@
        if (n < 0) {
          throw new EOFException("read past EOF: " + this);
        }
@@ -223,8 +223,8 @@
      }
  
      @Override
---- lucene-7.1.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java	2017-10-13 18:14:41.000000000 +0200
-+++ lucene-7.1.0.new/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java	2019-09-26 09:19:44.408112899 +0200
+--- lucene-8.5.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java	2020-04-06 11:47:37.594300492 +0200
 @@ -20,6 +20,7 @@
  import java.io.Closeable;
  import java.io.EOFException;
diff --git a/lucene-join-7.1.0.pom b/lucene-join-8.5.0.pom
similarity index 97%
rename from lucene-join-7.1.0.pom
rename to lucene-join-8.5.0.pom
index 4d31adc..5536a42 100644
--- a/lucene-join-7.1.0.pom
+++ b/lucene-join-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-memory-7.1.0.pom b/lucene-memory-8.5.0.pom
similarity index 97%
rename from lucene-memory-7.1.0.pom
rename to lucene-memory-8.5.0.pom
index ee4dec0..f8e0fba 100644
--- a/lucene-memory-7.1.0.pom
+++ b/lucene-memory-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-misc-7.1.0.pom b/lucene-misc-8.5.0.pom
similarity index 97%
rename from lucene-misc-7.1.0.pom
rename to lucene-misc-8.5.0.pom
index 49a9fce..fda36a9 100644
--- a/lucene-misc-7.1.0.pom
+++ b/lucene-misc-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-missing-dependencies.patch b/lucene-missing-dependencies.patch
new file mode 100644
index 0000000..e2f3a3f
--- /dev/null
+++ b/lucene-missing-dependencies.patch
@@ -0,0 +1,158 @@
+--- lucene-8.5.0/analysis/common/build.xml	2020-04-06 12:09:05.493250593 +0200
++++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 12:22:01.033446015 +0200
+@@ -88,7 +88,7 @@
+     <property name="icu4j.resolved" value="true"/>
+   </target>
+ 
+-  <target name="unicode-data" depends="-resolve-icu4j,resolve-groovy">
++  <target name="unicode-data" depends="-resolve-icu4j">
+     <groovy classpathref="icu4j.classpath" src="src/tools/groovy/generate-unicode-data.groovy"/>
+     <fixcrlf file="${unicode-props-file}" encoding="UTF-8"/>
+   </target>
+--- lucene-8.5.0/build.xml	2020-04-06 11:43:38.337014365 +0200
++++ lucene-8.5.0/build.xml	2020-04-06 12:21:53.785406802 +0200
+@@ -538,7 +538,7 @@
+   </target>
+ 
+   <!-- Override common-build.xml definition to check for the jar already being up-to-date -->
+-  <target name="jar-core" depends="resolve-groovy,check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate">
++  <target name="jar-core" depends="check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate">
+     <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
+       <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
+--- lucene-8.5.0/common-build.xml	2020-04-06 12:09:05.497250615 +0200
++++ lucene-8.5.0/common-build.xml	2020-04-06 12:20:32.720968275 +0200
+@@ -625,12 +625,10 @@
+     </jarify>
+   </target>
+   
+-  <target name="-jar-core" depends="-mrjar-check" unless="has-mrjar-patched-files">
++  <target name="jar-core" depends="compile-core">
+     <jarify/>
+   </target>
+   
+-  <target name="jar-core" depends="-mrjar-core,-jar-core"/>
+-
+   <!-- Packaging targets: -->
+   
+   <property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/>
+@@ -1534,8 +1498,8 @@
+     </taskdef>
+   </target>
+ 
+-  <target name="test" depends="clover,compile-test,patch-mrjar-classes,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests"/>
+-  <target name="beast" depends="install-ant-contrib,clover,compile-test,patch-mrjar-classes,install-junit4-taskdef,validate,-init-totals,-beast,-check-totals" description="Runs unit tests in a loop (-Dbeast.iters=n)"/>
++  <target name="test" depends="clover,compile-test,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests"/>
++  <target name="beast" depends="install-ant-contrib,clover,compile-test,install-junit4-taskdef,validate,-init-totals,-beast,-check-totals" description="Runs unit tests in a loop (-Dbeast.iters=n)"/>
+ 
+   <target name="test-nocompile" depends="-clover.disable,install-junit4-taskdef,-init-totals,-test,-check-totals"
+           description="Only runs unit tests.  Jars are not downloaded; compilation is not updated; and Clover is not enabled."/>
+@@ -1595,7 +1559,7 @@
+   </target>
+ 
+   <!-- Beast the actual tests (must be wrapped with -init-totals, -check-totals) -->
+-  <target name="-beast" depends="resolve-groovy,install-ant-contrib">
++  <target name="-beast" depends="install-ant-contrib">
+     <fail message="The Beast only works inside of individual modules (where 'junit.classpath' is defined)">
+       <condition>
+         <not><isreference refid="junit.classpath"/></not>
+@@ -1606,7 +1570,7 @@
+     <fail message="Fail baby fail" if="groovy.error"/>
+   </target>
+ 
+-  <target name="-check-totals" if="tests.totals.toplevel" depends="resolve-groovy">
++  <target name="-check-totals" if="tests.totals.toplevel">
+     <!-- We are concluding a test pass at the outermost level. Sum up all executed tests. -->
+     <groovy><![CDATA[
+       import org.apache.tools.ant.BuildException;
+@@ -1630,7 +1594,7 @@
+   </target>
+ 
+   <!-- The groovy dependency is wanted: this is done early before any test or any other submodule is ran, to prevent permgen errors! -->
+-  <target name="-init-totals" unless="tests.totals.tmpfile" depends="resolve-groovy">
++  <target name="-init-totals" unless="tests.totals.tmpfile">
+     <mkdir dir="${build.dir}" />
+     <tempfile property="tests.totals.tmpfile"
+               destdir="${build.dir}"
+@@ -2505,7 +2459,7 @@
+     </forbidden-apis>
+   </target>
+ 
+-  <target name="resolve-markdown" unless="markdown.loaded" depends="resolve-groovy">
++  <target name="resolve-markdown" unless="markdown.loaded">
+     <property name="flexmark.version" value="0.42.6"/>
+     <ivy:cachepath transitive="true" resolveId="flexmark" pathid="markdown.classpath">
+       <ivy:dependency org="com.vladsch.flexmark" name="flexmark" rev="${flexmark.version}" conf="default" />
+--- lucene-8.5.0/core/build.xml	2020-04-06 12:09:05.497250615 +0200
++++ lucene-8.5.0/core/build.xml	2020-04-06 12:22:08.761487819 +0200
+@@ -222,7 +222,7 @@
+     </or>
+   </condition>
+   
+-  <target name="test-lock-factory" depends="resolve-groovy,compile-core" unless="-ignore-test-lock-factory"
++  <target name="test-lock-factory" depends="compile-core" unless="-ignore-test-lock-factory"
+     description="Run LockStressTest with multiple JVMs">
+     <property name="lockverifyserver.host" value="127.0.0.1"/>
+     <property name="lockverify.delay" value="1"/>
+--- lucene-8.5.0/demo/build.xml	2020-04-06 12:09:05.497250615 +0200
++++ lucene-8.5.0/demo/build.xml	2020-04-06 12:36:38.322189334 +0200
+@@ -56,7 +56,7 @@
+   <!-- we don't check for sysout in demo, because the demo is there to use sysout :-) -->
+   <target name="-check-forbidden-sysout"/>
+ 
+-  <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,jar-expressions,common.compile-core" />
++  <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,common.compile-core" />
+ 
+   <target name="jar-core" depends="compile-core">
+     <jarify>
+--- lucene-8.5.0/module-build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/module-build.xml	2020-04-06 12:45:38.953110299 +0200
+@@ -604,6 +582,28 @@
+     <property name="misc-javadocs.uptodate" value="true"/>
+   </target>
+ 
++  <property name="monitor.jar" value="${common.dir}/build/monitor/lucene-monitor-${version}.jar"/>
++  <target name="check-monitor-uptodate" unless="monitor.uptodate">
++    <module-uptodate name="monitor" jarfile="${monitor.jar}" property="monitor.uptodate"/>
++  </target>
++  <target name="jar-monitor" unless="monitor.uptodate" depends="check-monitor-uptodate">
++    <ant dir="${common.dir}/monitor" target="jar-core" inheritAll="false">
++      <propertyset refid="uptodate.and.compiled.properties"/>
++    </ant>
++    <property name="monitor.uptodate" value="true"/>
++  </target>
++
++  <property name="monitor-javadoc.jar" value="${common.dir}/build/monitor/lucene-monitor-${version}-javadoc.jar"/>
++  <target name="check-monitor-javadocs-uptodate" unless="monitor-javadocs.uptodate">
++    <module-uptodate name="monitor" jarfile="${monitor-javadoc.jar}" property="monitor-javadocs.uptodate"/>
++  </target>
++  <target name="javadocs-monitor" unless="monitor-javadocs.uptodate" depends="check-monitor-javadocs-uptodate">
++    <ant dir="${common.dir}/monitor" target="javadocs" inheritAll="false">
++      <propertyset refid="uptodate.and.compiled.properties"/>
++    </ant>
++    <property name="monitor-javadocs.uptodate" value="true"/>
++  </target>
++
+   <property name="sandbox.jar" value="${common.dir}/build/sandbox/lucene-sandbox-${version}.jar"/>
+   <target name="check-sandbox-uptodate" unless="sandbox.uptodate">
+     <module-uptodate name="sandbox" jarfile="${sandbox.jar}" property="sandbox.uptodate"/>
+--- lucene-8.5.0/queries/build.xml	2020-04-06 12:09:05.501250635 +0200
++++ lucene-8.5.0/queries/build.xml	2020-04-06 12:37:44.478546763 +0200
+@@ -47,5 +47,5 @@
+ 	</jarify>
+   </target>
+ 
+-  <target name="compile-core" depends="jar-expressions,common.compile-core" />
++  <target name="compile-core" depends="common.compile-core" />
+ </project>
+--- lucene-8.5.0/suggest/build.xml	2020-04-06 12:09:05.501250635 +0200
++++ lucene-8.5.0/suggest/build.xml	2020-04-06 12:36:24.810116329 +0200
+@@ -42,7 +42,7 @@
+     </invoke-module-javadoc>
+   </target>
+ 
+-  <target name="compile-core" depends="jar-expressions, jar-analyzers-common, common.compile-core" />
++  <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
+ 
+   <target name="jar-core" depends="compile-core">
+     <jarify>
diff --git a/lucene-facet-7.1.0.pom b/lucene-monitor-8.5.0.pom
similarity index 82%
rename from lucene-facet-7.1.0.pom
rename to lucene-monitor-8.5.0.pom
index 04ae2c2..9e15ce8 100644
--- a/lucene-facet-7.1.0.pom
+++ b/lucene-monitor-8.5.0.pom
@@ -18,23 +18,23 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
-  <artifactId>lucene-facet</artifactId>
+  <artifactId>lucene-monitor</artifactId>
   <packaging>jar</packaging>
-  <name>Lucene Facets</name>
+  <name>Lucene Monitor</name>
   <description>
-    Package for Faceted Indexing and Search
+    High-performance single-document index to compare against Query
   </description>
   <properties>
-    <module-directory>lucene/facet</module-directory>
+    <module-directory>lucene/monitor</module-directory>
     <relative-top-level>../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>
@@ -50,13 +50,21 @@
       <artifactId>lucene-test-framework</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queries</artifactId>
+      <artifactId>lucene-memory</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queryparser</artifactId>
     </dependency>
 
     <dependency>
@@ -69,11 +77,6 @@
   <build>
     <sourceDirectory>${module-path}/src/java</sourceDirectory>
     <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>${module-path}/src/resources</directory>
-      </resource>
-    </resources>
     <testResources>
       <testResource>
         <directory>${project.build.testSourceDirectory}</directory>
diff --git a/lucene-osgi-manifests.patch b/lucene-osgi-manifests.patch
index a02350b..1c583dd 100644
--- a/lucene-osgi-manifests.patch
+++ b/lucene-osgi-manifests.patch
@@ -1,6 +1,6 @@
---- lucene-7.1.0/analysis/common/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/common/build.xml	2020-03-23 10:54:26.609388906 +0100
-@@ -136,4 +136,24 @@
+--- lucene-8.5.0/analysis/common/build.xml	2020-03-13 10:35:54.000000000 +0100
++++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 11:56:59.721324402 +0200
+@@ -133,4 +133,24 @@
        </replaceregexp>
        <fixcrlf srcdir="${snowball.programs.dir}" includes="*Stemmer.java" tab="remove" tablength="2" encoding="UTF-8" javafiles="yes" fixlast="yes"/>
    </target>
@@ -25,8 +25,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/analysis/icu/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/icu/build.xml	2020-03-23 10:54:26.713389469 +0100
+--- lucene-8.5.0/analysis/icu/build.xml	2020-03-13 10:35:54.000000000 +0100
++++ lucene-8.5.0/analysis/icu/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -115,4 +115,22 @@
  
    <target name="regenerate" depends="gen-utr30-data-files,gennorm2,genrbbi"/>
@@ -50,9 +50,9 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/analysis/kuromoji/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/kuromoji/build.xml	2020-03-23 10:54:26.717389490 +0100
-@@ -141,4 +141,22 @@
+--- lucene-8.5.0/analysis/kuromoji/build.xml	2020-03-13 10:35:54.000000000 +0100
++++ lucene-8.5.0/analysis/kuromoji/build.xml	2020-04-06 11:56:59.721324402 +0200
+@@ -95,4 +95,22 @@
  
    <target name="regenerate" depends="build-dict"/>
  
@@ -75,8 +75,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/analysis/morfologik/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/morfologik/build.xml	2020-03-23 10:54:26.725389533 +0100
+--- lucene-8.5.0/analysis/morfologik/build.xml	2020-03-13 10:35:54.000000000 +0100
++++ lucene-8.5.0/analysis/morfologik/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -37,4 +37,23 @@
    </path>
  
@@ -101,8 +101,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/analysis/phonetic/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/phonetic/build.xml	2020-03-23 10:54:26.729389555 +0100
+--- lucene-8.5.0/analysis/phonetic/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/analysis/phonetic/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -32,4 +32,23 @@
    </path>
  
@@ -127,8 +127,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/analysis/smartcn/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/smartcn/build.xml	2020-03-23 10:54:26.729389555 +0100
+--- lucene-8.5.0/analysis/smartcn/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/analysis/smartcn/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -31,4 +31,23 @@
    </path>
  
@@ -153,8 +153,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/analysis/stempel/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/stempel/build.xml	2020-03-23 10:54:26.733389577 +0100
+--- lucene-8.5.0/analysis/stempel/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/analysis/stempel/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -30,5 +30,23 @@
      <path refid="base.classpath"/>
    </path>
@@ -179,34 +179,8 @@
 +
    <target name="compile-core" depends="jar-analyzers-common, common.compile-core"/>
  </project>
---- lucene-7.1.0/analysis/uima/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/analysis/uima/build.xml	2020-03-23 10:54:26.737389598 +0100
-@@ -47,4 +47,23 @@
-   </path>
- 
-   <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
-+
-+  <target name="jar-core" depends="compile-core">
-+    <jarify>
-+	  <jarify-additional-manifest-attributes>
-+		<attribute name="Bundle-Description" value="Lucene 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.)"/>
-+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
-+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+		<attribute name="Bundle-ManifestVersion" value="2"/>
-+		<attribute name="Bundle-Name" value="Lucene UIMA Analysis Components"/>
-+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
-+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
-+		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.analysis.uima;version=&quot;${version}&quot;,org.apache.lucene.analysis.uima.ae;version=&quot;${version}&quot;,uima;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.uima.ae,org.apache.lucene.analysis.util,org.apache.lucene.util,org.apache.uima,org.apache.uima.analysis_engine,org.apache.uima.analysis_engine.metadata,org.apache.uima.cas,org.apache.uima.cas.text,org.apache.uima.resource,org.apache.uima.resource.metadata,org.apache.uima.util"/>
-+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
-+	  </jarify-additional-manifest-attributes>
-+	</jarify>
-+  </target>
-+
- </project>
---- lucene-7.1.0/backward-codecs/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/backward-codecs/build.xml	2020-03-23 10:54:26.741389620 +0100
+--- lucene-8.5.0/backward-codecs/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/backward-codecs/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -23,4 +23,22 @@
  
    <import file="../module-build.xml"/>
@@ -230,9 +204,9 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/benchmark/build.xml	2020-03-23 12:25:15.584631906 +0100
-+++ lucene-7.1.0/benchmark/build.xml	2020-03-23 10:54:26.745389642 +0100
-@@ -285,4 +285,24 @@
+--- lucene-8.5.0/benchmark/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/benchmark/build.xml	2020-04-06 11:56:59.721324402 +0200
+@@ -286,4 +286,24 @@
          <fileset dir="conf"/>
        </copy>
      </target>
@@ -257,8 +231,8 @@
 +
 +
  </project>
---- lucene-7.1.0/classification/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/classification/build.xml	2020-03-23 10:54:26.753389685 +0100
+--- lucene-8.5.0/classification/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/classification/build.xml	2020-04-06 11:56:59.721324402 +0200
 @@ -39,7 +39,23 @@
  
    <target name="compile-core" depends="jar-grouping,jar-queries,jar-analyzers-common,common.compile-core" />
@@ -284,9 +258,9 @@
  
    <target name="javadocs" depends="javadocs-grouping,compile-core,check-javadocs-uptodate"
            unless="javadocs-uptodate-${name}">
---- lucene-7.1.0/common-build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/common-build.xml	2020-03-23 10:54:26.609388906 +0100
-@@ -162,6 +162,7 @@
+--- lucene-8.5.0/common-build.xml	2020-04-06 11:43:38.341014387 +0200
++++ lucene-8.5.0/common-build.xml	2020-04-06 11:56:59.721324402 +0200
+@@ -192,6 +192,7 @@
    <property name="javac.deprecation" value="off"/>
    <property name="javac.debug" value="on"/>
    <property name="javac.release" value="8"/>
@@ -294,7 +268,7 @@
    <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
    <property name="javac.profile.args" value="-profile compact2"/>
    <property name="javadoc.link" value="https://docs.oracle.com/javase/8/docs/api/"/>
-@@ -694,7 +695,7 @@
+@@ -788,7 +789,7 @@
          <attribute name="Implementation-Title" value="@{implementation.title}"/>
          <!-- impl version can be any string -->
          <attribute name="Implementation-Version"
@@ -303,9 +277,9 @@
          <attribute name="Implementation-Vendor"
                     value="The Apache Software Foundation"/>
          <attribute name="X-Compile-Source-JDK" value="${javac.release}"/>
---- lucene-7.1.0/core/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/core/build.xml	2020-03-23 10:54:26.757389707 +0100
-@@ -186,6 +186,24 @@
+--- lucene-8.5.0/core/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/core/build.xml	2020-04-06 11:56:59.725324423 +0200
+@@ -194,6 +194,24 @@
      </sequential>
    </macrodef>
    
@@ -330,12 +304,12 @@
    <condition property="-ignore-test-lock-factory">
      <or>
        <!-- We ignore our ant-based lock factory test, if user applies test filtering: -->
---- lucene-7.1.0/demo/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/demo/build.xml	2020-03-23 10:54:26.793389901 +0100
-@@ -78,4 +78,22 @@
-     </war>
-   </target>
-   
+--- lucene-8.5.0/demo/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/demo/build.xml	2020-04-06 11:56:59.725324423 +0200
+@@ -58,4 +58,22 @@
+ 
+   <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,jar-expressions,common.compile-core" />
+ 
 +  <target name="jar-core" depends="compile-core">
 +    <jarify>
 +	  <jarify-additional-manifest-attributes>
@@ -355,8 +329,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/expressions/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/expressions/build.xml	2020-03-23 10:54:26.909390529 +0100
+--- lucene-8.5.0/expressions/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/expressions/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -117,4 +117,23 @@
        </fixcrlf>
      </sequential>
@@ -381,9 +355,9 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/facet/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/facet/build.xml	2020-03-23 10:54:26.909390529 +0100
-@@ -48,4 +48,22 @@
+--- lucene-8.5.0/facet/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/facet/build.xml	2020-04-06 11:56:59.725324423 +0200
+@@ -44,4 +44,22 @@
      </java>
    </target>
  
@@ -406,8 +380,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/grouping/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/grouping/build.xml	2020-03-23 10:54:26.913390550 +0100
+--- lucene-8.5.0/grouping/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/grouping/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -46,4 +46,22 @@
        </invoke-module-javadoc>
      </target>
@@ -431,9 +405,9 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/highlighter/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/highlighter/build.xml	2020-03-23 10:54:26.913390550 +0100
-@@ -38,6 +38,24 @@
+--- lucene-8.5.0/highlighter/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/highlighter/build.xml	2020-04-06 11:56:59.725324423 +0200
+@@ -43,6 +43,24 @@
  
    <target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" />
  
@@ -458,8 +432,8 @@
    <target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate"
            unless="javadocs-uptodate-${name}">
      <invoke-module-javadoc>
---- lucene-7.1.0/join/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/join/build.xml	2020-03-23 10:54:26.917390572 +0100
+--- lucene-8.5.0/join/build.xml	2020-03-13 10:35:55.000000000 +0100
++++ lucene-8.5.0/join/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -24,4 +24,22 @@
  
    <import file="../module-build.xml"/>
@@ -483,8 +457,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/memory/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/memory/build.xml	2020-03-23 10:54:26.921390594 +0100
+--- lucene-8.5.0/memory/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/memory/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -31,4 +31,23 @@
    </path>
  
@@ -509,8 +483,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/misc/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/misc/build.xml	2020-03-23 10:54:26.921390594 +0100
+--- lucene-8.5.0/misc/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/misc/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -49,4 +49,23 @@
      </cc>
    </target>
@@ -535,12 +509,12 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/queries/build.xml	2020-03-23 12:25:15.588631926 +0100
-+++ lucene-7.1.0/queries/build.xml	2020-03-23 10:54:26.925390615 +0100
-@@ -21,4 +21,23 @@
-   </description>
+--- lucene-8.5.0/queries/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/queries/build.xml	2020-04-06 12:02:54.247242271 +0200
+@@ -28,5 +28,24 @@
+     <path refid="test.base.classpath"/>
+   </path>
  
-   <import file="../module-build.xml"/>
 +
 +  <target name="jar-core" depends="compile-core">
 +    <jarify>
@@ -560,9 +534,10 @@
 +	</jarify>
 +  </target>
 +
+   <target name="compile-core" depends="jar-expressions,common.compile-core" />
  </project>
---- lucene-7.1.0/queryparser/build.xml	2020-03-23 10:54:18.485344987 +0100
-+++ lucene-7.1.0/queryparser/build.xml	2020-03-23 12:30:54.954371601 +0100
+--- lucene-8.5.0/queryparser/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/queryparser/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -175,4 +175,22 @@
  
    <target name="regenerate" depends="javacc"/>
@@ -586,8 +561,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/replicator/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/replicator/build.xml	2020-03-23 10:54:26.937390680 +0100
+--- lucene-8.5.0/replicator/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/replicator/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -50,4 +50,22 @@
      </invoke-module-javadoc>
    </target>
@@ -611,8 +586,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/sandbox/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/sandbox/build.xml	2020-03-23 10:54:26.937390680 +0100
+--- lucene-8.5.0/sandbox/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/sandbox/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -23,4 +23,22 @@
  
    <import file="../module-build.xml"/>
@@ -636,33 +611,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/spatial/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/spatial/build.xml	2020-03-23 10:54:26.941390702 +0100
-@@ -24,4 +24,22 @@
- 
-   <import file="../module-build.xml"/>
- 
-+  <target name="jar-core" depends="compile-core">
-+    <jarify>
-+	  <jarify-additional-manifest-attributes>
-+		<attribute name="Bundle-Description" value="Geospatial Indexing and Query for Apache Lucene"/>
-+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
-+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+		<attribute name="Bundle-ManifestVersion" value="2"/>
-+		<attribute name="Bundle-Name" value="Lucene Spatial"/>
-+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
-+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
-+		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.spatial.util;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.geo,org.apache.lucene.util"/>
-+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
-+	  </jarify-additional-manifest-attributes>
-+	</jarify>
-+  </target>
-+
- </project>
---- lucene-7.1.0/spatial3d/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/spatial3d/build.xml	2020-03-23 10:54:26.949390745 +0100
+--- lucene-8.5.0/spatial3d/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/spatial3d/build.xml	2020-04-06 11:56:59.725324423 +0200
 @@ -27,4 +27,23 @@
    <path id="classpath">
      <path refid="base.classpath"/>
@@ -687,8 +637,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/spatial-extras/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/spatial-extras/build.xml	2020-03-23 10:54:26.941390702 +0100
+--- lucene-8.5.0/spatial-extras/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/spatial-extras/build.xml	2020-04-06 11:56:59.729324445 +0200
 @@ -59,4 +59,23 @@
        </links>
      </invoke-module-javadoc>
@@ -713,8 +663,8 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/suggest/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/suggest/build.xml	2020-03-23 10:54:26.953390767 +0100
+--- lucene-8.5.0/suggest/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/suggest/build.xml	2020-04-06 11:56:59.729324445 +0200
 @@ -44,4 +44,22 @@
  
    <target name="compile-core" depends="jar-expressions, jar-analyzers-common, common.compile-core" />
@@ -738,9 +688,9 @@
 +  </target>
 +
  </project>
---- lucene-7.1.0/test-framework/build.xml	2020-03-23 12:25:15.592631947 +0100
-+++ lucene-7.1.0/test-framework/build.xml	2020-03-23 10:54:26.957390788 +0100
-@@ -80,4 +80,23 @@
+--- lucene-8.5.0/test-framework/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/test-framework/build.xml	2020-04-06 11:56:59.729324445 +0200
+@@ -79,4 +79,23 @@
                title="Lucene Search Engine: Test Framework" />
      </sequential>
    </target>
diff --git a/lucene-queries-7.1.0.pom b/lucene-queries-8.5.0.pom
similarity index 80%
rename from lucene-queries-7.1.0.pom
rename to lucene-queries-8.5.0.pom
index 467559e..a3e6c52 100644
--- a/lucene-queries-7.1.0.pom
+++ b/lucene-queries-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
@@ -58,7 +58,26 @@
       <artifactId>lucene-codecs</artifactId>
       <scope>test</scope>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-expressions</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>${module-path}/src/java</sourceDirectory>
diff --git a/lucene-queryparser-7.1.0.pom b/lucene-queryparser-8.5.0.pom
similarity index 97%
rename from lucene-queryparser-7.1.0.pom
rename to lucene-queryparser-8.5.0.pom
index 9c8b810..a37ab3c 100644
--- a/lucene-queryparser-7.1.0.pom
+++ b/lucene-queryparser-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-sandbox-7.1.0.pom b/lucene-sandbox-8.5.0.pom
similarity index 97%
rename from lucene-sandbox-7.1.0.pom
rename to lucene-sandbox-8.5.0.pom
index f1a3538..1adf36c 100644
--- a/lucene-sandbox-7.1.0.pom
+++ b/lucene-sandbox-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene-spatial-7.1.0.pom b/lucene-spatial-7.1.0.pom
deleted file mode 100644
index 910a8e1..0000000
--- a/lucene-spatial-7.1.0.pom
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.lucene</groupId>
-    <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <groupId>org.apache.lucene</groupId>
-  <artifactId>lucene-spatial</artifactId>
-  <packaging>jar</packaging>
-  <name>Lucene Spatial</name>
-  <description>    
-    Geospatial Indexing and Query for Apache Lucene
-  </description>
-  <properties>
-    <module-directory>lucene/spatial</module-directory>
-    <relative-top-level>../../..</relative-top-level>
-    <module-path>${relative-top-level}/${module-directory}</module-path>
-  </properties>
-  <dependencies>
-    <dependency> 
-      <!-- lucene-test-framework dependency must be declared before lucene-core -->
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-test-framework</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-codecs</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-  <build>
-    <sourceDirectory>${module-path}/src/java</sourceDirectory>
-    <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>${module-path}/src/test-files</directory>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/lucene-spatial3d-7.1.0.pom b/lucene-spatial3d-8.5.0.pom
similarity index 97%
rename from lucene-spatial3d-7.1.0.pom
rename to lucene-spatial3d-8.5.0.pom
index 9212f70..52c4293 100644
--- a/lucene-spatial3d-7.1.0.pom
+++ b/lucene-spatial3d-8.5.0.pom
@@ -18,12 +18,12 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>7.1.0</version>
+    <version>8.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
diff --git a/lucene.spec b/lucene.spec
index 33b579b..0d8b7c2 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -17,35 +17,35 @@
 
 
 Name:           lucene
-Version:        7.1.0
+Version:        8.5.0
 Release:        0
 Summary:        Text search engine
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://lucene.apache.org/
-Source0:        http://archive.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz
-Source1:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/%{version}/lucene-queryparser-%{version}.pom
-Source2:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom
-Source3:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom
-Source4:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom
-Source5:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/%{version}/lucene-facet-%{version}.pom
-Source6:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom
-Source7:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs/%{version}/lucene-backward-codecs-%{version}.pom
-Source8:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping/%{version}/lucene-grouping-%{version}.pom
-Source9:        http://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom
-Source10:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom
-Source11:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom
-Source12:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom
-Source13:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom
-Source14:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial/%{version}/lucene-spatial-%{version}.pom
-Source15:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/%{version}/lucene-analyzers-common-%{version}.pom
-Source16:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom
-Source17:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom
-Source18:       http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/%{version}/lucene-core-%{version}.pom
+URL:            https://lucene.apache.org/
+Source0:        https://archive.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz
+Source1:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/%{version}/lucene-queryparser-%{version}.pom
+Source2:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom
+Source3:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom
+Source4:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom
+Source6:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom
+Source7:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs/%{version}/lucene-backward-codecs-%{version}.pom
+Source8:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping/%{version}/lucene-grouping-%{version}.pom
+Source9:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom
+Source10:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom
+Source11:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom
+Source12:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom
+Source13:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom
+Source14:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-monitor/%{version}/lucene-monitor-%{version}.pom
+Source15:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/%{version}/lucene-analyzers-common-%{version}.pom
+Source16:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom
+Source17:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom
+Source18:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/%{version}/lucene-core-%{version}.pom
 Patch0:         0001-Disable-ivy-settings.patch
 Patch1:         0002-Dependency-generation.patch
 Patch2:         lucene-java8compat.patch
 Patch3:         lucene-osgi-manifests.patch
+Patch4:         lucene-missing-dependencies.patch
 BuildRequires:  ant >= 1.6
 BuildRequires:  ant-junit >= 1.6
 BuildRequires:  antlr-java
@@ -76,6 +76,8 @@ Summary:        Text search engine
 Group:          Development/Libraries/Java
 Provides:       %{name} = %{version}-%{release}
 Obsoletes:      %{name} < %{version}-%{release}
+Obsoletes:      %{name}-facet < %{version}-%{release}
+Obsoletes:      %{name}-spatial < %{version}-%{release}
 BuildArch:      noarch
 
 %description core
@@ -129,6 +131,7 @@ This package provides the "queries" module for lucene.
 %package classification
 Summary:        Classification module for lucene
 Group:          Development/Libraries/Java
+Requires:       mvn(org.apache.lucene:lucene-analyzers-common)
 Requires:       mvn(org.apache.lucene:lucene-core)
 Requires:       mvn(org.apache.lucene:lucene-grouping)
 Requires:       mvn(org.apache.lucene:lucene-queries)
@@ -140,19 +143,6 @@ This package provides the "classification" module for Lucene.
 
 %files classification -f .mfiles-classification
 
-%package facet
-Summary:        Facet module for lucene
-Group:          Development/Libraries/Java
-Requires:       mvn(org.apache.lucene:lucene-core)
-Requires:       mvn(org.apache.lucene:lucene-queries)
-BuildArch:      noarch
-
-%description facet
-Apache Lucene is a full-text search engine written entirely in Java.
-This package provides the "facet" module for Lucene.
-
-%files facet -f .mfiles-facet
-
 %package codecs
 Summary:        Codecs module for lucene
 Group:          Development/Libraries/Java
@@ -193,11 +183,9 @@ This package provides the "grouping" module for Lucene.
 %package highlighter
 Summary:        Highlighter module for lucene
 Group:          Development/Libraries/Java
-Requires:       mvn(org.apache.lucene:lucene-analyzers-common)
 Requires:       mvn(org.apache.lucene:lucene-core)
 Requires:       mvn(org.apache.lucene:lucene-join)
 Requires:       mvn(org.apache.lucene:lucene-memory)
-Requires:       mvn(org.apache.lucene:lucene-queries)
 BuildArch:      noarch
 
 %description highlighter
@@ -253,17 +241,20 @@ This package provides the "spatial3d" module for Lucene.
 
 %files spatial3d -f .mfiles-spatial3d
 
-%package spatial
+%package monitor
 Summary:        Spatial module for lucene
 Group:          Development/Libraries/Java
+Requires:       mvn(org.apache.lucene:lucene-analyzers-common)
 Requires:       mvn(org.apache.lucene:lucene-core)
+Requires:       mvn(org.apache.lucene:lucene-memory)
+Requires:       mvn(org.apache.lucene:lucene-queryparser)
 BuildArch:      noarch
 
-%description spatial
+%description monitor
 Apache Lucene is a full-text search engine written entirely in Java.
-This package provides the "spatial" module for Lucene.
+This package provides the "monitor" module for Lucene.
 
-%files spatial -f .mfiles-spatial
+%files monitor -f .mfiles-monitor
 
 %package analyzers-common
 Summary:        Analyzers-common module for lucene
@@ -306,6 +297,18 @@ This package provides the "analyzers-stempel" module for Lucene.
 %files analyzers-stempel -f .mfiles-analyzers-stempel
 
 %if 0
+%package facet
+Summary:        Facet module for lucene
+Group:          Development/Libraries/Java
+Requires:       mvn(org.apache.lucene:lucene-core)
+Requires:       mvn(org.apache.lucene:lucene-queries)
+BuildArch:      noarch
+
+%description facet
+Apache Lucene is a full-text search engine written entirely in Java.
+This package provides the "facet" module for Lucene.
+
+%files facet -f .mfiles-facet
 
 %package analyzers-icu
 Summary:        Lucene ICU Analysis Components
@@ -416,7 +419,7 @@ Requires:       mvn(org.apache.lucene:lucene-queries)
 Requires:       mvn(org.apache.lucene:lucene-queryparser)
 BuildArch:      noarch
 
-%description 
+%description
 Demo for Apache Lucene Java.
 
 %files demo -f .mfiles-demo
@@ -506,11 +509,12 @@ Apache Lucene Java Test Framework.
 %patch1 -p2
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export CLASSPATH=$(build-classpath commons-digester jtidy junit regexp)
 export OPT_JAR_LIST=:
-%ant \
+%{ant} \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
   -Djavacc.jar.dir=%{_javadir} \
@@ -518,12 +522,13 @@ export OPT_JAR_LIST=:
   -Dversion=%{version} \
   -Divy.mode=local -Divy.available=true
 
-# DOESN'T BUILD BECAUSE OF MISSING DEPS: replicator expressions spatial-extras analyzers-kuromoji analyzers-morfologik analyzers-phonetic
-export modules="queryparser join queries classification facet codecs backward-codecs grouping highlighter memory misc sandbox spatial3d spatial"
+# DOESN'T BUILD BECAUSE OF MISSING DEPS: replicator expressions facet spatial-extras analyzers-kuromoji analyzers-morfologik analyzers-phonetic
+export modules="queryparser join queries classification codecs backward-codecs grouping highlighter memory misc sandbox spatial3d monitor"
 
 for mod in $modules
 do
-  %ant -f module-build.xml \
+  echo "BUILDING MODULE ${mod}"
+  %{ant} -f module-build.xml \
     -Djavacc.home=%{_bindir}/javacc \
     -Djavacc.jar=%{_javadir}/javacc.jar \
     -Djavacc.jar.dir=%{_javadir} \
@@ -535,7 +540,7 @@ done
 
 export modanalyzers="common smartcn stempel"
 pushd analysis
-%ant \
+%{ant} \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
   -Djavacc.jar.dir=%{_javadir} \
@@ -551,7 +556,7 @@ install -d -m 0755 %{buildroot}%{_jnidir}/%{name}
 # maven pom dir
 install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name}
 
-export noarch_modules="core queryparser join queries classification facet codecs backward-codecs grouping highlighter memory sandbox spatial3d spatial"
+export noarch_modules="core queryparser join queries classification codecs backward-codecs grouping highlighter memory sandbox spatial3d monitor"
 for mod in $noarch_modules
 do
   install -p -m 0644 build/${mod}/%{name}-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-$mod.jar

From b4e5a6f4b2e1b40a6acecc56450104e99962a71ff191970714253979ef8c1ea5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 6 Apr 2020 13:23:43 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/lucene?expand=0&rev=60

---
 0001-Disable-ivy-settings.patch  |   2 +-
 0002-Dependency-generation.patch |   4 +-
 lucene-osgi-manifests.patch      | 122 +++++++++++++++++++------------
 3 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/0001-Disable-ivy-settings.patch b/0001-Disable-ivy-settings.patch
index 6f3dd1d..ab7e991 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
-@@ -438,7 +438,6 @@
+@@ -442,7 +442,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 4bb9e2e..44167b6 100644
--- a/0002-Dependency-generation.patch
+++ b/0002-Dependency-generation.patch
@@ -12,7 +12,7 @@ diff --git a/lucene/build.xml b/lucene/build.xml
 index e3cf905..facc19b 100644
 --- a/lucene/build.xml
 +++ b/lucene/build.xml
-@@ -427,12 +427,8 @@
+@@ -426,12 +426,8 @@
      </sequential>
    </target>
  
@@ -30,7 +30,7 @@ diff --git a/lucene/common-build.xml b/lucene/common-build.xml
 index 41da3f2..d2f9d16 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -1876,7 +1876,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
+@@ -1879,7 +1879,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"/>
      <get-maven-dependencies-macro
diff --git a/lucene-osgi-manifests.patch b/lucene-osgi-manifests.patch
index 1c583dd..7e3c157 100644
--- a/lucene-osgi-manifests.patch
+++ b/lucene-osgi-manifests.patch
@@ -1,5 +1,5 @@
 --- lucene-8.5.0/analysis/common/build.xml	2020-03-13 10:35:54.000000000 +0100
-+++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 13:49:27.925822466 +0200
 @@ -133,4 +133,24 @@
        </replaceregexp>
        <fixcrlf srcdir="${snowball.programs.dir}" includes="*Stemmer.java" tab="remove" tablength="2" encoding="UTF-8" javafiles="yes" fixlast="yes"/>
@@ -26,7 +26,7 @@
 +
  </project>
 --- lucene-8.5.0/analysis/icu/build.xml	2020-03-13 10:35:54.000000000 +0100
-+++ lucene-8.5.0/analysis/icu/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/icu/build.xml	2020-04-06 14:08:25.408018346 +0200
 @@ -115,4 +115,22 @@
  
    <target name="regenerate" depends="gen-utr30-data-files,gennorm2,genrbbi"/>
@@ -51,7 +51,7 @@
 +
  </project>
 --- lucene-8.5.0/analysis/kuromoji/build.xml	2020-03-13 10:35:54.000000000 +0100
-+++ lucene-8.5.0/analysis/kuromoji/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/kuromoji/build.xml	2020-04-06 14:08:10.203935294 +0200
 @@ -95,4 +95,22 @@
  
    <target name="regenerate" depends="build-dict"/>
@@ -76,7 +76,7 @@
 +
  </project>
 --- lucene-8.5.0/analysis/morfologik/build.xml	2020-03-13 10:35:54.000000000 +0100
-+++ lucene-8.5.0/analysis/morfologik/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/morfologik/build.xml	2020-04-06 13:49:27.925822466 +0200
 @@ -37,4 +37,23 @@
    </path>
  
@@ -102,7 +102,7 @@
 +
  </project>
 --- lucene-8.5.0/analysis/phonetic/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/analysis/phonetic/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/phonetic/build.xml	2020-04-06 14:07:46.463805601 +0200
 @@ -32,4 +32,23 @@
    </path>
  
@@ -128,7 +128,7 @@
 +
  </project>
 --- lucene-8.5.0/analysis/smartcn/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/analysis/smartcn/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/smartcn/build.xml	2020-04-06 14:09:53.164497775 +0200
 @@ -31,4 +31,23 @@
    </path>
  
@@ -154,7 +154,7 @@
 +
  </project>
 --- lucene-8.5.0/analysis/stempel/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/analysis/stempel/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/analysis/stempel/build.xml	2020-04-06 14:11:27.469012914 +0200
 @@ -30,5 +30,23 @@
      <path refid="base.classpath"/>
    </path>
@@ -180,7 +180,7 @@
    <target name="compile-core" depends="jar-analyzers-common, common.compile-core"/>
  </project>
 --- lucene-8.5.0/backward-codecs/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/backward-codecs/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/backward-codecs/build.xml	2020-04-06 14:13:37.197721634 +0200
 @@ -23,4 +23,22 @@
  
    <import file="../module-build.xml"/>
@@ -196,8 +196,8 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene50;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene53;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene54;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene60;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene62;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.codecs,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene53,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.perfield,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.packed"/>
++		<attribute name="Export-Package" value="org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene50;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene70;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene80;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.perfield,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.packed"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -205,7 +205,7 @@
 +
  </project>
 --- lucene-8.5.0/benchmark/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/benchmark/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/benchmark/build.xml	2020-04-06 14:15:06.342210360 +0200
 @@ -286,4 +286,24 @@
          <fileset dir="conf"/>
        </copy>
@@ -223,7 +223,7 @@
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
 +		<attribute name="Export-Package" value="org.apache.lucene.benchmark;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.feeds;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.programmatic;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.stats;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.tasks;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.utils;version=&quot;${version}&quot;,org.apache.lucene.benchmark.quality;version=&quot;${version}&quot;,org.apache.lucene.benchmark.quality.trec;version=&quot;${version}&quot;,org.apache.lucene.benchmark.quality.utils;version=&quot;${version}&quot;,org.apache.lucene.benchmark.utils;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="com.ibm.icu.text,org.apache.commons.compress.compressors,org.apache.lucene.analysis,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.benchmark.byTask,org.apache.lucene.benchmark.byTask.feeds,org.apache.lucene.benchmark.byTask.stats,org.apache.lucene.benchmark.byTask.tasks,org.apache.lucene.benchmark.byTask.utils,org.apache.lucene.benchmark.quality,org.apache.lucene.benchmark.quality.utils,org.apache.lucene.codecs,org.apache.lucene.codecs.lucene70,org.apache.lucene.document,org.apache.lucene.facet,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.queryparser.classic,org.apache.lucene.search,org.apache.lucene.search.highlight,org.apache.lucene.search.spans,org.apache.lucene.search.uhighlight,org.apache.lucene.search.vectorhighlight,org.apache.lucene.spatial,org.apache.lucene.spatial.composite,org.apache.lucene.spatial.prefix,org.apache.lucene.spatial.prefix.tree,org.apache.lucene.spatial.query,org.apache.lucene.spatial.serialized,org.apache.lucene.store,org.apache.lucene.util,org.cyberneko.html.parsers,org.locationtech.spatial4j.context;version=&quot;[0.7,1)&quot;,org.locationtech.spatial4j.shape;version=&quot;[0.7,1)&quot;,org.xml.sax;version=&quot;[2.0,3)&quot;,org.xml.sax.helpers;version=&quot;[2.0,3)&quot;"/>
++		<attribute name="Import-Package" value="com.ibm.icu.text,org.apache.commons.compress.compressors,org.apache.lucene.analysis,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.benchmark.byTask,org.apache.lucene.benchmark.byTask.feeds,org.apache.lucene.benchmark.byTask.stats,org.apache.lucene.benchmark.byTask.tasks,org.apache.lucene.benchmark.byTask.utils,org.apache.lucene.benchmark.quality,org.apache.lucene.benchmark.quality.utils,org.apache.lucene.codecs,org.apache.lucene.codecs.lucene70,org.apache.lucene.document,org.apache.lucene.facet,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.queryparser.classic,org.apache.lucene.search,org.apache.lucene.search.highlight,org.apache.lucene.search.spans,org.apache.lucene.search.uhighlight,org.apache.lucene.search.vectorhighlight,org.apache.lucene.spatial,org.apache.lucene.spatial.composite,org.apache.lucene.spatial.prefix,org.apache.lucene.spatial.prefix.tree,org.apache.lucene.spatial.query,org.apache.lucene.spatial.serialized,org.apache.lucene.store,org.apache.lucene.util,org.cyberneko.html.parsers,org.locationtech.spatial4j.context,org.locationtech.spatial4j.shape,org.xml.sax,org.xml.sax.helpers"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -232,7 +232,7 @@
 +
  </project>
 --- lucene-8.5.0/classification/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/classification/build.xml	2020-04-06 11:56:59.721324402 +0200
++++ lucene-8.5.0/classification/build.xml	2020-04-06 14:16:26.110648118 +0200
 @@ -39,7 +39,23 @@
  
    <target name="compile-core" depends="jar-grouping,jar-queries,jar-analyzers-common,common.compile-core" />
@@ -258,8 +258,8 @@
  
    <target name="javadocs" depends="javadocs-grouping,compile-core,check-javadocs-uptodate"
            unless="javadocs-uptodate-${name}">
---- lucene-8.5.0/common-build.xml	2020-04-06 11:43:38.341014387 +0200
-+++ lucene-8.5.0/common-build.xml	2020-04-06 11:56:59.721324402 +0200
+--- lucene-8.5.0/common-build.xml	2020-04-06 13:47:22.637143102 +0200
++++ lucene-8.5.0/common-build.xml	2020-04-06 13:49:27.929822488 +0200
 @@ -192,6 +192,7 @@
    <property name="javac.deprecation" value="off"/>
    <property name="javac.debug" value="on"/>
@@ -278,7 +278,7 @@
                     value="The Apache Software Foundation"/>
          <attribute name="X-Compile-Source-JDK" value="${javac.release}"/>
 --- lucene-8.5.0/core/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/core/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/core/build.xml	2020-04-06 14:20:59.688149345 +0200
 @@ -194,6 +194,24 @@
      </sequential>
    </macrodef>
@@ -294,8 +294,8 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene;version=&quot;${version}&quot;,org.apache.lucene.analysis;version=&quot;${version}&quot;,org.apache.lucene.analysis.standard;version=&quot;${version}&quot;,org.apache.lucene.analysis.tokenattributes;version=&quot;${version}&quot;,org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.blocktree;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene50;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene60;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene62;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene70;version=&quot;${version}&quot;,org.apache.lucene.codecs.perfield;version=&quot;${version}&quot;,org.apache.lucene.document;version=&quot;${version}&quot;,org.apache.lucene.geo;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;,org.apache.lucene.search.similarities;version=&quot;${version}&quot;,org.apache.lucene.search.spans;version=&quot;${version}&quot;,org.apache.lucene.store;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;,org.apache.lucene.util.automaton;version=&quot;${version}&quot;,org.apache.lucene.util.bkd;version=&quot;${version}&quot;,org.apache.lucene.util.fst;version=&quot;${version}&quot;,org.apache.lucene.util.graph;version=&quot;${version}&quot;,org.apache.lucene.util.mutable;version=&quot;${version}&quot;,org.apache.lucene.util.packed;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.standard,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.compressing,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.perfield,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.graph,org.apache.lucene.util.packed"/>
++		<attribute name="Export-Package" value="org.apache.lucene;version=&quot;${version}&quot;,org.apache.lucene.analysis;version=&quot;${version}&quot;,org.apache.lucene.analysis.standard;version=&quot;${version}&quot;,org.apache.lucene.analysis.tokenattributes;version=&quot;${version}&quot;,org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.blocktree;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene50;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene60;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene70;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene80;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene84;version=&quot;${version}&quot;,org.apache.lucene.codecs.perfield;version=&quot;${version}&quot;,org.apache.lucene.document;version=&quot;${version}&quot;,org.apache.lucene.geo;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;,org.apache.lucene.search.similarities;version=&quot;${version}&quot;,org.apache.lucene.search.spans;version=&quot;${version}&quot;,org.apache.lucene.store;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;,org.apache.lucene.util.automaton;version=&quot;${version}&quot;,org.apache.lucene.util.bkd;version=&quot;${version}&quot;,org.apache.lucene.util.compress;version=&quot;${version}&quot;,org.apache.lucene.util.fst;version=&quot;${version}&quot;,org.apache.lucene.util.graph;version=&quot;${version}&quot;,org.apache.lucene.util.mutable;version=&quot;${version}&quot;,org.apache.lucene.util.packed;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.standard,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.compressing,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.lucene80,org.apache.lucene.codecs.perfield,org.apache.lucene.document,org.apache.lucene.geo,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.compress,org.apache.lucene.util.fst,org.apache.lucene.util.graph,org.apache.lucene.util.packed"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -305,7 +305,7 @@
      <or>
        <!-- We ignore our ant-based lock factory test, if user applies test filtering: -->
 --- lucene-8.5.0/demo/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/demo/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/demo/build.xml	2020-04-06 14:24:28.413294729 +0200
 @@ -58,4 +58,22 @@
  
    <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,jar-expressions,common.compile-core" />
@@ -321,8 +321,8 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.demo;version=&quot;${version}&quot;,org.apache.lucene.demo.facet;version=&quot;${version}&quot;,org.apache.lucene.demo.xmlparser;version=&quot;${version}&quot;,org.apache.lucene.demo.xmlparser.META-INF;version=&quot;${version}&quot;,org.apache.lucene.demo.xmlparser.WEB-INF;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="javax.servlet,javax.servlet.http,org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.document,org.apache.lucene.expressions,org.apache.lucene.expressions.js,org.apache.lucene.facet,org.apache.lucene.facet.range,org.apache.lucene.facet.sortedset,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.index,org.apache.lucene.queryparser.classic,org.apache.lucene.queryparser.xml,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util,org.w3c.dom"/>
++		<attribute name="Export-Package" value="org.apache.lucene.demo;version=&quot;${version}&quot;,org.apache.lucene.demo.facet;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.document,org.apache.lucene.expressions,org.apache.lucene.expressions.js,org.apache.lucene.facet,org.apache.lucene.facet.range,org.apache.lucene.facet.sortedset,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.index,org.apache.lucene.queryparser.classic,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -330,7 +330,7 @@
 +
  </project>
 --- lucene-8.5.0/expressions/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/expressions/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/expressions/build.xml	2020-04-06 14:51:26.410310254 +0200
 @@ -117,4 +117,23 @@
        </fixcrlf>
      </sequential>
@@ -356,7 +356,7 @@
 +
  </project>
 --- lucene-8.5.0/facet/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/facet/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/facet/build.xml	2020-04-06 14:53:39.235034473 +0200
 @@ -44,4 +44,22 @@
      </java>
    </target>
@@ -372,8 +372,8 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.facet;version=&quot;${version}&quot;,org.apache.lucene.facet.range;version=&quot;${version}&quot;,org.apache.lucene.facet.sortedset;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy.directory;version=&quot;7.1.0&quot;,org.apache.lucene.facet.taxonomy.writercache;version=&quot;7.1.0&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.facet,org.apache.lucene.facet.sortedset,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.facet.taxonomy.writercache,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util"/>
++		<attribute name="Export-Package" value="org.apache.lucene.facet;version=&quot;${version}&quot;,org.apache.lucene.facet.range;version=&quot;${version}&quot;,org.apache.lucene.facet.sortedset;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy.directory;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy.writercache;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="com.carrotsearch.hppc,com.carrotsearch.hppc.cursors,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.facet,org.apache.lucene.facet.sortedset,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.facet.taxonomy.writercache,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -381,7 +381,7 @@
 +
  </project>
 --- lucene-8.5.0/grouping/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/grouping/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/grouping/build.xml	2020-04-06 14:54:33.987333007 +0200
 @@ -46,4 +46,22 @@
        </invoke-module-javadoc>
      </target>
@@ -406,7 +406,7 @@
 +
  </project>
 --- lucene-8.5.0/highlighter/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/highlighter/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/highlighter/build.xml	2020-04-06 13:49:27.929822488 +0200
 @@ -43,6 +43,24 @@
  
    <target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" />
@@ -433,7 +433,7 @@
            unless="javadocs-uptodate-${name}">
      <invoke-module-javadoc>
 --- lucene-8.5.0/join/build.xml	2020-03-13 10:35:55.000000000 +0100
-+++ lucene-8.5.0/join/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/join/build.xml	2020-04-06 13:49:27.929822488 +0200
 @@ -24,4 +24,22 @@
  
    <import file="../module-build.xml"/>
@@ -458,7 +458,7 @@
 +
  </project>
 --- lucene-8.5.0/memory/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/memory/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/memory/build.xml	2020-04-06 14:58:53.696749034 +0200
 @@ -31,4 +31,23 @@
    </path>
  
@@ -484,7 +484,7 @@
 +
  </project>
 --- lucene-8.5.0/misc/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/misc/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/misc/build.xml	2020-04-06 15:00:13.485184082 +0200
 @@ -49,4 +49,23 @@
      </cc>
    </target>
@@ -500,17 +500,42 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.document;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.index;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.search;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.store;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.util.fst;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.misc;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.codecs,org.apache.lucene.index;misc=split,org.apache.lucene.search;misc=split,org.apache.lucene.search.similarities,org.apache.lucene.store;misc=split,org.apache.lucene.util"/>
++		<attribute name="Export-Package" value="org.apache.lucene.document;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.index;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.search;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.store;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.util.fst;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.misc;version=&quot;${version}&quot;,org.apache.lucene.search.similarity;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.codecs,org.apache.lucene.index;misc=split,org.apache.lucene.misc,org.apache.lucene.search;misc=split,org.apache.lucene.search.similarities,org.apache.lucene.store;misc=split,org.apache.lucene.util"/>
 +		<attribute name="Require-Bundle" value="org.apache.lucene.core;bundle-version=&quot;${version}&quot;"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
 +  </target>
++
+ </project>
+--- lucene-8.5.0/monitor/build.xml	2020-03-13 10:35:56.000000000 +0100
++++ lucene-8.5.0/monitor/build.xml	2020-04-06 15:11:58.105109430 +0200
+@@ -50,4 +50,22 @@
+     </invoke-module-javadoc>
+   </target>
+ 
++  <target name="jar-core" depends="compile-core">
++    <jarify>
++	  <jarify-additional-manifest-attributes>
++		<attribute name="Bundle-Description" value="High-performance single-document index to compare against Query"/>
++		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
++		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
++		<attribute name="Bundle-ManifestVersion" value="2"/>
++		<attribute name="Bundle-Name" value="Lucene Monitor"/>
++		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
++		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
++		<attribute name="Bundle-Version" value="${version}"/>
++		<attribute name="Export-Package" value="org.apache.lucene.monitor;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.index.memory,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.store,org.apache.lucene.util"/>
++		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
++	  </jarify-additional-manifest-attributes>
++	</jarify>
++  </target>
 +
  </project>
 --- lucene-8.5.0/queries/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/queries/build.xml	2020-04-06 12:02:54.247242271 +0200
++++ lucene-8.5.0/queries/build.xml	2020-04-06 15:01:29.277597337 +0200
 @@ -28,5 +28,24 @@
      <path refid="test.base.classpath"/>
    </path>
@@ -527,8 +552,8 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.queries;version=&quot;${version}&quot;,org.apache.lucene.queries.function;version=&quot;${version}&quot;,org.apache.lucene.queries.function.docvalues;version=&quot;${version}&quot;,org.apache.lucene.queries.function.valuesource;version=&quot;${version}&quot;,org.apache.lucene.queries.mlt;version=&quot;${version}&quot;,org.apache.lucene.queries.payloads;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.queries.function.docvalues,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.util,org.apache.lucene.util.mutable"/>
++		<attribute name="Export-Package" value="org.apache.lucene.queries;version=&quot;${version}&quot;,org.apache.lucene.queries.function;version=&quot;${version}&quot;,org.apache.lucene.queries.function.docvalues;version=&quot;${version}&quot;,org.apache.lucene.queries.function.valuesource;version=&quot;${version}&quot;,org.apache.lucene.queries.intervals;version=&quot;${version}&quot;,org.apache.lucene.queries.mlt;version=&quot;${version}&quot;,org.apache.lucene.queries.payloads;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.queries.function.docvalues,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.mutable"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -537,7 +562,7 @@
    <target name="compile-core" depends="jar-expressions,common.compile-core" />
  </project>
 --- lucene-8.5.0/queryparser/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/queryparser/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/queryparser/build.xml	2020-04-06 15:04:20.302529868 +0200
 @@ -175,4 +175,22 @@
  
    <target name="regenerate" depends="javacc"/>
@@ -554,7 +579,7 @@
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
 +		<attribute name="Export-Package" value="org.apache.lucene.queryparser.classic;version=&quot;${version}&quot;,org.apache.lucene.queryparser.complexPhrase;version=&quot;${version}&quot;,org.apache.lucene.queryparser.ext;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.builders;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.config;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.messages;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.nodes;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.parser;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.processors;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.util;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.messages;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.precedence;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.precedence.processors;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.builders;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.config;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.nodes;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.parser;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.processors;version=&quot;${version}&quot;,org.apache.lucene.queryparser.simple;version=&quot;${version}&quot;,org.apache.lucene.queryparser.surround.parser;version=&quot;${version}&quot;,org.apache.lucene.queryparser.surround.query;version=&quot;${version}&quot;,org.apache.lucene.queryparser.xml;version=&quot;${version}&quot;,org.apache.lucene.queryparser.xml.builders;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries,org.apache.lucene.queries.mlt,org.apache.lucene.queries.payloads,org.apache.lucene.queryparser.classic,org.apache.lucene.queryparser.flexible.core,org.apache.lucene.queryparser.flexible.core.builders,org.apache.lucene.queryparser.flexible.core.config,org.apache.lucene.queryparser.flexible.core.messages,org.apache.lucene.queryparser.flexible.core.nodes,org.apache.lucene.queryparser.flexible.core.parser,org.apache.lucene.queryparser.flexible.core.processors,org.apache.lucene.queryparser.flexible.core.util,org.apache.lucene.queryparser.flexible.messages,org.apache.lucene.queryparser.flexible.precedence.processors,org.apache.lucene.queryparser.flexible.standard,org.apache.lucene.queryparser.flexible.standard.builders,org.apache.lucene.queryparser.flexible.standard.config,org.apache.lucene.queryparser.flexible.standard.nodes,org.apache.lucene.queryparser.flexible.standard.parser,org.apache.lucene.queryparser.flexible.standard.processors,org.apache.lucene.queryparser.surround.query,org.apache.lucene.queryparser.xml,org.apache.lucene.queryparser.xml.builders,org.apache.lucene.sandbox.queries,org.apache.lucene.search,org.apache.lucene.search.spans,org.apache.lucene.util,org.w3c.dom,org.xml.sax"/>
++		<attribute name="Import-Package" value="javax.xml.parsers,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries.mlt,org.apache.lucene.queries.payloads,org.apache.lucene.queryparser.classic,org.apache.lucene.queryparser.flexible.core,org.apache.lucene.queryparser.flexible.core.builders,org.apache.lucene.queryparser.flexible.core.config,org.apache.lucene.queryparser.flexible.core.messages,org.apache.lucene.queryparser.flexible.core.nodes,org.apache.lucene.queryparser.flexible.core.parser,org.apache.lucene.queryparser.flexible.core.processors,org.apache.lucene.queryparser.flexible.core.util,org.apache.lucene.queryparser.flexible.messages,org.apache.lucene.queryparser.flexible.precedence.processors,org.apache.lucene.queryparser.flexible.standard,org.apache.lucene.queryparser.flexible.standard.builders,org.apache.lucene.queryparser.flexible.standard.config,org.apache.lucene.queryparser.flexible.standard.nodes,org.apache.lucene.queryparser.flexible.standard.parser,org.apache.lucene.queryparser.flexible.standard.processors,org.apache.lucene.queryparser.surround.query,org.apache.lucene.queryparser.xml,org.apache.lucene.queryparser.xml.builders,org.apache.lucene.sandbox.queries,org.apache.lucene.search,org.apache.lucene.search.spans,org.apache.lucene.util,org.w3c.dom,org.xml.sax"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -562,7 +587,7 @@
 +
  </project>
 --- lucene-8.5.0/replicator/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/replicator/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/replicator/build.xml	2020-04-06 15:06:02.943093612 +0200
 @@ -50,4 +50,22 @@
      </invoke-module-javadoc>
    </target>
@@ -587,7 +612,7 @@
 +
  </project>
 --- lucene-8.5.0/sandbox/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/sandbox/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/sandbox/build.xml	2020-04-06 15:08:48.916035666 +0200
 @@ -23,4 +23,22 @@
  
    <import file="../module-build.xml"/>
@@ -604,7 +629,7 @@
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
 +		<attribute name="Export-Package" value="org.apache.lucene.codecs.idversion;version=&quot;${version}&quot;,org.apache.lucene.document;version=&quot;${version}&quot;,org.apache.lucene.payloads;version=&quot;${version}&quot;,org.apache.lucene.sandbox.queries;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.geo,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.packed"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.geo,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.mutable,org.apache.lucene.util.packed"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -612,7 +637,7 @@
 +
  </project>
 --- lucene-8.5.0/spatial3d/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/spatial3d/build.xml	2020-04-06 11:56:59.725324423 +0200
++++ lucene-8.5.0/spatial3d/build.xml	2020-04-06 15:13:07.429502891 +0200
 @@ -27,4 +27,23 @@
    <path id="classpath">
      <path refid="base.classpath"/>
@@ -638,7 +663,7 @@
 +
  </project>
 --- lucene-8.5.0/spatial-extras/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/spatial-extras/build.xml	2020-04-06 11:56:59.729324445 +0200
++++ lucene-8.5.0/spatial-extras/build.xml	2020-04-06 13:49:27.933822509 +0200
 @@ -59,4 +59,23 @@
        </links>
      </invoke-module-javadoc>
@@ -656,7 +681,7 @@
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
 +		<attribute name="Export-Package" value="org.apache.lucene.spatial;version=&quot;${version}&quot;,org.apache.lucene.spatial.bbox;version=&quot;${version}&quot;,org.apache.lucene.spatial.composite;version=&quot;${version}&quot;,org.apache.lucene.spatial.prefix;version=&quot;${version}&quot;,org.apache.lucene.spatial.prefix.tree;version=&quot;${version}&quot;,org.apache.lucene.spatial.query;version=&quot;${version}&quot;,org.apache.lucene.spatial.serialized;version=&quot;${version}&quot;,org.apache.lucene.spatial.spatial4j;version=&quot;${version}&quot;,org.apache.lucene.spatial.util;version=&quot;${version}&quot;,org.apache.lucene.spatial.vector;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.spatial,org.apache.lucene.spatial.prefix,org.apache.lucene.spatial.prefix.tree,org.apache.lucene.spatial.query,org.apache.lucene.spatial.serialized,org.apache.lucene.spatial.util,org.apache.lucene.spatial3d.geom,org.apache.lucene.util,org.locationtech.spatial4j.context;version=&quot;[0.7,1)&quot;,org.locationtech.spatial4j.distance;version=&quot;[0.7,1)&quot;,org.locationtech.spatial4j.exception;version=&quot;[0.7,1)&quot;,org.locationtech.spatial4j.io;version=&quot;[0.7,1)&quot;,org.locationtech.spatial4j.shape;version=&quot;[0.7,1)&quot;,org.locationtech.spatial4j.shape.impl;version=&quot;[0.7,1)&quot;"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.spatial,org.apache.lucene.spatial.prefix,org.apache.lucene.spatial.prefix.tree,org.apache.lucene.spatial.query,org.apache.lucene.spatial.serialized,org.apache.lucene.spatial.util,org.apache.lucene.spatial3d.geom,org.apache.lucene.util,org.locationtech.spatial4j.context,org.locationtech.spatial4j.distance,org.locationtech.spatial4j.exception,org.locationtech.spatial4j.io,org.locationtech.spatial4j.shape,org.locationtech.spatial4j.shape.impl"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -664,8 +689,8 @@
 +
  </project>
 --- lucene-8.5.0/suggest/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/suggest/build.xml	2020-04-06 11:56:59.729324445 +0200
-@@ -44,4 +44,22 @@
++++ lucene-8.5.0/suggest/build.xml	2020-04-06 15:16:13.382558294 +0200
+@@ -44,4 +44,23 @@
  
    <target name="compile-core" depends="jar-expressions, jar-analyzers-common, common.compile-core" />
  
@@ -682,6 +707,7 @@
 +		<attribute name="Bundle-Version" value="${version}"/>
 +		<attribute name="Export-Package" value="org.apache.lucene.search.spell;version=&quot;${version}&quot;,org.apache.lucene.search.suggest;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.analyzing;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.document;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.fst;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.jaspell;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.tst;version=&quot;${version}&quot;"/>
 +		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.ngram,org.apache.lucene.analysis.shingle,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.codecs,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.spell,org.apache.lucene.search.suggest,org.apache.lucene.search.suggest.analyzing,org.apache.lucene.search.suggest.fst,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.fst"/>
++		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.en,org.apache.lucene.analysis.miscellaneous,org.apache.lucene.analysis.ngram,org.apache.lucene.analysis.shingle,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.codecs,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.spell,org.apache.lucene.search.suggest,org.apache.lucene.search.suggest.analyzing,org.apache.lucene.search.suggest.fst,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.fst"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>
@@ -689,7 +715,7 @@
 +
  </project>
 --- lucene-8.5.0/test-framework/build.xml	2020-03-13 10:35:56.000000000 +0100
-+++ lucene-8.5.0/test-framework/build.xml	2020-04-06 11:56:59.729324445 +0200
++++ lucene-8.5.0/test-framework/build.xml	2020-04-06 15:18:39.975390289 +0200
 @@ -79,4 +79,23 @@
                title="Lucene Search Engine: Test Framework" />
      </sequential>
@@ -706,8 +732,8 @@
 +		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<attribute name="Bundle-Version" value="${version}"/>
-+		<attribute name="Export-Package" value="org.apache.lucene.analysis;version=&quot;${version}&quot;,org.apache.lucene.analysis.standard;version=&quot;${version}&quot;,org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.asserting;version=&quot;${version}&quot;,org.apache.lucene.codecs.blockterms;version=&quot;${version}&quot;,org.apache.lucene.codecs.bloom;version=&quot;${version}&quot;,org.apache.lucene.codecs.cheapbastard;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing.dummy;version=&quot;${version}&quot;,org.apache.lucene.codecs.cranky;version=&quot;${version}&quot;,org.apache.lucene.codecs.mockrandom;version=&quot;${version}&quot;,org.apache.lucene.codecs.ramonly;version=&quot;${version}&quot;,org.apache.lucene.geo;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;,org.apache.lucene.mockfile;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;,org.apache.lucene.search.similarities;version=&quot;${version}&quot;,org.apache.lucene.search.spans;version=&quot;${version}&quot;,org.apache.lucene.store;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;,org.apache.lucene.util.automaton;version=&quot;${version}&quot;,org.apache.lucene.util.fst;version=&quot;${version}&quot;"/>
-+		<attribute name="Import-Package" value="com.carrotsearch.randomizedtesting,com.carrotsearch.randomizedtesting.annotations,com.carrotsearch.randomizedtesting.generators,com.carrotsearch.randomizedtesting.rules,junit.framework;version=&quot;[4.12,5)&quot;,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.asserting,org.apache.lucene.codecs.blockterms,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.blocktreeords,org.apache.lucene.codecs.bloom,org.apache.lucene.codecs.cheapbastard,org.apache.lucene.codecs.compressing,org.apache.lucene.codecs.compressing.dummy,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.memory,org.apache.lucene.codecs.mockrandom,org.apache.lucene.codecs.perfield,org.apache.lucene.codecs.simpletext,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.mockfile,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.packed,org.junit;version=&quot;[4.12,5)&quot;,org.junit.internal;version=&quot;[4.12,5)&quot;,org.junit.rules;version=&quot;[4.12,5)&quot;,org.junit.runner;version=&quot;[4.12,5)&quot;,org.junit.runner.notification;version=&quot;[4.12,5)&quot;,org.junit.runners.model;version=&quot;[4.12,5)&quot;"/>
++		<attribute name="Export-Package" value="org.apache.lucene.analysis;version=&quot;${version}&quot;,org.apache.lucene.analysis.standard;version=&quot;${version}&quot;,org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.asserting;version=&quot;${version}&quot;,org.apache.lucene.codecs.blockterms;version=&quot;${version}&quot;,org.apache.lucene.codecs.bloom;version=&quot;${version}&quot;,org.apache.lucene.codecs.cheapbastard;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing.dummy;version=&quot;${version}&quot;,org.apache.lucene.codecs.cranky;version=&quot;${version}&quot;,org.apache.lucene.codecs.mockrandom;version=&quot;${version}&quot;,org.apache.lucene.codecs.ramonly;version=&quot;${version}&quot;,org.apache.lucene.codecs.uniformsplit;version=&quot;${version}&quot;,org.apache.lucene.codecs.uniformsplit.sharedterms;version=&quot;${version}&quot;,org.apache.lucene.geo;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;,org.apache.lucene.mockfile;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;,org.apache.lucene.search.similarities;version=&quot;${version}&quot;,org.apache.lucene.search.spans;version=&quot;${version}&quot;,org.apache.lucene.store;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;,org.apache.lucene.util.automaton;version=&quot;${version}&quot;,org.apache.lucene.util.fst;version=&quot;${version}&quot;"/>
++		<attribute name="Import-Package" value="com.carrotsearch.randomizedtesting,com.carrotsearch.randomizedtesting.annotations,com.carrotsearch.randomizedtesting.generators,com.carrotsearch.randomizedtesting.rules,junit.framework,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.asserting,org.apache.lucene.codecs.blockterms,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.blocktreeords,org.apache.lucene.codecs.bloom,org.apache.lucene.codecs.cheapbastard,org.apache.lucene.codecs.compressing,org.apache.lucene.codecs.compressing.dummy,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.memory,org.apache.lucene.codecs.mockrandom,org.apache.lucene.codecs.perfield,org.apache.lucene.codecs.simpletext,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.mockfile,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.packed,org.junit,org.junit.internal,org.junit.rules,org.junit.runner,org.junit.runner.notification,org.junit.runners.model"/>
 +		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
 +	  </jarify-additional-manifest-attributes>
 +	</jarify>

From 2bd8f8043ae2661ba4be3e60d50feeaec9da04dfabc02d835ce39cf7a7f1d92f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 9 Apr 2020 09:24:47 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/lucene?expand=0&rev=61

---
 lucene.changes | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lucene.changes b/lucene.changes
index cbb709f..603cfb9 100644
--- a/lucene.changes
+++ b/lucene.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Apr  9 09:20:58 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 8.5.0
+- Modified patches:
+  * 0001-Disable-ivy-settings.patch
+  * 0002-Dependency-generation.patch
+  * lucene-java8compat.patch
+  * lucene-osgi-manifests.patch
+    + rediff to changed context
+- Added patch:
+  * lucene-missing-dependencies.patch
+    + patch out dependencies that are not needed for modules
+      that we distribute
+    + patch out dependencies on jars that we don't build
+    + add target for the new monitor jars
+
 -------------------------------------------------------------------
 Mon Mar 23 11:35:30 UTC 2020 - Fridrich Strba <fstrba@suse.com>