#1 Update to upstream version 9.2.0
Merged 6 months ago by mkoncek. Opened 7 months ago by mkoncek.
rpms/ mkoncek/lucene rawhide  into  rawhide

file added
+1
@@ -0,0 +1,1 @@ 

+ 1

file modified
+32
@@ -46,3 +46,35 @@ 

  /solr-8.4.1-src.tgz

  /solr-8.6.3-src.tgz

  /solr-8.8.2-src.tgz

+ /lucene-9.2.0-src.tgz

+ /lucene-analysis-common-9.2.0.pom

+ /lucene-analysis-icu-9.2.0.pom

+ /lucene-analysis-kuromoji-9.2.0.pom

+ /lucene-analysis-morfologik-9.2.0.pom

+ /lucene-analysis-nori-9.2.0.pom

+ /lucene-analysis-opennlp-9.2.0.pom

+ /lucene-analysis-phonetic-9.2.0.pom

+ /lucene-analysis-smartcn-9.2.0.pom

+ /lucene-analysis-stempel-9.2.0.pom

+ /lucene-backward-codecs-9.2.0.pom

+ /lucene-benchmark-9.2.0.pom

+ /lucene-classification-9.2.0.pom

+ /lucene-codecs-9.2.0.pom

+ /lucene-core-9.2.0.pom

+ /lucene-demo-9.2.0.pom

+ /lucene-expressions-9.2.0.pom

+ /lucene-facet-9.2.0.pom

+ /lucene-grouping-9.2.0.pom

+ /lucene-highlighter-9.2.0.pom

+ /lucene-join-9.2.0.pom

+ /lucene-luke-9.2.0.pom

+ /lucene-memory-9.2.0.pom

+ /lucene-misc-9.2.0.pom

+ /lucene-monitor-9.2.0.pom

+ /lucene-queries-9.2.0.pom

+ /lucene-queryparser-9.2.0.pom

+ /lucene-replicator-9.2.0.pom

+ /lucene-sandbox-9.2.0.pom

+ /lucene-spatial3d-9.2.0.pom

+ /lucene-suggest-9.2.0.pom

+ /lucene-test-framework-9.2.0.pom

@@ -1,24 +0,0 @@ 

- 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/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 0bbd19a..6767ffe 100644

- --- a/lucene/common-build.xml

- +++ b/lucene/common-build.xml

- @@ -438,7 +438,6 @@

-            you have an idea, fix it.

-            unless="ivy.settings.uptodate" -->

-      <!-- override: just for safety, should be unnecessary -->

- -    <ivy:configure file="${common.dir}/top-level-ivy-settings.xml" override="true"/>

-      <!-- <property name="ivy.settings.uptodate" value="true"/> -->

-    </target>

-  

- -- 

- 2.20.1

- 

@@ -1,77 +0,0 @@ 

- 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/3] Dependency generation

- 

- ---

-  lucene/build.xml                                            | 6 ++++--

-  lucene/common-build.xml                                     | 4 ++--

-  .../lucene/dependencies/GetMavenDependenciesTask.java       | 2 ++

-  3 files changed, 8 insertions(+), 4 deletions(-)

- 

- diff --git a/build.xml b/build.xml

- index 3d7ee87..33e5f07 100644

- --- a/build.xml

- +++ b/build.xml

- @@ -615,7 +615,6 @@ File | Project Structure | Platform Settings | SDKs):

-      <delete file="lucene/build/module.dependencies.properties"/>

-      <subant target="-append-module-dependencies-properties" inheritall="false" failonerror="true">

-        <fileset dir="lucene" includes="build.xml" />

- -      <fileset dir="solr" includes="build.xml" />

-        <propertyset refid="uptodate.and.compiled.properties"/>

-      </subant>

-    </target>

- diff --git a/lucene/build.xml b/lucene/build.xml

- index e3cf905..facc19b 100644

- --- a/lucene/build.xml

- +++ b/lucene/build.xml

- @@ -426,12 +426,8 @@

-      </sequential>

-    </target>

-  

- -  <target name="generate-maven-artifacts" depends="-unpack-lucene-tgz">

- -    <ant dir=".." target="resolve" inheritall="false"/>

- +  <target name="generate-maven-artifacts">

-      <antcall target="-filter-pom-templates" inheritall="false"/>

- -    <antcall target="-dist-maven" inheritall="false">

- -      <propertyset refid="uptodate.and.compiled.properties"/>

- -    </antcall>

-    </target>

-    

-    <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">

- diff --git a/lucene/common-build.xml b/lucene/common-build.xml

- index 41da3f2..d2f9d16 100644

- --- a/lucene/common-build.xml

- +++ b/lucene/common-build.xml

- @@ -1884,7 +1884,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

- -        dir="${common.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 610323f..13bde29 100644

- --- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

- +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java

- @@ -537,6 +537,7 @@ public class GetMavenDependenciesTask extends Task {

-    private Collection<String> getTransitiveDependenciesFromIvyCache

-    (String groupId, String artifactId, String version) {

-      SortedSet<String> transitiveDependencies = new TreeSet<>();

- +    /*

-      //                                      E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml

-      File ivyXmlFile = new File(new File(new File(ivyCacheDir, groupId), artifactId), "ivy-" + version + ".xml");

-      if ( ! ivyXmlFile.exists()) {

- @@ -558,6 +559,7 @@ public class GetMavenDependenciesTask extends Task {

-                                + groupId + ':' + artifactId + ':' + version + " from "

-                                + ivyXmlFile.getAbsolutePath(), e);

-      }

- +    */

-      return transitiveDependencies;

-    }

-  

- -- 

- 2.20.1

- 

file added
+1
@@ -0,0 +1,1 @@ 

+ resultsdb-testcase: separate

file added
+8
@@ -0,0 +1,8 @@ 

+ --- !Policy

+ product_versions:

+   - fedora-*

+ decision_contexts:

+   - bodhi_update_push_testing

+   - bodhi_update_push_stable

+ rules:

+   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}

file modified
+216 -290
@@ -1,71 +1,60 @@ 

- %bcond_with     jp_minimal

- 

  Summary:        High-performance, full-featured text search engine

  Name:           lucene

- Version:        8.8.2

- Release:        3%{?dist}

+ Version:        9.2.0

+ Release:        1%{?dist}

  Epoch:          0

- License:        ASL 2.0

- URL:            http://lucene.apache.org/

- # solr source contains both lucene and dev-tools

- Source0:        https://archive.apache.org/dist/lucene/solr/%{version}/solr-%{version}-src.tgz

- 

- Patch0:         0001-Disable-ivy-settings.patch

- Patch1:         0002-Dependency-generation.patch

+ # License breakdown is present in NOTICE.txt file

+ License:        ASL 2.0 and MIT and BSD

+ URL:            https://lucene.apache.org/

+ BuildArch:      noarch

+ ExclusiveArch:  %{java_arches} noarch

+ 

+ Source0:        https://dlcdn.apache.org/lucene/java/%{version}/lucene-%{version}-src.tgz

+ Source1:        parent.pom

+ Source2:        parent-analysis.pom

+ 

+ Source3:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/%{version}/lucene-analysis-common-%{version}.pom

+ Source4:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-icu/%{version}/lucene-analysis-icu-%{version}.pom

+ Source5:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-kuromoji/%{version}/lucene-analysis-kuromoji-%{version}.pom

+ Source6:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-morfologik/%{version}/lucene-analysis-morfologik-%{version}.pom

+ Source7:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-nori/%{version}/lucene-analysis-nori-%{version}.pom

+ Source8:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-opennlp/%{version}/lucene-analysis-opennlp-%{version}.pom

+ Source9:        https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-phonetic/%{version}/lucene-analysis-phonetic-%{version}.pom

+ Source10:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/%{version}/lucene-analysis-smartcn-%{version}.pom

+ Source11:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-stempel/%{version}/lucene-analysis-stempel-%{version}.pom

+ 

+ Source12:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs/%{version}/lucene-backward-codecs-%{version}.pom

+ Source13:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-benchmark/%{version}/lucene-benchmark-%{version}.pom

+ Source14:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom

+ Source15:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom

+ Source16:       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-demo/%{version}/lucene-demo-%{version}.pom

+ Source18:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-expressions/%{version}/lucene-expressions-%{version}.pom

+ Source19:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/%{version}/lucene-facet-%{version}.pom

+ Source20:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping/%{version}/lucene-grouping-%{version}.pom

+ Source21:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom

+ Source22:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom

+ Source23:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-luke/%{version}/lucene-luke-%{version}.pom

+ Source24:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom

+ Source25:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom

+ Source26:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-monitor/%{version}/lucene-monitor-%{version}.pom

+ Source27:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom

+ Source28:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/%{version}/lucene-queryparser-%{version}.pom

+ Source29:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-replicator/%{version}/lucene-replicator-%{version}.pom

+ Source30:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom

+ Source31:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom

+ Source32:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest/%{version}/lucene-suggest-%{version}.pom

+ Source33:       https://repo1.maven.org/maven2/org/apache/lucene/lucene-test-framework/%{version}/lucene-test-framework-%{version}.pom

  

- BuildRequires:  ant

- BuildRequires:  ivy-local

  BuildRequires:  maven-local

  BuildRequires:  mvn(com.ibm.icu:icu4j)

- BuildRequires:  mvn(org.apache:apache:pom:)

- BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)

- %if %{without jp_minimal}

  BuildRequires:  mvn(commons-codec:commons-codec)

- BuildRequires:  mvn(javax.servlet:javax.servlet-api)

- BuildRequires:  mvn(javax.servlet:servlet-api)

- BuildRequires:  mvn(junit:junit)

  BuildRequires:  mvn(org.antlr:antlr4-runtime)

- BuildRequires:  mvn(org.apache.commons:commons-compress)

- BuildRequires:  mvn(org.eclipse.jetty:jetty-continuation)

- BuildRequires:  mvn(org.eclipse.jetty:jetty-http)

- BuildRequires:  mvn(org.eclipse.jetty:jetty-io)

- BuildRequires:  mvn(org.eclipse.jetty:jetty-server)

- BuildRequires:  mvn(org.eclipse.jetty:jetty-servlet)

- BuildRequires:  mvn(org.eclipse.jetty:jetty-util)

  BuildRequires:  mvn(org.ow2.asm:asm)

  BuildRequires:  mvn(org.ow2.asm:asm-commons)

- BuildRequires:  mvn(xerces:xercesImpl)

- %endif

- 

- Provides:       %{name}-core = %{epoch}:%{version}-%{release}

- 

- # Obsolete since F32

- # Required deps were removed from fedora

- Obsoletes: %{name}-benchmark < 8.1.1-3

- Obsoletes: %{name}-demo < 8.1.1-3

- Obsoletes: %{name}-facet < 8.1.1-3

- Obsoletes: %{name}-replicator < 8.1.1-3

- Obsoletes: %{name}-spatial-extras < 8.1.1-3

- Obsoletes: %{name}-spatial3d < 8.1.1-3

- Obsoletes: %{name}-test-framework < 8.4.1-4

- 

- # Obsolete since F32

- # Module was removed upstream

- Obsoletes: %{name}-spatial < 8.1.1-3

- 

- %if %{with jp_minimal}

- # Remove left-over packages that would have broken deps when built in minimal mode

- Obsoletes: %{name}-parent < %{version}-%{release}

- Obsoletes: %{name}-solr-grandparent < %{version}-%{release}

- Obsoletes: %{name}-expressions < %{version}-%{release}

- Obsoletes: %{name}-analyzers-phonetic < %{version}-%{release}

- Obsoletes: %{name}-analyzers-icu < %{version}-%{release}

- Obsoletes: %{name}-analyzers-nori < %{version}-%{release}

- Obsoletes: %{name}-analyzers-kuromoji < %{version}-%{release}

- Obsoletes: %{name}-analyzers-stempel < %{version}-%{release}

- %endif

  

- BuildArch:      noarch

+ BuildRequires:  mvn(junit:junit)

+ BuildRequires:  mvn(org.apache.maven.plugins:maven-surefire-plugin)

  

  %description

  Apache Lucene is a high-performance, full-featured text search
@@ -73,316 +62,253 @@ 

  for nearly any application that requires full-text search, especially

  cross-platform.

  

- %package analysis

- Summary:      Lucene Common Analyzers

- # Obsoletes since F30

- # This module was removed upstream and no replacement exists

- Obsoletes: %{name}-analyzers-uima < 8.1.1-3

- # Obsolete since F32

- # Required deps were removed from fedora

- Obsoletes: %{name}-analyzers-morfologik < 8.1.1-3

- 

- %description analysis

- Lucene Common Analyzers.

+ %package javadoc

+ Summary:        Javadoc for Lucene

  

- %package analyzers-smartcn

- Summary:      Smart Chinese Analyzer

+ %description javadoc

+ %{summary}.

  

- %description analyzers-smartcn

- Lucene Smart Chinese Analyzer.

+ %package analysis-pom

+ Summary:        Lucene aggregator pom for the module analysis

  

- %package grouping

- Summary:      Lucene Grouping Module

+ %description analysis-pom

+ %{summary}.

  

- %description grouping

- Lucene Grouping Module.

+ %package analysis-common

+ Summary:        Lucene module: analysis-common

  

- %package highlighter

- Summary:      Lucene Highlighter Module

+ %description analysis-common

+ %{summary}.

  

- %description highlighter

- Lucene Highlighter Module.

+ %package analysis-icu

+ Summary:        Lucene module: analysis-icu

  

- %package join

- Summary:      Lucene Join Module

+ %description analysis-icu

+ %{summary}.

  

- %description join

- Lucene Join Module.

+ %package analysis-kuromoji

+ Summary:        Lucene module: analysis-kuromoji

  

- %package memory

- Summary:      Lucene Memory Module

+ %description analysis-kuromoji

+ %{summary}.

  

- %description memory

- High-performance single-document index to compare against Query.

+ %package analysis-nori

+ Summary:        Lucene module: analysis-nori

  

- %package misc

- Summary:      Miscellaneous Lucene extensions

+ %description analysis-nori

+ %{summary}.

  

- %description misc

- Miscellaneous Lucene extensions.

+ %package analysis-phonetic

+ Summary:        Lucene module: analysis-phonetic

  

- %package queries

- Summary:      Lucene Queries Module

- 

- %description queries

- Lucene Queries Module.

+ %description analysis-phonetic

+ %{summary}.

  

- %package queryparser

- Summary:      Lucene QueryParsers Module

+ %package analysis-smartcn

+ Summary:        Lucene module: analysis-smartcn

  

- %description queryparser

- Lucene QueryParsers Module.

+ %description analysis-smartcn

+ %{summary}.

  

- %package sandbox

- Summary:      Lucene Sandbox Module

+ %package analysis-stempel

+ Summary:        Lucene module: analysis-stempel

  

- %description sandbox

- Lucene Sandbox Module.

+ %description analysis-stempel

+ %{summary}.

  

  %package backward-codecs

- Summary:      Lucene Backward Codecs Module

+ Summary:        Lucene module: backward-codecs

  

  %description backward-codecs

- Codecs for older versions of Lucene.

- 

- %package codecs

- Summary:      Codecs and postings formats for Apache Lucene

- 

- %description codecs

- Codecs and postings formats for Apache Lucene.

+ %{summary}.

  

  %package classification

- Summary:      Lucene Classification Module

+ Summary:        Lucene module: classification

  

  %description classification

- Lucene Classification Module.

- 

- %package suggest

- Summary:      Lucene Suggest Module

- 

- %description suggest

- Lucene Suggest Module.

- 

- %package monitor

- Summary:      Lucene Monitor Module

- 

- %description monitor

- Lucene Monitor Module.

+ %{summary}.

  

- %if %{without jp_minimal}

- %package parent

- Summary:      Parent POM for Lucene

+ %package codecs

+ Summary:        Lucene module: codecs

  

- %description parent

- Parent POM for Lucene.

+ %description codecs

+ %{summary}.

  

- %package solr-grandparent

- Summary:      Lucene Solr grandparent POM

+ %package core

+ Summary:        Lucene module: core

  

- %description solr-grandparent

- Lucene Solr grandparent POM.

+ %description core

+ %{summary}.

  

  %package expressions

- Summary:      Lucene Expressions Module

+ Summary:        Lucene module: expressions

  

  %description expressions

- Dynamically computed values to sort/facet/search on based on a pluggable

- grammar.

- 

- %package analyzers-phonetic

- Summary:      Lucene Phonetic Filters

+ %{summary}.

  

- %description analyzers-phonetic

- Provides phonetic encoding via Commons Codec.

+ %package grouping

+ Summary:        Lucene module: grouping

  

- %package analyzers-icu

- Summary:      Lucene ICU Analysis Components

+ %description grouping

+ %{summary}.

  

- %description analyzers-icu

- Provides integration with ICU (International Components for Unicode) for

- stronger Unicode and internationalization support.

+ %package highlighter

+ Summary:        Lucene module: highlighter

  

- %package analyzers-nori

- Summary:      An analyzer with morphological analysis for Korean

+ %description highlighter

+ %{summary}.

  

- %description analyzers-nori

- An analyzer with morphological analysis for Korean.

+ %package join

+ Summary:        Lucene module: join

  

- %package analyzers-kuromoji

- Summary:      Lucene Kuromoji Japanese Morphological Analyzer

+ %description join

+ %{summary}.

  

- %description analyzers-kuromoji

- Lucene Kuromoji Japanese Morphological Analyzer.

+ %package memory

+ Summary:        Lucene module: memory

  

- %package analyzers-stempel

- Summary:      Lucene Stempel Analyzer

+ %description memory

+ %{summary}.

  

- %description analyzers-stempel

- Lucene Stempel Analyzer.

+ %package misc

+ Summary:        Lucene module: misc

  

- %endif

+ %description misc

+ %{summary}.

  

- %package javadoc

- Summary:        Javadoc for Lucene

+ %package monitor

+ Summary:        Lucene module: monitor

  

- %description javadoc

+ %description monitor

  %{summary}.

  

- %prep

- %setup -q -n solr-%{version}

- 

- %patch0 -p1

- %patch1 -p1

+ %package queries

+ Summary:        Lucene module: queries

  

- rm -rf solr

+ %description queries

+ %{summary}.

  

- find -name "*.jar" -delete

+ %package queryparser

+ Summary:        Lucene module: queryparser

  

- mkdir -p lucene/build/analysis/{kuromoji,nori}

+ %description queryparser

+ %{summary}.

  

- # don't generate uses clauses in osgi metadata

- sed -i -e "/<Export-Package>/a<_nouses>true</_nouses>" dev-tools/maven/pom.xml.template

+ %package sandbox

+ Summary:        Lucene module: sandbox

  

- # optional on internal APIs that might not be present

- sed -i -e "/<Export-Package>/a<Import-Package>com.sun.management;resolution:=\"optional\",sun.misc;resolution:=\"optional\",*</Import-Package>" dev-tools/maven/pom.xml.template

+ %description sandbox

+ %{summary}.

  

- # compatibility with existing packages

- %mvn_alias :%{name}-analyzers-common :%{name}-analyzers

+ %package spatial3d

+ Summary:        Lucene module: spatial3d

  

- %mvn_package ":%{name}-analysis-modules-aggregator" %{name}-analysis

- %mvn_package ":%{name}-analyzers-common" %{name}-analysis

- %mvn_package ":{*}-aggregator" @1

+ %description spatial3d

+ %{summary}.

  

- %build

- pushd %{name}

- find -maxdepth 2 -type d -exec mkdir -p '{}/lib' \;

+ %package suggest

+ Summary:        Lucene module: suggest

  

- # generate maven dependencies

- ant -f build.xml generate-maven-artifacts -Divy.mode=local -Dversion=%{version} -Divy.available=true

+ %description suggest

+ %{summary}.

  

- # fix source dir + move to expected place

- for pom in `find build/poms/%{name} -name pom.xml`; do

-     sed 's/\${module-path}/${basedir}/g' "$pom" > "${pom##build/poms/%{name}/}"

+ %prep

+ %setup -q

+ 

+ find -mindepth 1 -maxdepth 1 ! -name lucene ! -name LICENSE.txt ! -name NOTICE.txt ! -name README.md -exec rm -rf {} +

+ mv -t . lucene/*

+ rmdir lucene

+ 

+ # Javadoc generation would fail otherwise

+ find -name 'module-info.java' -delete

+ find -wholename '*/src/test' -exec rm -rf {} +

+ 

+ cp %SOURCE1 pom.xml

+ %pom_xpath_set "pom:project/pom:version" "%{version}"

+ 

+ function add_pom {

+   source=${1}

+   prefix=${2}

+   module=${source}

+   module=${module##*/${prefix}}

+   module=${module%%%%-%{version}.pom}

+   cp ${source} ${module}/pom.xml

+ }

+ 

+ for source in $(echo %{sources} | tr ' ' '\n' | grep -v 'lucene-analysis-.*\.pom' | grep 'lucene-.*\.pom'); do

+   add_pom ${source} "lucene-"

+   %pom_add_parent org.apache.lucene:lucene-parent:%{version} ${module}/pom.xml

  done

- %pom_disable_module src/test core

- %pom_disable_module src/test codecs

  

+ pushd analysis

+ cp %SOURCE2 pom.xml

+ %pom_xpath_set "pom:project/pom:version" "%{version}"

+ %pom_add_parent org.apache.lucene:lucene-parent:%{version}

+ 

+ for source in $(echo %{sources} | tr ' ' '\n' | grep 'lucene-analysis-.*\.pom'); do

+   add_pom ${source} "lucene-analysis-"

+   %pom_add_parent org.apache.lucene:lucene-analysis:%{version} ${module}/pom.xml

+ done

  popd

  

- mv lucene/build/poms/pom.xml .

- 

- # deal with split packages in core/misc/analysis modules by adding additional metadata and

- # require-bundling the core bundle from misc

- %pom_xpath_set "pom:Export-Package" "*;version=\"%{version}\""

- %pom_add_plugin org.apache.felix:maven-bundle-plugin lucene/misc \

- "<configuration><instructions>

- <Require-Bundle>org.apache.lucene.core;bundle-version=\"%{version}\"</Require-Bundle>

- <Export-Package>

-  org.apache.lucene.document;version=\"%{version}\";misc=split;mandatory:=misc,

-  org.apache.lucene.index;version=\"%{version}\";misc=split;mandatory:=misc,

-  org.apache.lucene.search;version=\"%{version}\";misc=split;mandatory:=misc,

-  org.apache.lucene.store;version=\"%{version}\";misc=split;mandatory:=misc,

-  org.apache.lucene.util.fst;version=\"%{version}\";misc=split;mandatory:=misc,

-  *;version=\"%{version}\"</Export-Package>

- </instructions></configuration>"

- %pom_add_plugin org.apache.felix:maven-bundle-plugin lucene/analysis/common \

- "<configuration><instructions>

- <Require-Bundle>org.apache.lucene.core;bundle-version=\"%{version}\"</Require-Bundle>

- <Export-Package>

-  org.apache.lucene.analysis.standard;version=\"%{version}\";analysis=split;mandatory:=analysis,

-  *;version=\"%{version}\"</Export-Package>

- </instructions></configuration>"

- 

- %pom_disable_module solr

- %pom_remove_plugin -r :gmaven-plugin

- %pom_remove_plugin -r :maven-enforcer-plugin

- %pom_remove_plugin -r :forbiddenapis

- %pom_remove_plugin -r :buildnumber-maven-plugin

- 

- # don't build modules for which deps are not in fedora or not new enough in fedora

- pushd lucene

+ for module in grouping classification codecs expressions highlighter monitor; do

+   %pom_xpath_set "pom:dependency[pom:scope='runtime']/pom:scope" "compile" ${module}/pom.xml

+ done

+ 

  %pom_disable_module benchmark

  %pom_disable_module demo

- %pom_disable_module test-framework

  %pom_disable_module facet

+ %pom_disable_module luke

  %pom_disable_module replicator

- %pom_disable_module spatial-extras

- %pom_disable_module spatial3d

+ %pom_disable_module test-framework

  

- %pom_disable_module opennlp analysis

  %pom_disable_module morfologik analysis

- popd

+ %pom_disable_module opennlp analysis

  

- %if %{with jp_minimal}

- pushd lucene

- %pom_disable_module expressions

- %pom_disable_module icu analysis

- %pom_disable_module kuromoji analysis

- %pom_disable_module phonetic analysis

- %pom_disable_module stempel analysis

- %pom_disable_module nori analysis

- popd

+ %mvn_package ':lucene-parent' lucene

  

- %mvn_package :lucene-parent __noinstall

- %mvn_package :lucene-solr-grandparent __noinstall

- %endif

- 

- # Use compiler release flag when building on JDK >8 for correct cross-compiling

- %pom_xpath_inject pom:profiles "

-     <profile>

-       <id>jdk-release-flag</id>

-       <activation>

-         <jdk>[9,)</jdk>

-       </activation>

-       <properties>

-         <maven.compiler.release>\${java.compat.version}</maven.compiler.release>

-       </properties>

-     </profile>"

- 

- # For some reason TestHtmlParser.testTurkish fails when building inside SCLs

- %mvn_build -s -f -- -Dcheckoutid=%{version}

+ %build

+ # Tests have unpackaged dependencies

+ %mvn_build -s -f

  

  %install

  %mvn_install

  

- # Use the same directory of the main package for subpackage licence and docs

- %global _docdir_fmt %{name}

- 

- %files -f .mfiles-%{name}-core

- %doc lucene/CHANGES.txt lucene/README.txt

- %doc lucene/MIGRATE.txt lucene/JRE_VERSION_MIGRATION.txt

- %license lucene/LICENSE.txt lucene/NOTICE.txt

- 

- %files analysis -f .mfiles-%{name}-analysis

- %files analyzers-smartcn -f .mfiles-%{name}-analyzers-smartcn

- %files grouping -f .mfiles-%{name}-grouping

- %files highlighter -f .mfiles-%{name}-highlighter

- %files join -f .mfiles-%{name}-join

- %files memory -f .mfiles-%{name}-memory

- %files misc -f .mfiles-%{name}-misc

- %files queries -f .mfiles-%{name}-queries

- %files queryparser -f .mfiles-%{name}-queryparser

- %files sandbox -f .mfiles-%{name}-sandbox

- %files backward-codecs -f .mfiles-%{name}-backward-codecs

- %files codecs -f .mfiles-%{name}-codecs

- %files classification -f .mfiles-%{name}-classification

- %files suggest -f .mfiles-%{name}-suggest

- %files monitor -f .mfiles-%{name}-monitor

- %if %{without jp_minimal}

- %files parent -f .mfiles-%{name}-parent

- %files solr-grandparent -f .mfiles-%{name}-solr-grandparent

- %files expressions -f .mfiles-%{name}-expressions

- %files analyzers-phonetic -f .mfiles-%{name}-analyzers-phonetic

- %files analyzers-icu -f .mfiles-%{name}-analyzers-icu

- %files analyzers-nori -f .mfiles-%{name}-analyzers-nori

- %files analyzers-kuromoji -f .mfiles-%{name}-analyzers-kuromoji

- %files analyzers-stempel -f .mfiles-%{name}-analyzers-stempel

- %endif

+ %files -f .mfiles-lucene

+ %license LICENSE.txt NOTICE.txt

+ %doc README.md

  

  %files javadoc -f .mfiles-javadoc

- %license lucene/LICENSE.txt lucene/NOTICE.txt

+ 

+ %files analysis-common -f .mfiles-lucene-analysis-common

+ %files analysis-icu -f .mfiles-lucene-analysis-icu

+ %files analysis-pom -f .mfiles-lucene-analysis

+ %files analysis-kuromoji -f .mfiles-lucene-analysis-kuromoji

+ %files analysis-nori -f .mfiles-lucene-analysis-nori

+ %files analysis-phonetic -f .mfiles-lucene-analysis-phonetic

+ %files analysis-smartcn -f .mfiles-lucene-analysis-smartcn

+ %files analysis-stempel -f .mfiles-lucene-analysis-stempel

+ %files backward-codecs -f .mfiles-lucene-backward-codecs

+ %files classification -f .mfiles-lucene-classification

+ %files codecs -f .mfiles-lucene-codecs

+ %files core -f .mfiles-lucene-core

+ %files expressions -f .mfiles-lucene-expressions

+ %files grouping -f .mfiles-lucene-grouping

+ %files highlighter -f .mfiles-lucene-highlighter

+ %files join -f .mfiles-lucene-join

+ %files memory -f .mfiles-lucene-memory

+ %files misc -f .mfiles-lucene-misc

+ %files monitor -f .mfiles-lucene-monitor

+ %files queries -f .mfiles-lucene-queries

+ %files queryparser -f .mfiles-lucene-queryparser

+ %files sandbox -f .mfiles-lucene-sandbox

+ %files spatial3d -f .mfiles-lucene-spatial3d

+ %files suggest -f .mfiles-lucene-suggest

  

  %changelog

+ * Tue Aug 16 2022 Marian Koncek <mkoncek@redhat.com> - 0:9.2.0-1

+ - Update to upstream version 9.2.0

+ 

  * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:8.8.2-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

  

file added
+24
@@ -0,0 +1,24 @@ 

+ <?xml version="1.0" encoding="UTF-8"?>

+ <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>

+ 

+   <groupId>org.apache.lucene</groupId>

+   <artifactId>lucene-analysis</artifactId>

+   <version></version>

+   <packaging>pom</packaging>

+   <name>Lucene analysis parent POM</name>

+   <description>Lucene analysis parent POM</description>

+ 

+   <modules>

+     <module>common</module>

+     <module>icu</module>

+     <module>kuromoji</module>

+     <module>morfologik</module>

+     <module>nori</module>

+     <module>opennlp</module>

+     <module>phonetic</module>

+     <module>smartcn</module>

+     <module>stempel</module>

+   </modules>

+ </project>

file added
+82
@@ -0,0 +1,82 @@ 

+ <?xml version="1.0" encoding="UTF-8"?>

+ <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>

+ 

+   <groupId>org.apache.lucene</groupId>

+   <artifactId>lucene-parent</artifactId>

+   <version></version>

+ 

+   <packaging>pom</packaging>

+ 

+   <name>Lucene parent POM</name>

+   <description>Lucene parent POM</description>

+ 

+   <properties>

+     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+   </properties>

+ 

+   <modules>

+     <module>analysis</module>

+     <module>backward-codecs</module>

+     <module>benchmark</module>

+     <module>classification</module>

+     <module>codecs</module>

+     <module>core</module>

+     <module>demo</module>

+     <module>expressions</module>

+     <module>facet</module>

+     <module>grouping</module>

+     <module>highlighter</module>

+     <module>join</module>

+     <module>luke</module>

+     <module>memory</module>

+     <module>misc</module>

+     <module>monitor</module>

+     <module>queries</module>

+     <module>queryparser</module>

+     <module>replicator</module>

+     <module>sandbox</module>

+     <module>spatial3d</module>

+     <module>suggest</module>

+     <module>test-framework</module>

+   </modules>

+ 

+   <dependencies>

+     <dependency>

+       <groupId>junit</groupId>

+       <artifactId>junit</artifactId>

+       <version>SYSTEM</version>

+       <scope>test</scope>

+     </dependency>

+   </dependencies>

+ 

+   <build>

+     <sourceDirectory>src/java</sourceDirectory>

+     <testSourceDirectory>src/test</testSourceDirectory>

+     <plugins>

+       <plugin>

+         <groupId>org.apache.maven.plugins</groupId>

+         <artifactId>maven-compiler-plugin</artifactId>

+         <version>SYSTEM</version>

+         <configuration>

+           <source>11</source>

+           <target>11</target>

+           <excludes>

+             <exclude>test/</exclude>

+           </excludes>

+         </configuration>

+       </plugin>

+       <plugin>

+         <groupId>org.apache.maven.plugins</groupId>

+         <artifactId>maven-surefire-plugin</artifactId>

+         <version>SYSTEM</version>

+       </plugin>

+     </plugins>

+     <resources>

+       <resource>

+         <directory>${project.basedir}/src/resources</directory>

+       </resource>

+     </resources>

+   </build>

+ </project>

file added
+7
@@ -0,0 +1,7 @@ 

+ import org.apache.lucene.codecs.Codec;

+ 

+ class Smoke {

+     public static void main(String[] args) {

+         System.out.println(Codec.availableCodecs());

+     }

+ }

file added
+8
@@ -0,0 +1,8 @@ 

+ summary: Basic smoke test

+ prepare:

+   how: install

+   package: java-devel

+ execute:

+   script: |

+     javac --class-path $(echo /usr/share/java/lucene/*.jar | tr ' ' ':') plans/Smoke.java -d plans

+     java --class-path $(echo /usr/share/java/lucene/*.jar | tr ' ' ':'):plans Smoke

file modified
+32 -1
@@ -1,1 +1,32 @@ 

- SHA512 (solr-8.8.2-src.tgz) = 0cd7a49107883dededcdd84af7cd3d810fcf88a5e22dace8554c8ef105692837bb527d8478e63a196b889246b11e893e4518c487e68260b5c53ba6de23e44f19

+ SHA512 (lucene-9.2.0-src.tgz) = 4297b59c231c8dcc5d201d2623f762a8fc5af2655eb8dbc1a8d1399d4792be9e85fce806a77105e4711dd01b344da47cb9b1a512a43576c379951e8a89078d83

+ SHA512 (lucene-analysis-common-9.2.0.pom) = 4d9ea75193552cd3d042a441d6f7a6de982c57fdce89cd21b3fa6b9f42ab83bc279f992ce3dc12aa2ca7e293f075897caeeac0b47f82f79fd613d7b1e9703440

+ SHA512 (lucene-analysis-icu-9.2.0.pom) = f18aad054692582cbf369ef172966df88c02a0cde6533c1d44430e2a3902be306a433d9cb3e8a2ac906cade9bff8ae6d8837a102a03d5e00cbc544092ba91b10

+ SHA512 (lucene-analysis-kuromoji-9.2.0.pom) = bb71437fcd3f09492c586fa12930e07a76e7bb302dfc1652683da4bd4aa123500fbc723641577458c11a2bc4622df8e729acab4486b017c894e6b84cb442e4d6

+ SHA512 (lucene-analysis-morfologik-9.2.0.pom) = 3910a4c639dc07b0c98a4982a493d55f41042b2c584e0127d63bf2cf986934911235f70d4e346227fa3dd6107e0b56ff4f87ce19056dcd9bf58611617cff425d

+ SHA512 (lucene-analysis-nori-9.2.0.pom) = c14fbfa2df77cd862b63d29a443f0833d18752675bce9f79a15a75937a6c4d614751d30055f6a9c91711ef5b4e12cb7ac62f4926195123b23b5fff53d5fa76f6

+ SHA512 (lucene-analysis-opennlp-9.2.0.pom) = 52155f84b6f7da3a71f8198f31f31e026913a78381c475d432ece902c02ea0a39fd0132db8a5a0f4fd4cca6514ce8b05bcfbeda80b42ece96f5cdd3bc3a9a33d

+ SHA512 (lucene-analysis-phonetic-9.2.0.pom) = a50669d0d17fd8aa153f143c28e691702f6642d01d8951a98af606bad9cebae5f26d9bc7fac66ec4368adcec7d00656d03a355d4423f5409e41b906a7c41f0dc

+ SHA512 (lucene-analysis-smartcn-9.2.0.pom) = 316cfbb6123dc34fe3e41e6af232a99fa4a6dd45a7602c76370eb111aa72e12007df6b4457d89603a4ce460ff2fce60c9f753052742cd2c992118f6b0ce4df77

+ SHA512 (lucene-analysis-stempel-9.2.0.pom) = 5010add521fa8de6f1f5c93ad39c4d88c879756d303cce9083af4688c9d81ff8d9d1017a5d73044010592ac90cf538bb01c2daa992cc7b6f80dc5f14cc9773fa

+ SHA512 (lucene-backward-codecs-9.2.0.pom) = 3f89c11092e7e30bfbfc4877bf14ad22385a38e821f04c90b03cfdcbfd0ffb6a9c757ec70d4f5ee656a60de0395b477d9ae2e0b4fdbf34af4e89131ca19c8227

+ SHA512 (lucene-benchmark-9.2.0.pom) = c28c80eed2f85fe3f319be921a66be36c65502feeb4b83844868929dc87b4cc4cd1f120de5b99c537ef76701e3539ebe9915c4d1ed9487e605415e10ec328c0e

+ SHA512 (lucene-classification-9.2.0.pom) = 64c4f35bca9f27eb03accb4435c26115910c7e2f678d3979753c93908ff3030b7131138275ca979a248536170a28ea5ae066eee95927ef3800869465561082d0

+ SHA512 (lucene-codecs-9.2.0.pom) = d1595952f11bfe278e5817e2681a2c2c0a5ee10bb690dedc34b35f69718048694311722dc7a7d4023b97a279b34a27cbf8f17815424e5d061ea65d14594587f4

+ SHA512 (lucene-core-9.2.0.pom) = ab9dd97044b9d17d634298aed480c0ce4e7a34cb94856f8d5186c1068ddc441b4f60020fe2cfa319342946f3de27423da29c7d5ddee2d99270cef7208f1425ae

+ SHA512 (lucene-demo-9.2.0.pom) = 3569233983dd2ce557042dc6dce01232e3d0f51280b807cbabc7c860a636a18bb8838d2dee9548feb5fa209dc57336af99df83c502019feca4c64f5c3d343291

+ SHA512 (lucene-expressions-9.2.0.pom) = d9914d94d2d46f41bcf3250a3c0efafefbeb8202f0d16cc19e48d78ffa70dfb2700f7f450816cc38642626ae0640fff258b450b17c7b7023ded23659e06db1af

+ SHA512 (lucene-facet-9.2.0.pom) = 4c65e3bbe2d444c76ce7247d8685313ef36c2c44f691a605be56286eb577faf323d81e28942f0eba6d13521302562f27ef729aa263dd710c1f2555c6c790016a

+ SHA512 (lucene-grouping-9.2.0.pom) = bbd288ea3633e7a882a563277704cc82b3b766b1bef175ebbd5c5eaefe052c2ba1beb104c598d3476cfba262d667e33321506162fa6c93d06219119fd4bc859e

+ SHA512 (lucene-highlighter-9.2.0.pom) = 73b885bf2324594c45780a9f917dfd088f4b7330cf3559acce738a51ba07d4cc908d9e890df8af87d52266b302cf613ac7e029bad26a6bad88778a351da83e97

+ SHA512 (lucene-join-9.2.0.pom) = fa113b0e30f5af6149c67e5a7af7dc97346560fae0352e67bc6c426ce161b9d18daa8084517b90edf0da325d23f2a1995afd201d901218a3ed8c9950df0c074a

+ SHA512 (lucene-luke-9.2.0.pom) = e9bfa68f04623123cff09b71482c410c5ea214ef1be9279101c13d02e8d0c9764ad984f741c1eaa4cec408bddafd56946cb2391db306d225c0031a0428f74afb

+ SHA512 (lucene-memory-9.2.0.pom) = cd5f81d1f07f50d73fda2aaff08defd072b70c6920b1ed3a0d610dcbaab97939d20e3440680b44839c36842683810c636a13bc40542c8a1892edcd25719d32d8

+ SHA512 (lucene-misc-9.2.0.pom) = 9ad50afcf274d8c4535334d8b0eadab5134acc7023e42309d5484bec2f87c34e88b1f1e183f0fe0bf2f6448a40fd54f38a043d8c5d1bbfd95f785a22631696a0

+ SHA512 (lucene-monitor-9.2.0.pom) = 1ca0798661757230cc312774cd1f8d024c52b98017f0d22ad1081cc30b07f622723bfa25552c5a60d51e7cd9856e386da8dd08098f10a6a24183400c5d66872b

+ SHA512 (lucene-queries-9.2.0.pom) = 653d50f2aca3285f4b403e7f267d5663a399913dc5faba4ae82704e6a24ae6e85c8ec2ddbf07dd35f3b974f80cc353ddacd8b696e855cdc2e67970c5d1310b95

+ SHA512 (lucene-queryparser-9.2.0.pom) = 781f26e04b8871b2769ee0b17874395c256652bda92d66275cafe308c492991dd7098f358a6854b470fcfd877f0d835617e721382cbe9c948bbe2f612087d7fe

+ SHA512 (lucene-replicator-9.2.0.pom) = a862cd280d1aa43cdc1adbadc5b216715eb4274edceda92e4f53ebebeeb352962ff77b6bc543f2b101d73b9f82c9ba2cfbe712d90c38db1c2b5a199d5b6994ea

+ SHA512 (lucene-sandbox-9.2.0.pom) = 968be58ade3a84a5e0ce2affe0532e761ffddfb866f9abc8755e3da3a6a517b431b06896c2f80dc1346677f04426e4fd5fb26a6b75530d9d1825ca37b416d957

+ SHA512 (lucene-spatial3d-9.2.0.pom) = f249368c8a61d55199afe6287eda306a73e7d477b7c448afc911506da6c20f7d621f0259b91704599b2ae6e6a85d5422ff09295f4b64f550a39c981724daed78

+ SHA512 (lucene-suggest-9.2.0.pom) = 299295b9ca7801205b833211398adcf2efdaae43ce17582a1b369f4b2a49cc8a7237bb6366276f312d54a8360831f51de976657cf83207aaaed2ab9b69b842c5

+ SHA512 (lucene-test-framework-9.2.0.pom) = 27cfce075cb25f8bdfe5e31a9367333ff5ccb4021419a5eaaab1986eb3273ac2e99cbe6fb5c6b6e728c2487adef5073fd50a21a8012023797201f2936546cf95

no initial comment

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

rebased onto 5c76b3b

7 months ago

rebased onto 90498bd

7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
7 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
6 months ago

2 new commits added

  • Add gating smoke test
  • Update to upstream version 9.2.0
6 months ago

rebased onto ede9a4b

6 months ago

Pull-Request has been merged by mkoncek

6 months ago