Accepting request 1219022 from Java:packages

facet and expressions enabled

OBS-URL: https://build.opensuse.org/request/show/1219022
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lucene?expand=0&rev=37

lucene-8.11.2-src.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0c5e32a827a3c877edbaadf14c6f0c8d1c716f653aaf5bf792bd9c929521fcb
-size 50619104

lucene-8.11.4-src.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15e880c2353c8a24179c9b6730d66d668ca2996ef6b536dc4287ceec4fa7f105
+size 51177797

lucene-analyzers-common-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-analyzers-icu-8.11.4.pom

@@ -0,0 +1,59 @@
+<!--
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>8.11.4</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-analyzers-icu</artifactId>
+  <packaging>jar</packaging>
+  <name>Lucene ICU Analysis Components</name>
+  <description>    
+    Provides integration with ICU (International Components for Unicode) for
+    stronger Unicode and internationalization support.
+  </description>
+  <properties>
+    <module-directory>lucene/analysis/icu</module-directory>
+  </properties>
+  <scm>
+    <connection>scm:git:${vc-anonymous-base-url}</connection>
+    <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
+    <url>${vc-browse-base-url};f=${module-directory}</url>
+  </scm>
+  <dependencies>
+    <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>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
+    </dependency>
+  </dependencies>
+</project>

lucene-analyzers-phonetic-8.11.4.pom

@@ -0,0 +1,58 @@
+<!--
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>8.11.4</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-analyzers-phonetic</artifactId>
+  <packaging>jar</packaging>
+  <name>Lucene Phonetic Filters</name>
+  <description>
+    Provides phonetic encoding via Commons Codec.
+  </description>
+  <properties>
+    <module-directory>lucene/analysis/phonetic</module-directory>
+  </properties>
+  <scm>
+    <connection>scm:git:${vc-anonymous-base-url}</connection>
+    <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
+    <url>${vc-browse-base-url};f=${module-directory}</url>
+  </scm>
+  <dependencies>
+    <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>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+  </dependencies>
+</project>

lucene-analyzers-smartcn-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-analyzers-stempel-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-backward-codecs-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-classification-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-codecs-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-core-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-expressions-8.11.4.pom

@@ -0,0 +1,57 @@
+<!--
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>8.11.4</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-expressions</artifactId>
+  <packaging>jar</packaging>
+  <name>Lucene Expressions</name>
+  <description>    
+     Dynamically computed values to sort/facet/search on based on a pluggable grammar.
+  </description>
+  <properties>
+    <module-directory>lucene/expressions</module-directory>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+    </dependency>
+  </dependencies>
+</project>

lucene-facet-8.11.4.pom

@@ -0,0 +1,54 @@
+<!--
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>8.11.4</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-facet</artifactId>
+  <packaging>jar</packaging>
+  <name>Lucene Facets</name>
+  <description>
+    Package for Faceted Indexing and Search
+  </description>
+  <properties>
+    <module-directory>lucene/facet</module-directory>
+  </properties>
+  <scm>
+    <connection>scm:git:${vc-anonymous-base-url}</connection>
+    <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
+    <url>${vc-browse-base-url};f=${module-directory}</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.carrotsearch</groupId>
+      <artifactId>hppc</artifactId>
+    </dependency>
+  </dependencies>
+</project>

lucene-grouping-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-highlighter-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-join-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-memory-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-misc-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-missing-dependencies.patch

@@ -1,5 +1,6 @@
---- lucene-8.5.0/analysis/common/build.xml	2020-04-06 12:09:05.493250593 +0200
+diff -urEbwB lucene-8.11.2.orig/analysis/common/build.xml lucene-8.11.2/analysis/common/build.xml
-+++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 12:22:01.033446015 +0200
+--- lucene-8.11.2.orig/analysis/common/build.xml	2024-10-28 00:12:09.624346447 +0100
++++ lucene-8.11.2/analysis/common/build.xml	2024-10-28 00:55:30.105955823 +0100
 @@ -88,7 +88,7 @@
      <property name="icu4j.resolved" value="true"/>
    </target>
@@ -9,8 +10,9 @@
      <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
+diff -urEbwB lucene-8.11.2.orig/build.xml lucene-8.11.2/build.xml
-+++ lucene-8.5.0/build.xml	2020-04-06 12:21:53.785406802 +0200
+--- lucene-8.11.2.orig/build.xml	2024-10-28 00:12:09.674346796 +0100
++++ lucene-8.11.2/build.xml	2024-10-28 00:55:30.105955823 +0100
 @@ -538,7 +538,7 @@
    </target>
  
@@ -20,9 +22,23 @@
      <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
+diff -urEbwB lucene-8.11.2.orig/common-build.xml lucene-8.11.2/common-build.xml
-+++ lucene-8.5.0/common-build.xml	2020-04-06 12:20:32.720968275 +0200
+--- lucene-8.11.2.orig/common-build.xml	2024-10-28 00:12:09.674346796 +0100
-@@ -625,12 +625,10 @@
++++ lucene-8.11.2/common-build.xml	2024-10-28 00:55:30.109289178 +0100
+@@ -67,12 +67,6 @@
+     </condition>
+   </fail>
+   
+-  <fail message="Your ~/.ant/lib folder or the main classpath of Ant contains some version of ASM. Please remove it, otherwise this build can't run correctly.">
+-    <condition>
+-      <available classname="org.objectweb.asm.ClassReader"/>
+-    </condition>
+-  </fail>
+-
+   <property name="year" value="2000-${current.year}"/>
+   
+   <!-- Lucene modules unfortunately don't have the "lucene-" prefix, so we add it if no prefix is given in $name: -->
+@@ -627,12 +621,10 @@
      </jarify>
    </target>
    
@@ -36,7 +52,7 @@
    <!-- Packaging targets: -->
    
    <property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/>
-@@ -1534,8 +1498,8 @@
+@@ -1555,8 +1547,8 @@
      </taskdef>
    </target>
  
@@ -47,7 +63,7 @@
  
    <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 @@
+@@ -1616,7 +1608,7 @@
    </target>
  
    <!-- Beast the actual tests (must be wrapped with -init-totals, -check-totals) -->
@@ -56,7 +72,7 @@
      <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 @@
+@@ -1627,7 +1619,7 @@
      <fail message="Fail baby fail" if="groovy.error"/>
    </target>
  
@@ -65,7 +81,7 @@
      <!-- 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 @@
+@@ -1651,7 +1643,7 @@
    </target>
  
    <!-- The groovy dependency is wanted: this is done early before any test or any other submodule is ran, to prevent permgen errors! -->
@@ -74,7 +90,7 @@
      <mkdir dir="${build.dir}" />
      <tempfile property="tests.totals.tmpfile"
                destdir="${build.dir}"
-@@ -2505,7 +2459,7 @@
+@@ -2475,7 +2467,7 @@
      </forbidden-apis>
    </target>
  
@@ -83,8 +99,9 @@
      <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/demo/build.xml	2020-04-06 12:09:05.497250615 +0200
+diff -urEbwB lucene-8.11.2.orig/demo/build.xml lucene-8.11.2/demo/build.xml
-+++ lucene-8.5.0/demo/build.xml	2020-04-06 12:36:38.322189334 +0200
+--- lucene-8.11.2.orig/demo/build.xml	2024-10-28 00:12:09.731013858 +0100
++++ lucene-8.11.2/demo/build.xml	2024-10-28 00:55:30.109289178 +0100
 @@ -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"/>
@@ -94,9 +111,10 @@
  
    <target name="jar-core" depends="compile-core">
      <jarify>
---- lucene-8.5.0/module-build.xml	2020-03-13 10:35:56.000000000 +0100
+diff -urEbwB lucene-8.11.2.orig/module-build.xml lucene-8.11.2/module-build.xml
-+++ lucene-8.5.0/module-build.xml	2020-04-06 12:45:38.953110299 +0200
+--- lucene-8.11.2.orig/module-build.xml	2024-10-28 00:12:09.674346796 +0100
-@@ -604,6 +582,28 @@
++++ lucene-8.11.2/module-build.xml	2024-10-28 00:55:30.109289178 +0100
+@@ -604,6 +604,28 @@
      <property name="misc-javadocs.uptodate" value="true"/>
    </target>
  
@@ -125,8 +143,9 @@
    <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
+diff -urEbwB lucene-8.11.2.orig/queries/build.xml lucene-8.11.2/queries/build.xml
-+++ lucene-8.5.0/queries/build.xml	2020-04-06 12:37:44.478546763 +0200
+--- lucene-8.11.2.orig/queries/build.xml	2024-10-28 00:12:09.761014068 +0100
++++ lucene-8.11.2/queries/build.xml	2024-10-28 00:55:30.109289178 +0100
 @@ -47,5 +47,5 @@
  	</jarify>
    </target>
@@ -134,8 +153,65 @@
 -  <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
+diff -urEbwB lucene-8.11.2.orig/spatial-extras/build.xml lucene-8.11.2/spatial-extras/build.xml
-+++ lucene-8.5.0/suggest/build.xml	2020-04-06 12:36:24.810116329 +0200
+--- lucene-8.11.2.orig/spatial-extras/build.xml	2024-10-28 00:12:09.784347564 +0100
++++ lucene-8.11.2/spatial-extras/build.xml	2024-10-28 00:57:22.030070278 +0100
+@@ -34,23 +34,8 @@
+     <pathelement path="${spatial3d.jar}" />
+   </path>
+ 
+-  <path id="test.classpath">
+-    <path refid="test.base.classpath" />
+-    <path refid="spatialjar"/>
+-    <pathelement path="src/test-files" />
+-    <pathelement path="${common.dir}/build/spatial3d/classes/test" />
+-  </path>
+-
+   <target name="compile-core" depends="jar-spatial3d,common.compile-core" />
+ 
+-  <target name="compile-test" depends="compile-spatial3d-tests,common.compile-test" />
+-
+-  <target name="compile-spatial3d-tests">
+-    <ant dir="${common.dir}/spatial3d" target="compile-test" inheritAll="false">
+-      <propertyset refid="uptodate.and.compiled.properties"/>
+-    </ant>
+-  </target>
+-
+   <target name="javadocs" depends="javadocs-spatial3d,compile-core,check-javadocs-uptodate"
+           unless="javadocs-uptodate-${name}">
+     <invoke-module-javadoc>
+diff -urEbwB lucene-8.11.2.orig/spatial-extras/ivy.xml lucene-8.11.2/spatial-extras/ivy.xml
+--- lucene-8.11.2.orig/spatial-extras/ivy.xml	2024-10-28 00:12:09.784347564 +0100
++++ lucene-8.11.2/spatial-extras/ivy.xml	2024-10-28 00:55:30.109289178 +0100
+@@ -18,23 +18,14 @@
+ -->
+ <ivy-module version="2.0"  xmlns:maven="http://ant.apache.org/ivy/maven">
+   <info organisation="org.apache.lucene" module="spatial-extras"/>
+-  <configurations defaultconfmapping="compile->master;test->master">
++  <configurations defaultconfmapping="compile->master">
+     <conf name="compile" transitive="false"/>
+-    <conf name="test" transitive="false"/>
+   </configurations>
+   <dependencies>
+     <dependency org="org.locationtech.spatial4j" name="spatial4j" rev="${/org.locationtech.spatial4j/spatial4j}" conf="compile"/>
+ 
+     <dependency org="io.sgr" name="s2-geometry-library-java" rev="${/io.sgr/s2-geometry-library-java}" conf="compile"/>
+ 
+-    <dependency org="org.locationtech.spatial4j" name="spatial4j" rev="${/org.locationtech.spatial4j/spatial4j}" conf="test">
+-      <artifact name="spatial4j" type="test" ext="jar" maven:classifier="tests" />
+-    </dependency>
+-
+-    <dependency org="org.locationtech.jts" name="jts-core" rev="${/org.locationtech.jts/jts-core}" conf="test" />
+-
+-    <dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="test"/>
+-
+     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+   </dependencies>
+ </ivy-module>
+\ No newline at end of file
+diff -urEbwB lucene-8.11.2.orig/suggest/build.xml lucene-8.11.2/suggest/build.xml
+--- lucene-8.11.2.orig/suggest/build.xml	2024-10-28 00:12:09.791014277 +0100
++++ lucene-8.11.2/suggest/build.xml	2024-10-28 00:55:30.109289178 +0100
 @@ -42,7 +42,7 @@
      </invoke-module-javadoc>
    </target>

lucene-monitor-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-osgi-manifests.patch

@@ -690,7 +690,7 @@
  </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 15:16:13.382558294 +0200
-@@ -44,4 +44,23 @@
+@@ -44,4 +44,22 @@
  
    <target name="compile-core" depends="jar-expressions, jar-analyzers-common, common.compile-core" />
  
@@ -706,7 +706,6 @@
 +		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 +		<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>

lucene-parent-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-solr-grandparent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-queries-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-queryparser-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-sandbox-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-spatial-extras-8.11.4.pom

@@ -0,0 +1,57 @@
+<!--
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>8.11.4</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-spatial-extras</artifactId>
+  <packaging>jar</packaging>
+  <name>Lucene Spatial Extras</name>
+  <description>
+    Advanced Spatial Shape Strategies for Apache Lucene
+  </description>
+  <properties>
+    <module-directory>lucene/spatial-extras</module-directory>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-spatial3d</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.sgr</groupId>
+      <artifactId>s2-geometry-library-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.locationtech.spatial4j</groupId>
+      <artifactId>spatial4j</artifactId>
+    </dependency>
+  </dependencies>
+</project>

lucene-spatial3d-8.11.4.pom

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
-    <version>8.11.2</version>
+    <version>8.11.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>

lucene-suggest-8.11.4.pom

@@ -0,0 +1,53 @@
+<!--
+  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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>8.11.4</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-suggest</artifactId>
+  <packaging>jar</packaging>
+  <name>Lucene Suggest</name>
+  <description>Lucene Suggest Module</description>
+  <properties>
+    <module-directory>lucene/suggest</module-directory>
+  </properties>
+  <scm>
+    <connection>scm:git:${vc-anonymous-base-url}</connection>
+    <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
+    <url>${vc-browse-base-url};f=${module-directory}</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+    </dependency>
+
+  </dependencies>
+</project>

lucene.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Tue Oct 29 12:04:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Enable build and packaging of modules facet and expressions
+
+-------------------------------------------------------------------
+Tue Oct 29 07:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 8.11.4
+  * Bug Fixes
+    + LUCENE-9580: Fix bug in the polygon tessellator when
+      introducing collinear edges during polygon splitting.
+    + LUCENE-10470: Check if polygon has been successfully
+      tessellated before we fail (we are failing some valid
+      tessellations) and allow filtering edges that fold on top of
+      the previous one.
+    + LUCENE-10563: Fix failure to tessellate complex polygon.
+    + LUCENE-10678: Fix potential overflow when building a BKD tree
+      with more than 4 billion points. The overflow occurs when
+      computing the partition point.
+    + GITHUB#11986: Fix algorithm that chooses the bridge between a
+      polygon and a hole when there is common vertex.
+    + GITHUB#12020: Fixes bug whereby very flat polygons can
+      incorrectly contain intersecting geometries.
+    + GITHUB#12352: [Tessellator] Improve the checks that validate
+      the diagonal between two polygon nodes so the resulting
+      polygons are valid counter clockwise polygons.
+  * Optimizations
+    + GITHUB#12604: Estimate the block size of FST BytesStore in
+      BlockTreeTermsWriter to reduce GC load during indexing.
+- Modified patch:
+  * s2-geometry-library-java-2.0.0.patch
+    + rediff to changed context
+
+-------------------------------------------------------------------
+Tue Oct 29 06:42:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Buld and distribute additional modules:
+  * analyzers-icu,
+  * analyzers-phonetic,
+  * spatial-extras and
+  * suggest
+- Added patch:
+  * s2-geometry-library-java-2.0.0.patch
+    + build against the com.google.geometry:s2-geometry instead of
+      the io.sgr:s2-geometry-library-java fork
+
 -------------------------------------------------------------------
 Wed Feb 21 10:49:02 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 

lucene.spec

@@ -17,53 +17,66 @@
 
 
 Name:           lucene
-Version:        8.11.2
+Version:        8.11.4
 Release:        0
 Summary:        Text search engine
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 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
+Source1:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/%{version}/lucene-analyzers-common-%{version}.pom
-Source2:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom
+Source2:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-icu/%{version}/lucene-analyzers-icu-%{version}.pom
-Source3:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom
+Source3:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-phonetic/%{version}/lucene-analyzers-phonetic-%{version}.pom
-Source4:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom
+Source4:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom
-Source6:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom
+Source5:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom
-Source7:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs/%{version}/lucene-backward-codecs-%{version}.pom
+Source6:        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
+Source7:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom
-Source9:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom
+Source8:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom
-Source10:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom
+Source9:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/%{version}/lucene-core-%{version}.pom
-Source11:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom
+Source10:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping/%{version}/lucene-grouping-%{version}.pom
-Source12:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom
+Source11:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/%{version}/lucene-facet-%{version}.pom
-Source13:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom
+Source12:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-expressions/%{version}/lucene-expressions-%{version}.pom
-Source14:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-monitor/%{version}/lucene-monitor-%{version}.pom
+Source13:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom
-Source15:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/%{version}/lucene-analyzers-common-%{version}.pom
+Source14:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom
-Source16:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom
+Source15:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom
-Source17:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom
+Source16:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-monitor/%{version}/lucene-monitor-%{version}.pom
-Source18:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/%{version}/lucene-core-%{version}.pom
+Source17:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-parent/%{version}/lucene-parent-%{version}.pom
-Source19:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-parent/%{version}/lucene-parent-%{version}.pom
+Source18:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom
+Source19:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/%{version}/lucene-queryparser-%{version}.pom
+Source20:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom
+Source21:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom
+Source22:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom
+Source23:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial-extras/%{version}/lucene-spatial-extras-%{version}.pom
+Source24:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest/%{version}/lucene-suggest-%{version}.pom
 Patch0:         0001-Disable-ivy-settings.patch
 Patch1:         0002-Dependency-generation.patch
 Patch2:         lucene-osgi-manifests.patch
 Patch3:         lucene-missing-dependencies.patch
 Patch4:         lucene-nodoclint.patch
 Patch5:         lucene-timestamps.patch
+Patch6:         s2-geometry-library-java-2.0.0.patch
 BuildRequires:  ant >= 1.6
 BuildRequires:  ant-junit >= 1.6
 BuildRequires:  antlr-java
+BuildRequires:  antlr4-java
 BuildRequires:  apache-commons-beanutils
 BuildRequires:  apache-commons-codec
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-digester
 BuildRequires:  apache-commons-logging
-BuildRequires:  apache-ivy
 BuildRequires:  fdupes
 BuildRequires:  git
+BuildRequires:  hppc
+BuildRequires:  icu4j
+BuildRequires:  ivy-local
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javacc
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
+BuildRequires:  objectweb-asm
 BuildRequires:  regexp
+BuildRequires:  s2-geometry-library-java
+BuildRequires:  spatial4j
 BuildRequires:  zip
 #!BuildIgnore:  xerces-j2
 
@@ -78,7 +91,6 @@ 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
 
@@ -158,6 +170,28 @@ This package provides the "backward-codecs" module for Lucene.
 
 %files backward-codecs -f .mfiles-backward-codecs
 
+%package expressions
+Summary:        Lucene Expressions
+Group:          Development/Libraries/Java
+BuildArch:      noarch
+
+%description expressions
+Dynamically computed values to sort/facet/search based on a pluggable
+grammar.
+
+%files expressions -f .mfiles-expressions
+
+%package facet
+Summary:        Facet module for lucene
+Group:          Development/Libraries/Java
+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 grouping
 Summary:        Grouping module for lucene
 Group:          Development/Libraries/Java
@@ -201,6 +235,17 @@ This package provides the "misc" module for Lucene.
 
 %files misc -f .mfiles-misc
 
+%package monitor
+Summary:        Spatial module for lucene
+Group:          Development/Libraries/Java
+BuildArch:      noarch
+
+%description monitor
+Apache Lucene is a full-text search engine written entirely in Java.
+This package provides the "monitor" module for Lucene.
+
+%files monitor -f .mfiles-monitor
+
 %package sandbox
 Summary:        Sandbox module for lucene
 Group:          Development/Libraries/Java
@@ -223,16 +268,25 @@ This package provides the "spatial3d" module for Lucene.
 
 %files spatial3d -f .mfiles-spatial3d
 
-%package monitor
+%package spatial-extras
-Summary:        Spatial module for lucene
+Summary:        Spatial Strategies for Apache Lucene
 Group:          Development/Libraries/Java
 BuildArch:      noarch
 
-%description monitor
+%description spatial-extras
-Apache Lucene is a full-text search engine written entirely in Java.
+Spatial Strategies for Apache Lucene.
-This package provides the "monitor" module for Lucene.
 
-%files monitor -f .mfiles-monitor
+%files spatial-extras -f .mfiles-spatial-extras
+
+%package suggest
+Summary:        Lucene Suggest Module
+Group:          Development/Libraries/Java
+BuildArch:      noarch
+
+%description suggest
+Lucene Suggest Module.
+
+%files suggest -f .mfiles-suggest
 
 %package analyzers-common
 Summary:        Analyzers-common module for lucene
@@ -247,6 +301,27 @@ This package provides the "analyzers-common" module for Lucene.
 
 %files analyzers-common -f .mfiles-analyzers-common
 
+%package analyzers-icu
+Summary:        Lucene ICU Analysis Components
+Group:          Development/Libraries/Java
+BuildArch:      noarch
+
+%description analyzers-icu
+Provides integration with ICU (International Components for Unicode) for
+stronger Unicode and internationalization support.
+
+%files analyzers-icu -f .mfiles-analyzers-icu
+
+%package analyzers-phonetic
+Summary:        Lucene Phonetic Filters
+Group:          Development/Libraries/Java
+BuildArch:      noarch
+
+%description analyzers-phonetic
+Provides phonetic encoding via Commons Codec.
+
+%files analyzers-phonetic -f .mfiles-analyzers-phonetic
+
 %package analyzers-smartcn
 Summary:        Analyzers-smartcn module for lucene
 Group:          Development/Libraries/Java
@@ -270,28 +345,6 @@ 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
-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
-Group:          Development/Libraries/Java
-BuildArch:      noarch
-
-%description analyzers-icu
-Provides integration with ICU (International Components for Unicode) for
-stronger Unicode and internationalization support.
-
-%files analyzers-icu -f .mfiles-analyzers-icu
-
 %package analyzers-kuromoji
 Summary:        Lucene Kuromoji Japanese Morphological Analyzer
 Group:          Development/Libraries/Java
@@ -313,27 +366,25 @@ annotations).
 
 %files analyzers-morfologik -f .mfiles-analyzers-morfologik
 
-%package analyzers-phonetic
+%package analyzers-nori
-Summary:        Lucene Phonetic Filters
+Summary:        Lucene Nori Korean Morphological Analyzer
 Group:          Development/Libraries/Java
 BuildArch:      noarch
 
-%description analyzers-phonetic
+%description analyzers-nori
-Provides phonetic encoding via Commons Codec.
+Lucene Nori Korean Morphological Analyzer.
 
-%files analyzers-phonetic -f .mfiles-analyzers-phonetic
+%files analyzers-nori -f .mfiles-analyzers-nori
 
-%package analyzers-uima
+%package analyzers-opennlp
-Summary:        Lucene UIMA Analysis Components
+Summary:        Lucene OpenNLP integration
 Group:          Development/Libraries/Java
 BuildArch:      noarch
 
-%description analyzers-uima
+%description analyzers-opennlp
-Lucene Integration with UIMA for extracting metadata from arbitrary (text)
+Lucene OpenNLP integration.
-fields and enrich document with features extracted from UIMA types (language,
-sentences, concepts, named entities, etc.).
 
-%files analyzers-uima -f .mfiles-analyzers-uima
+%files analyzers-opennlp -f .mfiles-analyzers-opennlp
 
 %package benchmark
 Summary:        Lucene Benchmarking Module
@@ -376,26 +427,6 @@ Lucene Replicator Module.
 
 %files replicator -f .mfiles-replicator
 
-%package spatial-extras
-Summary:        Spatial Strategies for Apache Lucene
-Group:          Development/Libraries/Java
-BuildArch:      noarch
-
-%description spatial-extras
-Spatial Strategies for Apache Lucene.
-
-%files spatial-extras -f .mfiles-spatial-extras
-
-%package suggest
-Summary:        Lucene Suggest Module
-Group:          Development/Libraries/Java
-BuildArch:      noarch
-
-%description suggest
-Lucene Suggest Module.
-
-%files suggest -f .mfiles-suggest
-
 %package test-framework
 Summary:        Apache Lucene Java Test Framework
 Group:          Development/Libraries/Java
@@ -417,25 +448,26 @@ Apache Lucene Java Test Framework.
 %patch -P 3 -p1
 %patch -P 4 -p1
 %patch -P 5 -p1
+%patch -P 6 -p1
+
+cp %{_sourcedir}/%{name}-spatial-extras-%{version}.pom spatial-extras/pom.xml
+%pom_change_dep io.sgr:s2-geometry-library-java com.google.geometry:s2-geometry:2.0.0 spatial-extras
 
 %build
-export CLASSPATH=$(build-classpath commons-digester junit regexp)
+ant \
-export OPT_JAR_LIST=:
-%{ant} \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
-  -Djavacc.jar.dir=%{_javadir} \
   -Djavadoc.link=%{_javadocdir}/java \
   -Dversion=%{version} \
   -Divy.mode=local -Divy.available=true
 
-# DOESN'T BUILD BECAUSE OF MISSING DEPS: replicator expressions facet spatial-extras analyzers-kuromoji analyzers-morfologik analyzers-phonetic
+# DOESN'T BUILD BECAUSE OF MISSING DEPS: replicator analyzers-kuromoji analyzers-morfologik
-export modules="queryparser join queries classification codecs backward-codecs grouping highlighter memory misc sandbox spatial3d monitor"
+export modules="queryparser join queries classification codecs backward-codecs grouping highlighter memory misc monitor sandbox spatial3d spatial-extras suggest facet expressions"
 
 for mod in $modules
 do
   echo "BUILDING MODULE ${mod}"
-  %{ant} -f module-build.xml \
+  ant -f module-build.xml \
     -Djavacc.home=%{_bindir}/javacc \
     -Djavacc.jar=%{_javadir}/javacc.jar \
     -Djavacc.jar.dir=%{_javadir} \
@@ -445,9 +477,9 @@ do
   jar-$mod
 done
 
-export modanalyzers="common smartcn stempel"
+export modanalyzers="common icu phonetic smartcn stempel"
 pushd analysis
-%{ant} \
+ant \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
   -Djavacc.jar.dir=%{_javadir} \
@@ -463,12 +495,16 @@ 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 codecs backward-codecs grouping highlighter memory sandbox spatial3d monitor"
+export noarch_modules="core queryparser join queries classification codecs backward-codecs grouping highlighter memory monitor sandbox spatial3d spatial-extras suggest facet expressions"
 for mod in $noarch_modules
 do
   install -p -m 0644 build/${mod}/%{name}-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-$mod.jar
   ln -sf %{name}/%{name}-$mod.jar %{buildroot}%{_javadir}/%{name}-$mod.jar
+  if [ -f ${mod}/pom.xml ]; then
+    %{mvn_install_pom} ${mod}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom
+  else
     %{mvn_install_pom} %{_sourcedir}/%{name}-${mod}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom
+  fi
   %add_maven_depmap %{name}/%{name}-${mod}.pom %{name}/%{name}-${mod}.jar -f ${mod}
   echo %{_javadir}/%{name}-$mod.jar >> .mfiles-${mod}
 done
@@ -483,7 +519,7 @@ do
   echo %{_jnidir}/%{name}-$mod.jar >> .mfiles-${mod}
 done
 
-export modanalyzers="common smartcn stempel"
+export modanalyzers="common icu phonetic smartcn stempel"
 for mod in $modanalyzers
 do
   install -p -m 0644 build/analysis/$mod/%{name}-analyzers-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-analyzers-${mod}.jar

s2-geometry-library-java-2.0.0.patch

@@ -0,0 +1,53 @@
+diff -urEbwB lucene-8.11.2.orig/ivy-versions.properties lucene-8.11.2/ivy-versions.properties
+--- lucene-8.11.2.orig/ivy-versions.properties	2024-10-28 01:02:56.289069028 +0100
++++ lucene-8.11.2/ivy-versions.properties	2024-10-28 01:49:33.841844665 +0100
+@@ -56,6 +56,7 @@
+ /com.google.cloud/google-cloud-storage = 1.113.14
+ /com.google.code.gson/gson = 2.9.1
+ /com.google.errorprone/error_prone_annotations = 2.9.0
++/com.google.geometry/s2-geometry = 2.0.0
+ /com.google.guava/failureaccess = 1.0.1
+ /com.google.guava/guava = 32.1.3-jre
+ /com.google.guava/listenablefuture = 9999.0-empty-to-avoid-conflict-with-guava
+@@ -139,8 +140,6 @@
+ /io.prometheus/simpleclient_common = ${io.prometheus.version}
+ /io.prometheus/simpleclient_httpserver = ${io.prometheus.version}
+ 
+-/io.sgr/s2-geometry-library-java = 1.0.0
+-
+ /jakarta.annotation/jakarta.annotation-api = 1.3.5
+ /jakarta.servlet/jakarta.servlet-api = 4.0.4
+ /jakarta.websocket/jakarta.websocket-api = 1.1.2
+diff -urEbwB lucene-8.11.2.orig/spatial-extras/ivy.xml lucene-8.11.2/spatial-extras/ivy.xml
+--- lucene-8.11.2.orig/spatial-extras/ivy.xml	2024-10-28 01:02:56.405736508 +0100
++++ lucene-8.11.2/spatial-extras/ivy.xml	2024-10-28 01:47:27.594303341 +0100
+@@ -25,7 +25,7 @@
+   <dependencies>
+     <dependency org="org.locationtech.spatial4j" name="spatial4j" rev="${/org.locationtech.spatial4j/spatial4j}" conf="compile"/>
+ 
+-    <dependency org="io.sgr" name="s2-geometry-library-java" rev="${/io.sgr/s2-geometry-library-java}" conf="compile"/>
++    <dependency org="com.google.geometry" name="s2-geometry" rev="${/com.google.geometry/s2-geometry}" conf="compile"/>
+ 
+     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+   </dependencies>
+diff -urEbwB lucene-8.11.2.orig/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/S2PrefixTree.java lucene-8.11.2/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/S2PrefixTree.java
+--- lucene-8.11.2.orig/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/S2PrefixTree.java	2024-10-28 01:02:56.399069795 +0100
++++ lucene-8.11.2/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/S2PrefixTree.java	2024-10-28 01:41:10.165021366 +0100
+@@ -111,7 +111,7 @@
+         if (dist == 0){
+             return maxLevels;
+         }
+-        int level =  S2Projections.MAX_WIDTH.getMinLevel(dist * DistanceUtils.DEGREES_TO_RADIANS);
++        int level =  S2Projections.PROJ.maxWidth.getMinLevel(dist * DistanceUtils.DEGREES_TO_RADIANS);
+         int roundLevel = level % arity != 0 ? 1 : 0;
+         level = level/arity + roundLevel;
+         return Math.min(maxLevels, level + 1);
+@@ -122,7 +122,7 @@
+         if (level == 0) {
+             return 180;
+         }
+-        return S2Projections.MAX_WIDTH.getValue(arity * (level - 1)) * DistanceUtils.RADIANS_TO_DEGREES;
++        return S2Projections.PROJ.maxWidth.getValue(arity * (level - 1)) * DistanceUtils.RADIANS_TO_DEGREES;
+     }
+ 
+     @Override