You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/02/02 14:08:23 UTC
[maven-indexer] branch mbooth101-lucene8 created (now c060cf9)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch mbooth101-lucene8
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git.
at c060cf9 [MINDEXER-104] Migrate to Lucene 8.x
This branch includes the following new commits:
new c060cf9 [MINDEXER-104] Migrate to Lucene 8.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-indexer] 01/01: [MINDEXER-104] Migrate to Lucene 8.x
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch mbooth101-lucene8
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit c060cf9f063a95af2c369eba8e88decc7f5f4488
Merge: beaab64 cb47364
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Feb 2 15:06:23 2022 +0100
[MINDEXER-104] Migrate to Lucene 8.x
Re-uses PR https://github.com/apache/maven-indexer/pull/37
and am lifting it into internal branch.
Author: Mat Booth mat.booth@redhat.com
Original PR: https://github.com/apache/maven-indexer/pull/37
.../java/org/apache/maven/index/ArtifactInfo.java | 3 --
.../apache/maven/index/DefaultIndexerEngine.java | 2 +-
.../apache/maven/index/DefaultScannerListener.java | 6 ++--
.../apache/maven/index/DefaultSearchEngine.java | 6 ++--
.../index/context/DefaultIndexingContext.java | 32 ++++++++++++++--------
.../org/apache/maven/index/context/IndexUtils.java | 2 --
.../apache/maven/index/context/NexusAnalyzer.java | 21 ++++----------
.../maven/index/context/NexusIndexWriter.java | 1 -
.../maven/index/context/NexusLegacyAnalyzer.java | 12 ++++----
.../incremental/DefaultIncrementalHandler.java | 4 +--
.../maven/index/updater/DefaultIndexUpdater.java | 15 +++++-----
.../maven/index/updater/IndexDataWriter.java | 4 +--
.../maven/index/AbstractRepoNexusIndexerTest.java | 4 +--
.../maven/index/Nexus737NexusIndexerTest.java | 4 +--
.../org/apache/maven/index/NexusIndexerTest.java | 9 +++---
.../maven/index/context/NexusAnalyzerTest.java | 4 +--
.../resources/testQueryCreatorNGSearch/case01.txt | 2 +-
.../resources/testQueryCreatorNGSearch/case05.txt | 2 +-
.../maven/indexer/examples/BasicUsageExample.java | 4 +--
pom.xml | 2 +-
20 files changed, 66 insertions(+), 73 deletions(-)
diff --cc indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
index 837d699,8382d29..f8581cc
--- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
@@@ -664,12 -677,13 +672,12 @@@ public class DefaultIndexingContex
try
{
final IndexWriter w = getIndexWriter();
- final IndexReader directoryReader = DirectoryReader.open( directory );
- TopScoreDocCollector collector = null;
- try
+ try ( IndexReader directoryReader = DirectoryReader.open( directory ) )
{
+ TopScoreDocCollector collector;
int numDocs = directoryReader.maxDoc();
-
+
- Bits liveDocs = MultiFields.getLiveDocs( directoryReader );
+ Bits liveDocs = MultiBits.getLiveDocs( directoryReader );
for ( int i = 0; i < numDocs; i++ )
{
if ( liveDocs != null && !liveDocs.get( i ) )
@@@ -769,11 -784,11 +777,11 @@@
{
final IndexReader r = is.getIndexReader();
- Set<String> rootGroups = new LinkedHashSet<String>();
- Set<String> allGroups = new LinkedHashSet<String>();
+ Set<String> rootGroups = new LinkedHashSet<>();
+ Set<String> allGroups = new LinkedHashSet<>();
int numDocs = r.maxDoc();
- Bits liveDocs = MultiFields.getLiveDocs( r );
+ Bits liveDocs = MultiBits.getLiveDocs( r );
for ( int i = 0; i < numDocs; i++ )
{
diff --cc indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
index 2793b64,ad1e11b..a4929ab
--- a/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
@@@ -55,10 -55,10 +55,10 @@@ public class NexusAnalyzerTes
protected void runAndCompare( IndexerField indexerField, String text, String[] expected )
throws IOException
{
- Tokenizer ts = (Tokenizer) nexusAnalyzer.tokenStream(indexerField.getKey(), new StringReader( text ) );
+ TokenStream ts = nexusAnalyzer.tokenStream(indexerField.getKey(), new StringReader( text ) );
ts.reset();
- ArrayList<String> tokenList = new ArrayList<String>();
+ ArrayList<String> tokenList = new ArrayList<>();
if ( !indexerField.isKeyword() )
{
diff --cc pom.xml
index 73b7612,50a604d..ad32520
--- a/pom.xml
+++ b/pom.xml
@@@ -89,18 -88,15 +89,18 @@@ under the License
<failsafe.redirectTestOutputToFile>true</failsafe.redirectTestOutputToFile>
<checkstyle.violation.ignore>MagicNumber,ParameterNumber,MethodLength,JavadocType,AvoidNestedBlocks,InterfaceIsType</checkstyle.violation.ignore>
- <eclipse-sisu.version>0.3.3</eclipse-sisu.version>
- <lucene.version>8.1.1</lucene.version>
- <maven.version>3.5.2</maven.version>
- <resolver.version>1.1.0</resolver.version>
- <truezip.version>7.7.10</truezip.version>
- <archetype.version>2.4</archetype.version>
- <wagon.version>2.12</wagon.version>
-
+ <eclipse-sisu.version>0.3.5</eclipse-sisu.version>
+ <guice.version>5.1.0</guice.version>
- <lucene.version>5.5.5</lucene.version>
++ <lucene.version>8.11.1</lucene.version>
+ <maven.version>3.8.4</maven.version>
+ <resolver.version>1.7.3</resolver.version>
+ <archetype.version>3.2.1</archetype.version>
+ <wagon.version>3.5.1</wagon.version>
+ <surefire.version>2.22.2</surefire.version>
+ <slf4j.version>1.7.35</slf4j.version>
+ <logback.version>1.2.10</logback.version>
<maven.site.path>maven-indexer-archives/maven-indexer-LATEST</maven.site.path>
+ <project.build.outputTimestamp>2020-02-02T02:02:02Z</project.build.outputTimestamp>
</properties>
<dependencyManagement>