Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lucene for openSUSE:Factory checked in at 2023-09-20 13:30:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene (Old) and /work/SRC/openSUSE:Factory/.lucene.new.16627 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene" Wed Sep 20 13:30:41 2023 rev:35 rq:1112364 version:8.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lucene/lucene.changes 2023-08-23 14:58:37.258098136 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene.changes 2023-09-20 13:34:26.725942995 +0200 @@ -1,0 +2,551 @@ +Tue Sep 19 17:09:29 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 8.11.2 + * API Changes + + LUCENE-9265: SimpleFSDirectory is deprecated in favor of + NIOFSDirectory. + + LUCENE-9304: Removed ability to set + DocumentsWriterPerThreadPool on IndexWriterConfig. + The DocumentsWriterPerThreadPool is a packaged protected final + class which made it impossible to customize. + + LUCENE-9339: MergeScheduler#merge doesn't accept a parameter + if a new merge was found anymore. + + LUCENE-9330: SortFields are now responsible for writing + themselves into index headers if they are used as index sorts. + + LUCENE-9340: Deprecate SimpleBindings#add(SortField). + + LUCENE-9345: MergeScheduler is now decoupled from IndexWriter. + Instead it accepts a MergeSource interface that offers the + basic methods to acquire pending merges, run the merge and do + accounting around it. + + LUCENE-9349: QueryVisitor.consumeTermsMatching() now takes a + Supplier<ByteRunAutomaton> to enable queries that build large + automata to provide them lazily. TermsInSetQuery switches to + using this method to report matching terms. + + LUCENE-9366: DocValues.emptySortedNumeric() no longer takes a + maxDoc parameter + + LUCENE-7822: CodecUtil#checkFooter(IndexInput, Throwable) now + throws a CorruptIndexException if checksums mismatch or if + checksums can't be verified. + + LUCENE-7020: TieredMergePolicy#setMaxMergeAtOnceExplicit is + deprecated and the number of segments that get merged via + explicit merges is unlimited by default. + + LUCENE-9437: Lucene's facet module's + DocValuesOrdinalsReader.decode method is now public, making it + easier for applications to decode facet ordinals into their + corresponding labels + + LUCENE-9449: Field comparators for numeric fields and _doc + were moved to their own package. TopFieldCollector sets + TotalHits.relation to GREATER_THAN_OR_EQUAL_TO, as soon as the + requested total hits threshold is reached, even though in some + cases no skipping optimization is applied and all hits are + collected. + + LUCENE-9515: IndexingChain now accepts individual primitives + rather than a DocumentsWriterPerThread instance in order to + create a new DocConsumer. + + LUCENE-9680: Removed deprecation warning from + IndexWriter#getFieldNames(). + + LUCENE-9902: Change the getValue method from IntTaxonomyFacets + to be protected instead of private. Users can now access the + count of an ordinal directly without constructing an extra + FacetLabel. Also use variable length arguments for the + getOrdinal call in TaxonomyReader. + + LUCENE-9962: DrillSideways allows sub-classes to provide + "drill down" FacetsCollectors. They may provide a null + collector if they choose to bypass "drill down" facet + collection. + + LUCENE-10027: Add a new Directory reader open API from + indexCommit and a custom comparator for sorting leaf readers + + LUCENE-10036: Replaced the ScoreCachingWrappingScorer ctor + with a static factory method that ensures unnecessary wrapping + doesn't occur. + * New Features + + LUCENE-7889: Grouping by range based on values from + DoubleValuesSource and LongValuesSource + + LUCENE-8962: Add IndexWriter merge-on-commit feature to + selectively merge small segments on commit, subject to a + configurable timeout, to improve search performance by + reducing the number of small segments for searching + + LUCENE-8962: Add IndexWriter merge-on-refresh feature to + selectively merge small segments on getReader, subject to a + configurable timeout, to improve search performance by + reducing the number of small segments for searching. + + LUCENE-9378: Doc values now allow configuring how to trade + compression for retrieval speed. + + LUCENE-9385: Add FacetsConfig option to control which + drill-down terms are indexed for a FacetLabel + + LUCENE-9386: RegExpQuery added case insensitive matching + option. + + LUCENE-9413: Add CJKWidthCharFilter and its factory + + LUCENE-9444: Add utility class to retrieve facet labels from + the taxonomy index for a facet field so such fields do not + also have to be redundantly stored + + LUCENE-9484: Allow sorting an index after it was created. + With SortingCodecReader, existing unsorted segments can be + wrapped and merged into a fresh index using + IndexWriter#addIndices API. + + LUCENE-9507: Custom order for leaves in IndexReader and + IndexWriter + + LUCENE-9537: Added smoothingScore method and default + implementation to Scorable abstract class. The smoothing score + allows scorers to calculate a score for a document where the + search term or subquery is not present. The smoothing score + acts like an idf so that documents that do not have terms or + subqueries that are more frequent in the index are not + penalized as much as documents that do not have less frequent + terms or subqueries and prevents scores which are the product + or terms or subqueries from going to zero. Added the + implementation of the Indri AND and the + IndriDirichletSimilarity from the academic Indri search + engine: http://www.lemurproject.org/indri.php. + + LUCENE-9552: New LatLonPoint query that accepts an array of + LatLonGeometries. + + LUCENE-9553: New XYPoint query that accepts an array of + XYGeometries. + + LUCENE-9572: TypeAsSynonymFilter has been enhanced support + ignoring some types, and to allow the generated synonyms to + copy some or all flags from the original token + + LUCENE-9574 A token filter to drop tokens that match all + specified flags. + + LUCENE-9575: PatternTypingFilter has been added to allow + setting a type attribute on tokens based on a configured set + of regular expressions + + LUCENE-9594: FeatureField supports newLinearQuery that for + scoring uses raw indexed values of features without any + transformation. + + LUCENE-9641: LatLonPoint query support for spatial + relationships. + + LUCENE-9694: New tool for creating a deterministic index to + enable benchmarking changes on a consistent multi-segment + index even when they require re-indexing. + + LUCENE-9950: New facet counting implementation for general + string doc value fields (SortedSetDocValues / SortedDocValues) + not created through FacetsConfig + + LUCENE-10035: The SimpleText codec now writes skip lists. + + LUCENE-10083: Analyzer and stemmer for Telugu language + * Improvements + + LUCENE-9276: Use same code-path for updateDocuments and + updateDocument in IndexWriter and DocumentsWriter. + + LUCENE-9279: Update dictionary version for Ukrainian analyzer + to 4.9.1 + + LUCENE-8050: PerFieldDocValuesFormat should not get the + DocValuesFormat on a field that has no doc values. + + LUCENE-9304: Removed ThreadState abstraction from + DocumentsWriter which allows pooling of DWPT directly and + improves the approachability of the IndexWriter code. + + LUCENE-9324: Add an ID to SegmentCommitInfo in order to + compare commits for equality and make snapshots incremental on + generational files. + + LUCENE-9342: TotalHits' relation will be EQUAL_TO when the + number of hits is lower than TopDocsColector's numHits + + LUCENE-9353: Metadata of the terms dictionary moved to its own + file, with the '.tmd' extension. This allows checksums of + metadata to be verified when opening indices and helps save + seeks when opening an index. + + LUCENE-9359: SegmentInfos#readCommit now always returns a + CorruptIndexException if the content of the file is invalid. + + LUCENE-9393: Make FunctionScoreQuery use ScoreMode.COMPLETE + for creating the inner query weight when ScoreMode.TOP_DOCS + is requested. + + LUCENE-9392: Make FacetsConfig.DELIM_CHAR publicly accessible + + LUCENE-9397: UniformSplit supports encodable fields metadata. + + LUCENE-9396: Improved truncation detection for points. + + LUCENE-9402: Let MultiCollector handle minCompetitiveScore + + LUCENE-8574: Add a new ExpressionValueSource which will + enforce only one value per name per hit in dependencies, + ExpressionFunctionValues will no longer recompute already + computed values + + LUCENE-9416: Fix CheckIndex to print an invalid non-zero norm + as unsigned long when detecting corruption. + + LUCENE-9440: FieldInfo#checkConsistency called twice from + Lucene50(60)FieldInfosFormat#read; Removed the (redundant?) + assert and do these checks for real. + + LUCENE-9446: In BooleanQuery rewrite, always remove + MatchAllDocsQuery filter clauses when possible. + + LUCENE-9501: Improve coverage for Asserting* test classes: + make sure to handle singleton doc values, and sometimes + exercise Weight#scorer instead of Weight#bulkScorer for + top-level queries. + + LUCENE-9511: Include StoredFieldsWriter in DWPT accounting + to ensure that it's heap consumption is taken into account + when IndexWriter stalls or should flush DWPTs. + + LUCENE-9514: Include TermVectorsWriter in DWPT accounting to + ensure that it's heap consumption is taken into account when + IndexWriter stalls or should flush DWPTs. + + LUCENE-9523: In query shapes over shape fields, skip points + while traversing the BKD tree when the relationship with the + document is already known. + + LUCENE-9539: Use more compact datastructures to represent + sorted doc-values in memory when sorting a segment before + flush and in SortingCodecReader. + + LUCENE-9458: WordDelimiterGraphFilter should order tokens at + the same position by endOffset to emit longer tokens first. + The same graph is produced. + + LUCENE-5309: Optimize facet counting for single-valued + SSDV / StringValueFacetCounts. + + LUCENE-9023: GlobalOrdinalsWithScore should not compute + occurrences when the provided min is 1. + + LUCENE-9177: ICUNormalizer2CharFilter no longer requires + normalization-inert characters as boundaries for incremental + processing, vastly improving worst-case performance. + + LUCENE-9455: ExitableTermsEnum should sample timeout and + interruption check before calling next(). + + LUCENE-9662: Make CheckIndex concurrent by parallelizing + index check across segments. + + LUCENE-9663: Add compression to terms dict from + SortedSet/Sorted DocValues. + + LUCENE-9675: Binary doc values fields now expose their + configured compression mode in the attributes of the field + info. + + LUCENE-9725: BM25FQuery was extended to handle similarities + beyond BM25Similarity. It was renamed to CombinedFieldQuery to + reflect its more general scope. + + LUCENE-9877: Reduce index size by increasing allowable + exceptions in PForUtil from 3 to 7. + + LUCENE-9687: Hunspell support improvements: add API for + spell-checking and suggestions, support compound words, fix + various behavior differences between Java and C++ + implementations, improve performance + + LUCENE-9917: The BEST_SPEED compression mode now trades more + compression ratio in exchange of faster reads. + + LUCENE-9935: Enable bulk merge for stored fields with index sort. + + LUCENE-9944: Allow DrillSideways users to provide their own + CollectorManager without also requiring them to provide an + ExecutorService. + + LUCENE-9945: Extend DrillSideways to support exposing + FacetCollectors directly. + + LUCENE-9946: Support for multi-value fields in + LongRangeFacetCounts and DoubleRangeFacetCounts. + + LUCENE-9965: Added QueryProfilerIndexSearcher and + ProfilerCollector to support debugging query execution + strategy and timing. + + LUCENE-9981: Operations.getCommonSuffix/Prefix(Automaton) is + now much more efficient, from a worst case exponential down to + quadratic cost in the number of states + transitions in the + Automaton. These methods no longer use the costly determinize + method, removing the risk of TooComplexToDeterminizeException + + LUCENE-9981: Operations.determinize now throws + TooComplexToDeterminizeException based on too much "effort" + spent determinizing rather than a precise state count on the + resulting returned automaton, to better handle adversarial + cases like det(rev(regexp("(.*a){2000}"))) that spend lots of + effort but result in smallish eventual returned automata. + + LUCENE-9983: Stop sorting determinize powersets unnecessarily. + + LUCENE-10030: Lazily evaluate score in + DrillSidewaysScorer.doQueryFirstScoring + + LUCENE-10043: Decrease default for LRUQueryCache's + skipCacheFactor to 10. This prevents caching a query clause + when it is much more expensive than running the top-level + query. + + LUCENE-10103: Make QueryCache respect Accountable queries + * Optimizations + + LUCENE-9254: UniformSplit keeps FST off-heap. + + LUCENE-8103: DoubleValuesSource and QueryValueSource now use a + TwoPhaseIterator if one is provided by the Query. + + LUCENE-9287: UsageTrackingQueryCachingPolicy no longer caches + DocValuesFieldExistsQuery. + + LUCENE-9286: FST.Arc.BitTable reads directly FST bytes. Arc is + lightweight again and FSTEnum traversal faster. + + LUCENE-7788: fail precommit on unparameterised log messages + and examine for wasted work/objects + + LUCENE-9273: Speed up geometry queries by specialising + Component2D spatial operations. Instead of using a generic + relate method for all relations, we use specialize methods for + each one. In addition, the type of triangle is computed at + deserialization time, therefore we can be more selective when + decoding points of a triangle. + + LUCENE-9087: Build always trees with full leaves and lower the + default value for maxPointsPerLeafNode to 512. + + LUCENE-9148: Points now write their index in a separate file. + + LUCENE-9280: Add an ability for field comparators to skip + non-competitive documents. Creating a TopFieldCollector with + totalHitsThreshold less than Integer.MAX_VALUE instructs + Lucene to skip non-competitive documents whenever possible. + For numeric sort fields the skipping functionality works when + the same field is indexed both with doc values and points. + To indicate that the same data is stored in these points and + doc values SortField#setCanUsePoints method should be used. + + LUCENE-9395: ConstantValuesSource now shares a single + DoubleValues instance across all segments + + LUCENE-9447, LUCENE-9486: Stored fields now get higer + compression ratios on highly compressible data. + + LUCENE-9373: FunctionMatchQuery now accepts a "matchCost" + optimization hint. + + LUCENE-9510: Indexing with an index sort is now faster by not + compressing temporary representations of the data. + + LUCENE-9449: Enhance DocComparator to provide an iterator over + competitive documents when searching with "after". This + iterator can quickly position on the desired "after" document + skipping all documents and segments before "after". + + LUCENE-9021: QueryParser: re-use the LookaheadSuccess + exception. + + LUCENE-9346: WANDScorer now supports queries that have a + 'minimumNumberShouldMatch' configured. + + LUCENE-9536: Reduced memory usage for OrdinalMap when a + segment has all values. + + LUCENE-9636: Faster decoding of postings for some numbers of + bits per value. + + LUCENE-9673: Substantially improve RAM efficiency of how + MemoryIndex stores postings in memory, and reduced a bit of + RAM overhead in IndexWriter's internal postings book-keeping + + LUCENE-9827: Speed up merging of stored fields and term + vectors for smaller segments. + + LUCENE-9932: Performance improvement for BKD index building + + LUCENE-9996: Improved memory efficiency of IndexWriter's RAM + buffer, in particular in the case of many fields and many + indexing threads. + + LUCENE-10014: Lucene90DocValuesFormat was using too many bits + per value when compressing via gcd, unnecessarily wasting ++++ 254 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/lucene/lucene.changes ++++ and /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene.changes Old: ---- lucene-8.5.0-src.tgz lucene-analyzers-common-8.5.0.pom lucene-analyzers-smartcn-8.5.0.pom lucene-analyzers-stempel-8.5.0.pom lucene-backward-codecs-8.5.0.pom lucene-classification-8.5.0.pom lucene-codecs-8.5.0.pom lucene-core-8.5.0.pom lucene-grouping-8.5.0.pom lucene-highlighter-8.5.0.pom lucene-java8compat.patch lucene-join-8.5.0.pom lucene-memory-8.5.0.pom lucene-misc-8.5.0.pom lucene-monitor-8.5.0.pom lucene-queries-8.5.0.pom lucene-queryparser-8.5.0.pom lucene-sandbox-8.5.0.pom lucene-spatial3d-8.5.0.pom New: ---- lucene-8.11.2-src.tgz lucene-analyzers-common-8.11.2.pom lucene-analyzers-smartcn-8.11.2.pom lucene-analyzers-stempel-8.11.2.pom lucene-backward-codecs-8.11.2.pom lucene-classification-8.11.2.pom lucene-codecs-8.11.2.pom lucene-core-8.11.2.pom lucene-grouping-8.11.2.pom lucene-highlighter-8.11.2.pom lucene-join-8.11.2.pom lucene-memory-8.11.2.pom lucene-misc-8.11.2.pom lucene-monitor-8.11.2.pom lucene-parent-8.11.2.pom lucene-queries-8.11.2.pom lucene-queryparser-8.11.2.pom lucene-sandbox-8.11.2.pom lucene-spatial3d-8.11.2.pom lucene-timestamps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene.spec ++++++ --- /var/tmp/diff_new_pack.NploGE/_old 2023-09-20 13:34:30.506078420 +0200 +++ /var/tmp/diff_new_pack.NploGE/_new 2023-09-20 13:34:30.506078420 +0200 @@ -17,7 +17,7 @@ Name: lucene -Version: 8.5.0 +Version: 8.11.2 Release: 0 Summary: Text search engine License: Apache-2.0 @@ -41,12 +41,13 @@ Source16: https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom Source17: https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom Source18: https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/%{version}/lucene-core-%{version}.pom +Source19: https://repo1.maven.org/maven2/org/apache/lucene/lucene-parent/%{version}/lucene-parent-%{version}.pom Patch0: 0001-Disable-ivy-settings.patch Patch1: 0002-Dependency-generation.patch -Patch2: lucene-java8compat.patch -Patch3: lucene-osgi-manifests.patch -Patch4: lucene-missing-dependencies.patch -Patch5: lucene-nodoclint.patch +Patch2: lucene-osgi-manifests.patch +Patch3: lucene-missing-dependencies.patch +Patch4: lucene-nodoclint.patch +Patch5: lucene-timestamps.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 BuildRequires: antlr-java @@ -60,7 +61,7 @@ BuildRequires: git BuildRequires: java-devel >= 1.8 BuildRequires: javacc -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: junit BuildRequires: regexp BuildRequires: zip @@ -94,9 +95,6 @@ %package queryparser Summary: Queryparser module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-queries) -Requires: mvn(org.apache.lucene:lucene-sandbox) BuildArch: noarch %description queryparser @@ -108,7 +106,6 @@ %package join Summary: Join module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description join @@ -120,7 +117,6 @@ %package queries Summary: Queries module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description queries @@ -132,10 +128,6 @@ %package classification Summary: Classification module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-grouping) -Requires: mvn(org.apache.lucene:lucene-queries) BuildArch: noarch %description classification @@ -147,7 +139,6 @@ %package codecs Summary: Codecs module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description codecs @@ -159,7 +150,6 @@ %package backward-codecs Summary: Backward-codecs module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description backward-codecs @@ -171,8 +161,6 @@ %package grouping Summary: Grouping module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-queries) BuildArch: noarch %description grouping @@ -184,9 +172,6 @@ %package highlighter Summary: Highlighter module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-join) -Requires: mvn(org.apache.lucene:lucene-memory) BuildArch: noarch %description highlighter @@ -198,7 +183,6 @@ %package memory Summary: Memory module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description memory @@ -210,7 +194,6 @@ %package misc Summary: Misc module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) %description misc Apache Lucene is a full-text search engine written entirely in Java. @@ -221,7 +204,6 @@ %package sandbox Summary: Sandbox module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description sandbox @@ -233,7 +215,6 @@ %package spatial3d Summary: Spatial3d module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description spatial3d @@ -245,10 +226,6 @@ %package monitor Summary: Spatial module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-memory) -Requires: mvn(org.apache.lucene:lucene-queryparser) BuildArch: noarch %description monitor @@ -260,7 +237,6 @@ %package analyzers-common Summary: Analyzers-common module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) Provides: %{name}-analysis = %{version}-%{release} Obsoletes: %{name}-analysis < %{version}-%{release} BuildArch: noarch @@ -274,8 +250,6 @@ %package analyzers-smartcn Summary: Analyzers-smartcn module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description analyzers-smartcn @@ -287,8 +261,6 @@ %package analyzers-stempel Summary: Analyzers-stempel module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description analyzers-stempel @@ -301,8 +273,6 @@ %package facet Summary: Facet module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-queries) BuildArch: noarch %description facet @@ -314,9 +284,6 @@ %package analyzers-icu Summary: Lucene ICU Analysis Components Group: Development/Libraries/Java -Requires: mvn(com.ibm.icu:icu4j) -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description analyzers-icu @@ -328,8 +295,6 @@ %package analyzers-kuromoji Summary: Lucene Kuromoji Japanese Morphological Analyzer Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description analyzers-kuromoji @@ -340,11 +305,6 @@ %package analyzers-morfologik Summary: Lucene Morfologik Polish Lemmatizer Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.carrot2:morfologik-fsa) -Requires: mvn(org.carrot2:morfologik-polish) -Requires: mvn(org.carrot2:morfologik-stemming) BuildArch: noarch %description analyzers-morfologik @@ -356,9 +316,6 @@ %package analyzers-phonetic Summary: Lucene Phonetic Filters Group: Development/Libraries/Java -Requires: mvn(commons-codec:commons-codec) -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description analyzers-phonetic @@ -369,11 +326,6 @@ %package analyzers-uima Summary: Lucene UIMA Analysis Components Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.uima:Tagger) -Requires: mvn(org.apache.uima:WhitespaceTokenizer) -Requires: mvn(org.apache.uima:uimaj-core) BuildArch: noarch %description analyzers-uima @@ -386,21 +338,6 @@ %package benchmark Summary: Lucene Benchmarking Module Group: Development/Libraries/Java -Requires: mvn(com.ibm.icu:icu4j) -Requires: mvn(net.sourceforge.nekohtml:nekohtml) -Requires: mvn(org.apache.commons:commons-compress) -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-codecs) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-facet) -Requires: mvn(org.apache.lucene:lucene-highlighter) -Requires: mvn(org.apache.lucene:lucene-join) -Requires: mvn(org.apache.lucene:lucene-memory) -Requires: mvn(org.apache.lucene:lucene-queries) -Requires: mvn(org.apache.lucene:lucene-queryparser) -Requires: mvn(org.apache.lucene:lucene-spatial-extras) -Requires: mvn(org.locationtech.spatial4j:spatial4j) -Requires: mvn(xerces:xercesImpl) BuildArch: noarch %description benchmark @@ -411,13 +348,6 @@ %package demo Summary: Lucene Demo Module Group: Development/Libraries/Java -Requires: mvn(javax.servlet:servlet-api) -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-expressions) -Requires: mvn(org.apache.lucene:lucene-facet) -Requires: mvn(org.apache.lucene:lucene-queries) -Requires: mvn(org.apache.lucene:lucene-queryparser) BuildArch: noarch %description @@ -428,10 +358,6 @@ %package expressions Summary: Lucene Expressions Module Group: Development/Libraries/Java -Requires: mvn(org.antlr:antlr4-runtime) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.ow2.asm:asm) -Requires: mvn(org.ow2.asm:asm-commons) BuildArch: noarch %description expressions @@ -443,18 +369,6 @@ %package replicator Summary: Lucene Replicator Module Group: Development/Libraries/Java -Requires: mvn(commons-logging:commons-logging) -Requires: mvn(javax.servlet:javax.servlet-api) -Requires: mvn(org.apache.httpcomponents:httpclient) -Requires: mvn(org.apache.httpcomponents:httpcore) -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-facet) -Requires: mvn(org.eclipse.jetty:jetty-continuation) -Requires: mvn(org.eclipse.jetty:jetty-http) -Requires: mvn(org.eclipse.jetty:jetty-io) -Requires: mvn(org.eclipse.jetty:jetty-server) -Requires: mvn(org.eclipse.jetty:jetty-servlet) -Requires: mvn(org.eclipse.jetty:jetty-util) BuildArch: noarch %description replicator @@ -465,9 +379,6 @@ %package spatial-extras Summary: Spatial Strategies for Apache Lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-core) -Requires: mvn(org.apache.lucene:lucene-spatial3d) -Requires: mvn(org.locationtech.spatial4j:spatial4j) BuildArch: noarch %description spatial-extras @@ -478,8 +389,6 @@ %package suggest Summary: Lucene Suggest Module Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description suggest @@ -490,10 +399,6 @@ %package test-framework Summary: Apache Lucene Java Test Framework Group: Development/Libraries/Java -Requires: mvn(com.carrotsearch.randomizedtesting:randomizedtesting-runner) -Requires: mvn(junit:junit) -Requires: mvn(org.apache.lucene:lucene-codecs) -Requires: mvn(org.apache.lucene:lucene-core) BuildArch: noarch %description test-framework @@ -563,10 +468,7 @@ 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 - cp %{_sourcedir}/%{name}-${mod}-%{version}.pom build/${mod}/pom.xml - %pom_remove_parent build/${mod} - %pom_xpath_inject "pom:project" "<version>%{version}</version>" build/${mod} - install -p -m 0644 build/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom + %{mvn_install_pom} %{_sourcedir}/%{name}-${mod}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom %add_maven_depmap %{name}/%{name}-${mod}.pom %{name}/%{name}-${mod}.jar -f ${mod} echo %{_javadir}/%{name}-$mod.jar >> .mfiles-${mod} done @@ -576,10 +478,7 @@ do install -p -m 0644 build/${mod}/%{name}-$mod-%{version}.jar %{buildroot}%{_jnidir}/%{name}/%{name}-$mod.jar ln -sf %{name}/%{name}-$mod.jar %{buildroot}%{_jnidir}/%{name}-$mod.jar - cp %{_sourcedir}/%{name}-${mod}-%{version}.pom build/${mod}/pom.xml - %pom_remove_parent build/${mod} - %pom_xpath_inject "pom:project" "<version>%{version}</version>" build/${mod} - install -p -m 0644 build/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom + %{mvn_install_pom} %{_sourcedir}/%{name}-${mod}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom %add_maven_depmap %{name}/%{name}-${mod}.pom %{name}/%{name}-${mod}.jar -f ${mod} echo %{_jnidir}/%{name}-$mod.jar >> .mfiles-${mod} done @@ -589,17 +488,8 @@ do install -p -m 0644 build/analysis/$mod/%{name}-analyzers-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-analyzers-${mod}.jar ln -sf %{name}/%{name}-analyzers-$mod.jar %{buildroot}%{_javadir}/%{name}-analyzers-$mod.jar - cp %{_sourcedir}/lucene-analyzers-${mod}-%{version}.pom build/analysis/$mod/pom.xml - %pom_remove_parent build/analysis/$mod - %pom_xpath_inject "pom:project" "<version>%{version}</version>" build/analysis/$mod - install -p -m 0644 build/analysis/$mod/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-analyzers-${mod}.pom + %{mvn_install_pom} %{_sourcedir}/lucene-analyzers-${mod}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-analyzers-${mod}.pom %add_maven_depmap %{name}/%{name}-analyzers-${mod}.pom %{name}/%{name}-analyzers-${mod}.jar -f analyzers-${mod} echo %{_javadir}/%{name}-analyzers-$mod.jar >> .mfiles-analyzers-${mod} done -# javadoc DOES NOT BUILD BECAUSE OF MISSING MVN DEPS -# javadoc -#install -d -m 0755 %%{buildroot}%%{_javadocdir}/%%{name} -#cp -pr build/docs/api/* \ -# %%{buildroot}%%{_javadocdir}/%%{name} - ++++++ lucene-8.5.0-src.tgz -> lucene-8.11.2-src.tgz ++++++ /work/SRC/openSUSE:Factory/lucene/lucene-8.5.0-src.tgz /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-8.11.2-src.tgz differ: char 13, line 1 ++++++ lucene-analyzers-common-8.5.0.pom -> lucene-analyzers-common-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-common-8.5.0.pom 2020-04-14 16:24:00.827728235 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-analyzers-common-8.11.2.pom 2023-09-20 13:34:26.553936832 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Additional Analyzers</description> <properties> <module-directory>lucene/analysis/common</module-directory> - <relative-top-level>../../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,52 +40,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <resources> - <resource> - <directory>${module-path}/src/resources</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> ++++++ lucene-analyzers-smartcn-8.5.0.pom -> lucene-analyzers-smartcn-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-smartcn-8.5.0.pom 2020-04-14 16:24:00.843728250 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-analyzers-smartcn-8.11.2.pom 2023-09-20 13:34:26.557936976 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Smart Chinese Analyzer</description> <properties> <module-directory>lucene/analysis/smartcn</module-directory> - <relative-top-level>../../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,12 +40,6 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> @@ -57,28 +49,5 @@ <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <resources> - <resource> - <directory>${module-path}/src/resources</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-analyzers-stempel-8.5.0.pom -> lucene-analyzers-stempel-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-stempel-8.5.0.pom 2020-04-14 16:24:00.859728264 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-analyzers-stempel-8.11.2.pom 2023-09-20 13:34:26.565937263 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Stempel Analyzer</description> <properties> <module-directory>lucene/analysis/stempel</module-directory> - <relative-top-level>../../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,12 +40,6 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> @@ -57,28 +49,5 @@ <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <resources> - <resource> - <directory>${module-path}/src/resources</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-backward-codecs-8.5.0.pom -> lucene-backward-codecs-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-backward-codecs-8.5.0.pom 2020-04-14 16:24:00.875728279 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-backward-codecs-8.11.2.pom 2023-09-20 13:34:26.577937692 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -35,8 +35,6 @@ </description> <properties> <module-directory>lucene/backward-codecs</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -44,52 +42,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <resources> - <resource> - <directory>${module-path}/src/resources</directory> - </resource> - </resources> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> ++++++ lucene-classification-8.5.0.pom -> lucene-classification-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-classification-8.5.0.pom 2020-04-14 16:24:00.895728297 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-classification-8.11.2.pom 2023-09-20 13:34:26.585937979 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Lucene Classification</description> <properties> <module-directory>lucene/classification</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -43,12 +41,6 @@ </scm> <dependencies> <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> </dependency> @@ -65,23 +57,5 @@ <artifactId>lucene-queries</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-codecs-8.5.0.pom -> lucene-codecs-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-codecs-8.5.0.pom 2020-04-14 16:24:00.907728308 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-codecs-8.11.2.pom 2023-09-20 13:34:26.589938122 +0200 @@ -23,8 +23,8 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> - <relativePath>../../../pom.xml</relativePath> + <version>8.11.2</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-codecs</artifactId> @@ -35,8 +35,6 @@ </description> <properties> <module-directory>lucene/codecs</module-directory> - <relative-top-level>../../../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}/src/java</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -50,39 +48,4 @@ </dependency> </dependencies> - <build> - <sourceDirectory>${module-path}</sourceDirectory> - <resources> - <resource> - <directory>${module-path}/../resources</directory> - </resource> - </resources> - <testSourceDirectory/> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> <!-- Tests are run from lucene-codecs-tests module --> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <skip>true</skip> <!-- This skips test compilation - tests are run from lucene-codecs-tests module --> - </configuration> - </plugin> - <plugin> - <groupId>de.thetaphi</groupId> - <artifactId>forbiddenapis</artifactId> - <executions> - <execution> - <id>lucene-shared-test-check-forbidden-apis</id> - <phase>none</phase> <!-- Block inherited execution --> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> ++++++ lucene-core-8.5.0.pom -> lucene-core-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-core-8.5.0.pom 2020-04-14 16:24:00.923728323 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-core-8.11.2.pom 2023-09-20 13:34:26.597938409 +0200 @@ -23,8 +23,8 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> - <relativePath>../../../pom.xml</relativePath> + <version>8.11.2</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> @@ -33,47 +33,14 @@ <description>Apache Lucene Java Core</description> <properties> <module-directory>lucene/core</module-directory> - <relative-top-level>../../../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}/src/java</module-path> </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> - <build> - <sourceDirectory>${module-path}</sourceDirectory> - <resources> - <resource> - <directory>${module-path}/../resources</directory> - </resource> - </resources> - <testSourceDirectory/> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> <!-- Tests are run from lucene-codecs-tests module --> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <skip>true</skip> <!-- This skips test compilation - tests are run from lucene-codecs-tests module --> - </configuration> - </plugin> - <plugin> - <groupId>de.thetaphi</groupId> - <artifactId>forbiddenapis</artifactId> - <executions> - <execution> - <id>lucene-shared-test-check-forbidden-apis</id> - <phase>none</phase> <!-- Block inherited execution --> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependencies> + + + </dependencies> </project> ++++++ lucene-grouping-8.5.0.pom -> lucene-grouping-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-grouping-8.5.0.pom 2020-04-14 16:24:00.943728342 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-grouping-8.11.2.pom 2023-09-20 13:34:26.605938695 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Lucene Grouping Module</description> <properties> <module-directory>lucene/grouping</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,12 +40,6 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> @@ -57,23 +49,5 @@ <artifactId>lucene-queries</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-highlighter-8.5.0.pom -> lucene-highlighter-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-highlighter-8.5.0.pom 2020-04-14 16:24:00.955728353 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-highlighter-8.11.2.pom 2023-09-20 13:34:26.613938982 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -35,8 +35,6 @@ </description> <properties> <module-directory>lucene/highlighter</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -44,12 +42,6 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> @@ -63,28 +55,5 @@ <artifactId>lucene-queries</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-join-8.5.0.pom -> lucene-join-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-join-8.5.0.pom 2020-04-14 16:24:01.087728474 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-join-8.11.2.pom 2023-09-20 13:34:26.621939269 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Lucene Join Module</description> <properties> <module-directory>lucene/join</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,34 +40,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-memory-8.5.0.pom -> lucene-memory-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-memory-8.5.0.pom 2020-04-14 16:24:01.103728489 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-memory-8.11.2.pom 2023-09-20 13:34:26.629939555 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -35,8 +35,6 @@ </description> <properties> <module-directory>lucene/memory</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -44,39 +42,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queryparser</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-misc-8.5.0.pom -> lucene-misc-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-misc-8.5.0.pom 2020-04-14 16:24:01.119728503 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-misc-8.11.2.pom 2023-09-20 13:34:26.641939985 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Miscellaneous Lucene extensions</description> <properties> <module-directory>lucene/misc</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,34 +40,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-missing-dependencies.patch ++++++ --- /var/tmp/diff_new_pack.NploGE/_old 2023-09-20 13:34:30.818089598 +0200 +++ /var/tmp/diff_new_pack.NploGE/_new 2023-09-20 13:34:30.822089742 +0200 @@ -83,17 +83,6 @@ <property name="flexmark.version" value="0.42.6"/> <ivy:cachepath transitive="true" resolveId="flexmark" pathid="markdown.classpath"> <ivy:dependency org="com.vladsch.flexmark" name="flexmark" rev="${flexmark.version}" conf="default" /> ---- lucene-8.5.0/core/build.xml 2020-04-06 12:09:05.497250615 +0200 -+++ lucene-8.5.0/core/build.xml 2020-04-06 12:22:08.761487819 +0200 -@@ -222,7 +222,7 @@ - </or> - </condition> - -- <target name="test-lock-factory" depends="resolve-groovy,compile-core" unless="-ignore-test-lock-factory" -+ <target name="test-lock-factory" depends="compile-core" unless="-ignore-test-lock-factory" - description="Run LockStressTest with multiple JVMs"> - <property name="lockverifyserver.host" value="127.0.0.1"/> - <property name="lockverify.delay" value="1"/> --- lucene-8.5.0/demo/build.xml 2020-04-06 12:09:05.497250615 +0200 +++ lucene-8.5.0/demo/build.xml 2020-04-06 12:36:38.322189334 +0200 @@ -56,7 +56,7 @@ ++++++ lucene-monitor-8.5.0.pom -> lucene-monitor-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-monitor-8.5.0.pom 2020-04-14 16:24:01.159728541 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-monitor-8.11.2.pom 2023-09-20 13:34:26.653940416 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -35,8 +35,6 @@ </description> <properties> <module-directory>lucene/monitor</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -44,12 +42,6 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> @@ -67,23 +59,5 @@ <artifactId>lucene-queryparser</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-nodoclint.patch ++++++ --- /var/tmp/diff_new_pack.NploGE/_old 2023-09-20 13:34:30.854090888 +0200 +++ /var/tmp/diff_new_pack.NploGE/_new 2023-09-20 13:34:30.858091031 +0200 @@ -4,10 +4,10 @@ <property name="javadoc.noindex" value="true"/> <!---TODO: Fix accessibility (order of H1/H2/H3 headings), see https://issues.apache.org/jira/browse/LUCENE-8729 --> -- <property name="javadoc.doclint.args" value="-Xdoclint:all -Xdoclint:-missing -Xdoclint:-accessibility"/> +- <property name="javadoc.doclint.args" value="-Xdoclint:all -Xdoclint:-missing -Xdoclint:-accessibility -Xdoclint:-html"/> + <property name="javadoc.doclint.args" value="-Xdoclint:none"/> <!---proc:none was added because of LOG4J2-1925 / JDK-8186647 --> -- <property name="javac.doclint.args" value="-Xdoclint:all/protected -Xdoclint:-missing -Xdoclint:-accessibility -proc:none"/> +- <property name="javac.doclint.args" value="-Xdoclint:all/protected -Xdoclint:-missing -Xdoclint:-accessibility -Xdoclint:-html -proc:none"/> + <property name="javac.doclint.args" value="-Xdoclint:none"/> <!-- Javadoc classpath --> ++++++ lucene-osgi-manifests.patch ++++++ --- /var/tmp/diff_new_pack.NploGE/_old 2023-09-20 13:34:30.870091461 +0200 +++ /var/tmp/diff_new_pack.NploGE/_new 2023-09-20 13:34:30.870091461 +0200 @@ -279,10 +279,10 @@ <attribute name="X-Compile-Source-JDK" value="${javac.release}"/> --- lucene-8.5.0/core/build.xml 2020-03-13 10:35:55.000000000 +0100 +++ lucene-8.5.0/core/build.xml 2020-04-06 14:20:59.688149345 +0200 -@@ -194,6 +194,24 @@ +@@ -97,6 +97,24 @@ </sequential> </macrodef> - + + <target name="jar-core" depends="compile-core"> + <jarify> + <jarify-additional-manifest-attributes> @@ -301,9 +301,9 @@ + </jarify> + </target> + - <condition property="-ignore-test-lock-factory"> - <or> - <!-- We ignore our ant-based lock factory test, if user applies test filtering: --> + <target name="createPackedIntSources"> + <exec dir="src/java/org/apache/lucene/util/packed" + executable="${python2.exe}" failonerror="true"> --- lucene-8.5.0/demo/build.xml 2020-03-13 10:35:55.000000000 +0100 +++ lucene-8.5.0/demo/build.xml 2020-04-06 14:24:28.413294729 +0200 @@ -58,4 +58,22 @@ ++++++ lucene-parent-8.11.2.pom ++++++ <!-- 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-solr-grandparent</artifactId> <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> <packaging>pom</packaging> <name>Lucene parent POM</name> <description>Lucene parent POM</description> <properties> <module-directory>lucene</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> <modules> <module>core</module> <module>backward-codecs</module> <module>codecs</module> <module>test-framework</module> <module>analysis</module> <module>benchmark</module> <module>classification</module> <module>demo</module> <module>expressions</module> <module>facet</module> <module>grouping</module> <module>highlighter</module> <module>join</module> <module>memory</module> <module>misc</module> <module>monitor</module> <module>queries</module> <module>queryparser</module> <module>replicator</module> <module>sandbox</module> <module>spatial-extras</module> <module>spatial3d</module> <module>suggest</module> </modules> </project> ++++++ lucene-queries-8.5.0.pom -> lucene-queries-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-queries-8.5.0.pom 2020-04-14 16:24:01.195728573 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-queries-8.11.2.pom 2023-09-20 13:34:26.689941705 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Lucene Queries Module</description> <properties> <module-directory>lucene/queries</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,53 +40,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-expressions</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - <scope>test</scope> - </dependency> </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-queryparser-8.5.0.pom -> lucene-queryparser-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-queryparser-8.5.0.pom 2020-04-14 16:24:01.219728595 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-queryparser-8.11.2.pom 2023-09-20 13:34:26.697941992 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Lucene QueryParsers module</description> <properties> <module-directory>lucene/queryparser</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,12 +40,6 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> @@ -61,41 +53,5 @@ <artifactId>lucene-sandbox</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <resources> - <resource> - <directory>${module-path}/src/resources</directory> - </resource> - </resources> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> ++++++ lucene-sandbox-8.5.0.pom -> lucene-sandbox-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-sandbox-8.5.0.pom 2020-04-14 16:24:01.239728614 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-sandbox-8.11.2.pom 2023-09-20 13:34:26.705942279 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -33,8 +33,6 @@ <description>Lucene Sandbox</description> <properties> <module-directory>lucene/sandbox</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <scm> <connection>scm:git:${vc-anonymous-base-url}</connection> @@ -42,39 +40,10 @@ <url>${vc-browse-base-url};f=${module-directory}</url> </scm> <dependencies> - <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <resources> - <resource> - <directory>${module-path}/src/resources</directory> - </resource> - </resources> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.build.testSourceDirectory}</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - </build> </project> ++++++ lucene-spatial3d-8.5.0.pom -> lucene-spatial3d-8.11.2.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-spatial3d-8.5.0.pom 2020-04-14 16:24:01.259728633 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.16627/lucene-spatial3d-8.11.2.pom 2023-09-20 13:34:26.709942421 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>8.5.0</version> + <version>8.11.2</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -35,43 +35,12 @@ </description> <properties> <module-directory>lucene/spatial3d</module-directory> - <relative-top-level>../../..</relative-top-level> - <module-path>${relative-top-level}/${module-directory}</module-path> </properties> <dependencies> <dependency> - <!-- lucene-test-framework dependency must be declared before lucene-core --> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-codecs</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${module-path}/src/java</sourceDirectory> - <testSourceDirectory>${module-path}/src/test</testSourceDirectory> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> ++++++ lucene-timestamps.patch ++++++ --- lucene-8.11.2/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java 2022-06-13 18:25:09.000000000 +0200 +++ lucene-8.11.2/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java 2023-09-18 13:40:32.178161872 +0200 @@ -207,7 +207,7 @@ writer.write(NL); } writer.write("// generated on "); - writer.write(dateFormat.format(new Date())); + writer.write(dateFormat.format(System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date())); writer.write(NL); writer.write("// by "); writer.write(this.getClass().getName()); --- lucene-8.11.2/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java 2022-06-13 18:25:10.000000000 +0200 +++ lucene-8.11.2/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java 2023-09-18 13:38:53.074193935 +0200 @@ -272,7 +272,7 @@ if (date == null) { // just set to right now - date = new Date(); + date = System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date(); } Field dateField = ds.getNumericField(DATE_MSEC_FIELD, Long.class); --- lucene-8.11.2/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java 2022-06-13 18:25:10.000000000 +0200 +++ lucene-8.11.2/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java 2023-09-18 13:39:15.331003116 +0200 @@ -54,7 +54,7 @@ docData.setBody(rnbf.format(curCounter)); docData.setName("doc_" + String.valueOf(curCounter)); docData.setTitle("title_" + String.valueOf(curCounter)); - docData.setDate(new Date()); + docData.setDate(System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date()); return docData; } --- lucene-8.11.2/core/src/java/org/apache/lucene/index/IndexWriter.java 2022-06-13 18:25:10.000000000 +0200 +++ lucene-8.11.2/core/src/java/org/apache/lucene/index/IndexWriter.java 2023-09-18 13:41:45.318630172 +0200 @@ -4593,7 +4593,7 @@ diagnostics.put("java.runtime.version", System.getProperty("java.runtime.version", "undefined")); // Hotspot version, e.g. 2.8 for J9: diagnostics.put("java.vm.version", System.getProperty("java.vm.version", "undefined")); - diagnostics.put("timestamp", Long.toString(new Date().getTime())); + diagnostics.put("timestamp", Long.toString((System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date()).getTime())); if (details != null) { diagnostics.putAll(details); } --- lucene-8.11.2/core/src/java/org/apache/lucene/util/StringHelper.java 2022-06-13 18:25:10.000000000 +0200 +++ lucene-8.11.2/core/src/java/org/apache/lucene/util/StringHelper.java 2023-09-18 17:34:58.751336732 +0200 @@ -214,6 +214,10 @@ String prop = System.getProperty("tests.seed"); + if (prop == null) { + prop = System.getenv("SOURCE_DATE_EPOCH"); + } + // State for xorshift128: long x0; long x1;
