You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2023/01/05 22:58:34 UTC

[couchdb] 04/07: use shaded imports

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch import-nouveau-reorg
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 8091fa51f5e167c4289ec92d429308d3cd6f5dba
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon Jan 2 20:40:16 2023 +0000

    use shaded imports
---
 .../couchdb/nouveau/api/DocumentUpdateRequest.java |  2 +-
 .../org/apache/couchdb/nouveau/api/SearchHit.java  |  4 +-
 .../apache/couchdb/nouveau/api/SearchRequest.java  |  4 +-
 .../apache/couchdb/nouveau/api/SearchResults.java  |  2 +-
 .../apache/couchdb/nouveau/core/IndexManager.java  |  2 +-
 .../nouveau/core/Lucene9AnalyzerFactory.java       | 80 +++++++++++-----------
 .../apache/couchdb/nouveau/core/Lucene9Index.java  | 72 +++++++++----------
 .../couchdb/nouveau/core/Lucene9IndexFactory.java  |  4 +-
 .../core/Lucene9ParallelSearcherFactory.java       |  6 +-
 .../couchdb/nouveau/core/NouveauQueryParser.java   | 68 +++++++++---------
 .../nouveau/core/NumericRangeQueryProcessor.java   | 16 ++---
 .../apache/couchdb/nouveau/core/QueryParser.java   |  2 +-
 .../nouveau/core/ser/BytesRefDeserializer.java     |  2 +-
 .../nouveau/core/ser/BytesRefSerializer.java       |  2 +-
 .../nouveau/core/ser/DoubleRangeDeserializer.java  |  2 +-
 .../nouveau/core/ser/DoubleRangeSerializer.java    |  2 +-
 .../nouveau/core/ser/FieldDocDeserializer.java     |  4 +-
 .../nouveau/core/ser/FieldDocSerializer.java       |  4 +-
 .../core/ser/IndexableFieldDeserializer.java       | 40 +++++------
 .../nouveau/core/ser/IndexableFieldSerializer.java |  8 +--
 .../couchdb/nouveau/core/ser/LuceneModule.java     |  8 +--
 .../couchdb/nouveau/core/ser/SupportedType.java    | 36 +++++-----
 .../nouveau/core/ser/TotalHitsDeserializer.java    |  4 +-
 .../couchdb/nouveau/resources/AnalyzeResource.java |  6 +-
 .../apache/couchdb/nouveau/IntegrationTest.java    | 16 ++---
 .../nouveau/api/DocumentUpdateRequestTest.java     | 10 +--
 .../couchdb/nouveau/api/SearchRequestTest.java     |  2 +-
 .../nouveau/core/Lucene9AnalyzerFactoryTest.java   | 78 ++++++++++-----------
 .../couchdb/nouveau/core/ser/LuceneModuleTest.java | 14 ++--
 29 files changed, 250 insertions(+), 250 deletions(-)

diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
index 3bec1c5e2..653ce1685 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
@@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.index.IndexableField;
 
 import io.dropwizard.jackson.JsonSnakeCase;
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java
index aa8b064bb..77a996485 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java
@@ -18,8 +18,8 @@ import java.util.Collection;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.search.FieldDoc;
 
 import io.dropwizard.jackson.JsonSnakeCase;
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java
index 3af396efd..603b4112f 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java
@@ -23,8 +23,8 @@ import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.apache.lucene.facet.range.DoubleRange;
-import org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.search.FieldDoc;
 
 import io.dropwizard.jackson.JsonSnakeCase;
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java
index 931adac81..02d231c85 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.dropwizard.jackson.JsonSnakeCase;
 
-import org.apache.lucene.search.TotalHits;
+import l9x.org.apache.lucene.search.TotalHits;
 
 @JsonSnakeCase
 public class SearchResults {
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
index 4d7ef07e0..1d8085dfa 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
@@ -27,7 +27,7 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.couchdb.nouveau.api.IndexDefinition;
-import org.apache.lucene.util.IOUtils;
+import l9x.org.apache.lucene.util.IOUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactory.java
index 5544af267..2927ce398 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactory.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactory.java
@@ -21,46 +21,46 @@ import javax.ws.rs.core.Response.Status;
 
 import org.apache.couchdb.nouveau.api.IndexDefinition;
 
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.ar.ArabicAnalyzer;
-import org.apache.lucene.analysis.bg.BulgarianAnalyzer;
-import org.apache.lucene.analysis.ca.CatalanAnalyzer;
-import org.apache.lucene.analysis.cjk.CJKAnalyzer;
-import org.apache.lucene.analysis.classic.ClassicAnalyzer;
-import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.analysis.core.SimpleAnalyzer;
-import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.analysis.cz.CzechAnalyzer;
-import org.apache.lucene.analysis.da.DanishAnalyzer;
-import org.apache.lucene.analysis.de.GermanAnalyzer;
-import org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer;
-import org.apache.lucene.analysis.en.EnglishAnalyzer;
-import org.apache.lucene.analysis.es.SpanishAnalyzer;
-import org.apache.lucene.analysis.eu.BasqueAnalyzer;
-import org.apache.lucene.analysis.fa.PersianAnalyzer;
-import org.apache.lucene.analysis.fi.FinnishAnalyzer;
-import org.apache.lucene.analysis.fr.FrenchAnalyzer;
-import org.apache.lucene.analysis.ga.IrishAnalyzer;
-import org.apache.lucene.analysis.gl.GalicianAnalyzer;
-import org.apache.lucene.analysis.hi.HindiAnalyzer;
-import org.apache.lucene.analysis.hu.HungarianAnalyzer;
-import org.apache.lucene.analysis.hy.ArmenianAnalyzer;
-import org.apache.lucene.analysis.id.IndonesianAnalyzer;
-import org.apache.lucene.analysis.it.ItalianAnalyzer;
-import org.apache.lucene.analysis.ja.JapaneseAnalyzer;
-import org.apache.lucene.analysis.lv.LatvianAnalyzer;
-import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
-import org.apache.lucene.analysis.nl.DutchAnalyzer;
-import org.apache.lucene.analysis.no.NorwegianAnalyzer;
-import org.apache.lucene.analysis.pl.PolishAnalyzer;
-import org.apache.lucene.analysis.pt.PortugueseAnalyzer;
-import org.apache.lucene.analysis.ro.RomanianAnalyzer;
-import org.apache.lucene.analysis.ru.RussianAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.sv.SwedishAnalyzer;
-import org.apache.lucene.analysis.th.ThaiAnalyzer;
-import org.apache.lucene.analysis.tr.TurkishAnalyzer;
+import l9x.org.apache.lucene.analysis.Analyzer;
+import l9x.org.apache.lucene.analysis.ar.ArabicAnalyzer;
+import l9x.org.apache.lucene.analysis.bg.BulgarianAnalyzer;
+import l9x.org.apache.lucene.analysis.ca.CatalanAnalyzer;
+import l9x.org.apache.lucene.analysis.cjk.CJKAnalyzer;
+import l9x.org.apache.lucene.analysis.classic.ClassicAnalyzer;
+import l9x.org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
+import l9x.org.apache.lucene.analysis.core.KeywordAnalyzer;
+import l9x.org.apache.lucene.analysis.core.SimpleAnalyzer;
+import l9x.org.apache.lucene.analysis.core.WhitespaceAnalyzer;
+import l9x.org.apache.lucene.analysis.cz.CzechAnalyzer;
+import l9x.org.apache.lucene.analysis.da.DanishAnalyzer;
+import l9x.org.apache.lucene.analysis.de.GermanAnalyzer;
+import l9x.org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer;
+import l9x.org.apache.lucene.analysis.en.EnglishAnalyzer;
+import l9x.org.apache.lucene.analysis.es.SpanishAnalyzer;
+import l9x.org.apache.lucene.analysis.eu.BasqueAnalyzer;
+import l9x.org.apache.lucene.analysis.fa.PersianAnalyzer;
+import l9x.org.apache.lucene.analysis.fi.FinnishAnalyzer;
+import l9x.org.apache.lucene.analysis.fr.FrenchAnalyzer;
+import l9x.org.apache.lucene.analysis.ga.IrishAnalyzer;
+import l9x.org.apache.lucene.analysis.gl.GalicianAnalyzer;
+import l9x.org.apache.lucene.analysis.hi.HindiAnalyzer;
+import l9x.org.apache.lucene.analysis.hu.HungarianAnalyzer;
+import l9x.org.apache.lucene.analysis.hy.ArmenianAnalyzer;
+import l9x.org.apache.lucene.analysis.id.IndonesianAnalyzer;
+import l9x.org.apache.lucene.analysis.it.ItalianAnalyzer;
+import l9x.org.apache.lucene.analysis.ja.JapaneseAnalyzer;
+import l9x.org.apache.lucene.analysis.lv.LatvianAnalyzer;
+import l9x.org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
+import l9x.org.apache.lucene.analysis.nl.DutchAnalyzer;
+import l9x.org.apache.lucene.analysis.no.NorwegianAnalyzer;
+import l9x.org.apache.lucene.analysis.pl.PolishAnalyzer;
+import l9x.org.apache.lucene.analysis.pt.PortugueseAnalyzer;
+import l9x.org.apache.lucene.analysis.ro.RomanianAnalyzer;
+import l9x.org.apache.lucene.analysis.ru.RussianAnalyzer;
+import l9x.org.apache.lucene.analysis.standard.StandardAnalyzer;
+import l9x.org.apache.lucene.analysis.sv.SwedishAnalyzer;
+import l9x.org.apache.lucene.analysis.th.ThaiAnalyzer;
+import l9x.org.apache.lucene.analysis.tr.TurkishAnalyzer;
 
 public final class Lucene9AnalyzerFactory {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9Index.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9Index.java
index 0c89afef2..c9727fab1 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9Index.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9Index.java
@@ -32,39 +32,39 @@ import org.apache.couchdb.nouveau.api.DocumentUpdateRequest;
 import org.apache.couchdb.nouveau.api.SearchHit;
 import org.apache.couchdb.nouveau.api.SearchRequest;
 import org.apache.couchdb.nouveau.api.SearchResults;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.facet.FacetResult;
-import org.apache.lucene.facet.Facets;
-import org.apache.lucene.facet.FacetsCollector;
-import org.apache.lucene.facet.FacetsCollectorManager;
-import org.apache.lucene.facet.LabelAndValue;
-import org.apache.lucene.facet.StringDocValuesReaderState;
-import org.apache.lucene.facet.StringValueFacetCounts;
-import org.apache.lucene.facet.range.DoubleRange;
-import org.apache.lucene.facet.range.DoubleRangeFacetCounts;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.misc.store.DirectIODirectory;
-import org.apache.lucene.search.CollectorManager;
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MultiCollectorManager;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.SearcherFactory;
-import org.apache.lucene.search.SearcherManager;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.TopFieldCollector;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.analysis.Analyzer;
+import l9x.org.apache.lucene.document.Document;
+import l9x.org.apache.lucene.document.Field.Store;
+import l9x.org.apache.lucene.facet.FacetResult;
+import l9x.org.apache.lucene.facet.Facets;
+import l9x.org.apache.lucene.facet.FacetsCollector;
+import l9x.org.apache.lucene.facet.FacetsCollectorManager;
+import l9x.org.apache.lucene.facet.LabelAndValue;
+import l9x.org.apache.lucene.facet.StringDocValuesReaderState;
+import l9x.org.apache.lucene.facet.StringValueFacetCounts;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.facet.range.DoubleRangeFacetCounts;
+import l9x.org.apache.lucene.index.IndexWriter;
+import l9x.org.apache.lucene.index.IndexWriterConfig;
+import l9x.org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.index.Term;
+import l9x.org.apache.lucene.misc.store.DirectIODirectory;
+import l9x.org.apache.lucene.search.CollectorManager;
+import l9x.org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.search.IndexSearcher;
+import l9x.org.apache.lucene.search.MultiCollectorManager;
+import l9x.org.apache.lucene.search.Query;
+import l9x.org.apache.lucene.search.ScoreDoc;
+import l9x.org.apache.lucene.search.SearcherFactory;
+import l9x.org.apache.lucene.search.SearcherManager;
+import l9x.org.apache.lucene.search.Sort;
+import l9x.org.apache.lucene.search.SortField;
+import l9x.org.apache.lucene.search.TermQuery;
+import l9x.org.apache.lucene.search.TopDocs;
+import l9x.org.apache.lucene.search.TopFieldCollector;
+import l9x.org.apache.lucene.store.Directory;
+import l9x.org.apache.lucene.store.FSDirectory;
+import l9x.org.apache.lucene.util.BytesRef;
 
 class Lucene9Index extends Index {
 
@@ -292,12 +292,12 @@ class Lucene9Index extends Index {
         final Document result = new Document();
 
         // id
-        result.add(new org.apache.lucene.document.StringField("_id", docId, Store.YES));
-        result.add(new org.apache.lucene.document.SortedDocValuesField("_id", new BytesRef(docId)));
+        result.add(new l9x.org.apache.lucene.document.StringField("_id", docId, Store.YES));
+        result.add(new l9x.org.apache.lucene.document.SortedDocValuesField("_id", new BytesRef(docId)));
 
         // partition (optional)
         if (request.hasPartition()) {
-            result.add(new org.apache.lucene.document.StringField("_partition", request.getPartition(), Store.NO));
+            result.add(new l9x.org.apache.lucene.document.StringField("_partition", request.getPartition(), Store.NO));
         }
 
         for (IndexableField field : request.getFields()) {
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9IndexFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9IndexFactory.java
index 016f427c1..a4f346eba 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9IndexFactory.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9IndexFactory.java
@@ -17,8 +17,8 @@ import java.io.IOException;
 import java.nio.file.Path;
 
 import org.apache.couchdb.nouveau.api.IndexDefinition;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.search.SearcherFactory;
+import l9x.org.apache.lucene.analysis.Analyzer;
+import l9x.org.apache.lucene.search.SearcherFactory;
 
 public class Lucene9IndexFactory implements IndexFactory {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9ParallelSearcherFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9ParallelSearcherFactory.java
index 7021f2997..20384e899 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9ParallelSearcherFactory.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/Lucene9ParallelSearcherFactory.java
@@ -16,9 +16,9 @@ package org.apache.couchdb.nouveau.core;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.SearcherFactory;
+import l9x.org.apache.lucene.index.IndexReader;
+import l9x.org.apache.lucene.search.IndexSearcher;
+import l9x.org.apache.lucene.search.SearcherFactory;
 
 public class Lucene9ParallelSearcherFactory extends SearcherFactory {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java
index e5fa80718..af026019b 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java
@@ -14,40 +14,40 @@
 package org.apache.couchdb.nouveau.core;
 
 import org.apache.couchdb.nouveau.api.SearchRequest;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
-import org.apache.lucene.queryparser.flexible.core.QueryParserHelper;
-import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler;
-import org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline;
-import org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor;
-import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder;
-import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler;
-import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
-import org.apache.lucene.queryparser.flexible.standard.processors.AllowLeadingWildcardProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.AnalyzerQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.BooleanQuery2ModifierNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.BooleanSingleChildOptimizationQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.BoostQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.DefaultPhraseSlopQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.FuzzyQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.IntervalQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.MatchAllDocsQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.MultiFieldQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.OpenRangeQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.PhraseSlopQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.PointQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.RegexpQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.RemoveEmptyNonLeafQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.TermRangeQueryNodeProcessor;
-import org.apache.lucene.queryparser.flexible.standard.processors.WildcardQueryNodeProcessor;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
+import l9x.org.apache.lucene.analysis.Analyzer;
+import l9x.org.apache.lucene.index.Term;
+import l9x.org.apache.lucene.queryparser.flexible.core.QueryNodeException;
+import l9x.org.apache.lucene.queryparser.flexible.core.QueryParserHelper;
+import l9x.org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler;
+import l9x.org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline;
+import l9x.org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder;
+import l9x.org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler;
+import l9x.org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys;
+import l9x.org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.AllowLeadingWildcardProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.AnalyzerQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.BooleanQuery2ModifierNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.BooleanSingleChildOptimizationQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.BoostQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.DefaultPhraseSlopQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.FuzzyQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.IntervalQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.MatchAllDocsQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.MultiFieldQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.OpenRangeQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.PhraseSlopQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.PointQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.RegexpQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.RemoveEmptyNonLeafQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.TermRangeQueryNodeProcessor;
+import l9x.org.apache.lucene.queryparser.flexible.standard.processors.WildcardQueryNodeProcessor;
+import l9x.org.apache.lucene.search.BooleanClause.Occur;
+import l9x.org.apache.lucene.search.BooleanQuery;
+import l9x.org.apache.lucene.search.Query;
+import l9x.org.apache.lucene.search.TermQuery;
 
 public class NouveauQueryParser extends QueryParserHelper implements QueryParser {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java
index 8618e1721..707b1cd14 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java
@@ -17,14 +17,14 @@ import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.List;
 
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
-import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryparser.flexible.standard.config.PointsConfig;
-import org.apache.lucene.queryparser.flexible.standard.nodes.PointQueryNode;
-import org.apache.lucene.queryparser.flexible.standard.nodes.PointRangeQueryNode;
-import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode;
+import l9x.org.apache.lucene.queryparser.flexible.core.QueryNodeException;
+import l9x.org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode;
+import l9x.org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import l9x.org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl;
+import l9x.org.apache.lucene.queryparser.flexible.standard.config.PointsConfig;
+import l9x.org.apache.lucene.queryparser.flexible.standard.nodes.PointQueryNode;
+import l9x.org.apache.lucene.queryparser.flexible.standard.nodes.PointRangeQueryNode;
+import l9x.org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode;
 
 public class NumericRangeQueryProcessor extends QueryNodeProcessorImpl {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java
index d13d1acd5..a93ffd4b5 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java
@@ -13,7 +13,7 @@
 
 package org.apache.couchdb.nouveau.core;
 
-import org.apache.lucene.search.Query;
+import l9x.org.apache.lucene.search.Query;
 
 import org.apache.couchdb.nouveau.api.SearchRequest;
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java
index 2c56c31f2..f2109364f 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java
@@ -15,7 +15,7 @@ package org.apache.couchdb.nouveau.core.ser;
 
 import java.io.IOException;
 
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.util.BytesRef;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java
index 84850614b..72ee34b7b 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.util.BytesRef;
 
 public class BytesRefSerializer extends StdSerializer<BytesRef> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java
index 264002b33..d9e6e2b97 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
-import org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
 
 class DoubleRangeDeserializer extends StdDeserializer<DoubleRange> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java
index f7aeee263..58fa90b88 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-import org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
 
 class DoubleRangeSerializer extends StdSerializer<DoubleRange> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java
index 51fb8699f..b8caf4c33 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java
@@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.util.BytesRef;
 
 public class FieldDocDeserializer extends StdDeserializer<FieldDoc> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java
index 29f86ee11..0a917c5e9 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java
@@ -19,8 +19,8 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.util.BytesRef;
 
 public class FieldDocSerializer extends StdSerializer<FieldDoc> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java
index a20f9c398..3cfd555ec 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java
@@ -21,26 +21,26 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
-import org.apache.lucene.document.BinaryDocValuesField;
-import org.apache.lucene.document.DoubleDocValuesField;
-import org.apache.lucene.document.DoublePoint;
-import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.FloatPoint;
-import org.apache.lucene.document.IntPoint;
-import org.apache.lucene.document.LatLonDocValuesField;
-import org.apache.lucene.document.LatLonPoint;
-import org.apache.lucene.document.LongPoint;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.SortedNumericDocValuesField;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.document.XYDocValuesField;
-import org.apache.lucene.document.XYPointField;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.document.BinaryDocValuesField;
+import l9x.org.apache.lucene.document.DoubleDocValuesField;
+import l9x.org.apache.lucene.document.DoublePoint;
+import l9x.org.apache.lucene.document.FloatDocValuesField;
+import l9x.org.apache.lucene.document.Field.Store;
+import l9x.org.apache.lucene.document.FloatPoint;
+import l9x.org.apache.lucene.document.IntPoint;
+import l9x.org.apache.lucene.document.LatLonDocValuesField;
+import l9x.org.apache.lucene.document.LatLonPoint;
+import l9x.org.apache.lucene.document.LongPoint;
+import l9x.org.apache.lucene.document.SortedDocValuesField;
+import l9x.org.apache.lucene.document.SortedNumericDocValuesField;
+import l9x.org.apache.lucene.document.SortedSetDocValuesField;
+import l9x.org.apache.lucene.document.StoredField;
+import l9x.org.apache.lucene.document.StringField;
+import l9x.org.apache.lucene.document.TextField;
+import l9x.org.apache.lucene.document.XYDocValuesField;
+import l9x.org.apache.lucene.document.XYPointField;
+import l9x.org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.util.BytesRef;
 
 class IndexableFieldDeserializer extends StdDeserializer<IndexableField> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java
index c4520919b..f4e1e1ee9 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java
@@ -6,10 +6,10 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
-import org.apache.lucene.geo.GeoEncodingUtils;
-import org.apache.lucene.geo.XYEncodingUtils;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.geo.GeoEncodingUtils;
+import l9x.org.apache.lucene.geo.XYEncodingUtils;
+import l9x.org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.util.BytesRef;
 
 class IndexableFieldSerializer extends StdSerializer<IndexableField> {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java
index f78cfb02e..20d13db75 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java
@@ -16,10 +16,10 @@ package org.apache.couchdb.nouveau.core.ser;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
-import org.apache.lucene.facet.range.DoubleRange;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.search.TotalHits;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.search.TotalHits;
 
 public class LuceneModule extends SimpleModule {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java
index 9f652df26..a0f7bc43c 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java
@@ -13,24 +13,24 @@
 
 package org.apache.couchdb.nouveau.core.ser;
 
-import org.apache.lucene.document.BinaryDocValuesField;
-import org.apache.lucene.document.DoubleDocValuesField;
-import org.apache.lucene.document.DoublePoint;
-import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.FloatPoint;
-import org.apache.lucene.document.IntPoint;
-import org.apache.lucene.document.LatLonDocValuesField;
-import org.apache.lucene.document.LatLonPoint;
-import org.apache.lucene.document.LongPoint;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.SortedNumericDocValuesField;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.document.XYDocValuesField;
-import org.apache.lucene.document.XYPointField;
-import org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.document.BinaryDocValuesField;
+import l9x.org.apache.lucene.document.DoubleDocValuesField;
+import l9x.org.apache.lucene.document.DoublePoint;
+import l9x.org.apache.lucene.document.FloatDocValuesField;
+import l9x.org.apache.lucene.document.FloatPoint;
+import l9x.org.apache.lucene.document.IntPoint;
+import l9x.org.apache.lucene.document.LatLonDocValuesField;
+import l9x.org.apache.lucene.document.LatLonPoint;
+import l9x.org.apache.lucene.document.LongPoint;
+import l9x.org.apache.lucene.document.SortedDocValuesField;
+import l9x.org.apache.lucene.document.SortedNumericDocValuesField;
+import l9x.org.apache.lucene.document.SortedSetDocValuesField;
+import l9x.org.apache.lucene.document.StoredField;
+import l9x.org.apache.lucene.document.StringField;
+import l9x.org.apache.lucene.document.TextField;
+import l9x.org.apache.lucene.document.XYDocValuesField;
+import l9x.org.apache.lucene.document.XYPointField;
+import l9x.org.apache.lucene.index.IndexableField;
 
 enum SupportedType {
 
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java
index eb4976018..05374f3bb 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java
@@ -14,8 +14,8 @@ package org.apache.couchdb.nouveau.core.ser;
 
 import java.io.IOException;
 
-import org.apache.lucene.search.TotalHits;
-import org.apache.lucene.search.TotalHits.Relation;
+import l9x.org.apache.lucene.search.TotalHits;
+import l9x.org.apache.lucene.search.TotalHits.Relation;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
index c495cf5fa..aa1737de7 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
@@ -32,9 +32,9 @@ import org.apache.couchdb.nouveau.api.AnalyzeResponse;
 import org.apache.couchdb.nouveau.core.Lucene9AnalyzerFactory;
 import com.codahale.metrics.annotation.Timed;
 
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import l9x.org.apache.lucene.analysis.Analyzer;
+import l9x.org.apache.lucene.analysis.TokenStream;
+import l9x.org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 
 @Path("/analyze")
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
index 72e3dcb9a..c1698fa3d 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
@@ -28,14 +28,14 @@ import org.apache.couchdb.nouveau.api.DocumentUpdateRequest;
 import org.apache.couchdb.nouveau.api.IndexDefinition;
 import org.apache.couchdb.nouveau.api.SearchRequest;
 import org.apache.couchdb.nouveau.api.SearchResults;
-import org.apache.lucene.document.DoubleDocValuesField;
-import org.apache.lucene.document.DoublePoint;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.facet.range.DoubleRange;
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.search.TotalHits;
-import org.apache.lucene.search.TotalHits.Relation;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.document.DoubleDocValuesField;
+import l9x.org.apache.lucene.document.DoublePoint;
+import l9x.org.apache.lucene.document.SortedSetDocValuesField;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.search.TotalHits;
+import l9x.org.apache.lucene.search.TotalHits.Relation;
+import l9x.org.apache.lucene.util.BytesRef;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
index 35b813392..b30e11def 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
@@ -22,11 +22,11 @@ import java.util.List;
 import org.apache.couchdb.nouveau.core.ser.LuceneModule;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.apache.lucene.document.DoublePoint;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.IndexableField;
+import l9x.org.apache.lucene.document.DoublePoint;
+import l9x.org.apache.lucene.document.Field.Store;
+import l9x.org.apache.lucene.document.StringField;
+import l9x.org.apache.lucene.document.TextField;
+import l9x.org.apache.lucene.index.IndexableField;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java
index 7bc886af2..44ff9ac05 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.couchdb.nouveau.core.ser.LuceneModule;
-import org.apache.lucene.facet.range.DoubleRange;
+import l9x.org.apache.lucene.facet.range.DoubleRange;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactoryTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactoryTest.java
index 0adf18d45..3dbff9752 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactoryTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/Lucene9AnalyzerFactoryTest.java
@@ -15,45 +15,45 @@ package org.apache.couchdb.nouveau.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.ar.ArabicAnalyzer;
-import org.apache.lucene.analysis.bg.BulgarianAnalyzer;
-import org.apache.lucene.analysis.ca.CatalanAnalyzer;
-import org.apache.lucene.analysis.cjk.CJKAnalyzer;
-import org.apache.lucene.analysis.classic.ClassicAnalyzer;
-import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.analysis.core.SimpleAnalyzer;
-import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.analysis.cz.CzechAnalyzer;
-import org.apache.lucene.analysis.da.DanishAnalyzer;
-import org.apache.lucene.analysis.de.GermanAnalyzer;
-import org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer;
-import org.apache.lucene.analysis.en.EnglishAnalyzer;
-import org.apache.lucene.analysis.es.SpanishAnalyzer;
-import org.apache.lucene.analysis.eu.BasqueAnalyzer;
-import org.apache.lucene.analysis.fa.PersianAnalyzer;
-import org.apache.lucene.analysis.fi.FinnishAnalyzer;
-import org.apache.lucene.analysis.fr.FrenchAnalyzer;
-import org.apache.lucene.analysis.ga.IrishAnalyzer;
-import org.apache.lucene.analysis.gl.GalicianAnalyzer;
-import org.apache.lucene.analysis.hi.HindiAnalyzer;
-import org.apache.lucene.analysis.hu.HungarianAnalyzer;
-import org.apache.lucene.analysis.hy.ArmenianAnalyzer;
-import org.apache.lucene.analysis.id.IndonesianAnalyzer;
-import org.apache.lucene.analysis.it.ItalianAnalyzer;
-import org.apache.lucene.analysis.ja.JapaneseAnalyzer;
-import org.apache.lucene.analysis.lv.LatvianAnalyzer;
-import org.apache.lucene.analysis.nl.DutchAnalyzer;
-import org.apache.lucene.analysis.no.NorwegianAnalyzer;
-import org.apache.lucene.analysis.pl.PolishAnalyzer;
-import org.apache.lucene.analysis.pt.PortugueseAnalyzer;
-import org.apache.lucene.analysis.ro.RomanianAnalyzer;
-import org.apache.lucene.analysis.ru.RussianAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.sv.SwedishAnalyzer;
-import org.apache.lucene.analysis.th.ThaiAnalyzer;
-import org.apache.lucene.analysis.tr.TurkishAnalyzer;
+import l9x.org.apache.lucene.analysis.Analyzer;
+import l9x.org.apache.lucene.analysis.ar.ArabicAnalyzer;
+import l9x.org.apache.lucene.analysis.bg.BulgarianAnalyzer;
+import l9x.org.apache.lucene.analysis.ca.CatalanAnalyzer;
+import l9x.org.apache.lucene.analysis.cjk.CJKAnalyzer;
+import l9x.org.apache.lucene.analysis.classic.ClassicAnalyzer;
+import l9x.org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer;
+import l9x.org.apache.lucene.analysis.core.KeywordAnalyzer;
+import l9x.org.apache.lucene.analysis.core.SimpleAnalyzer;
+import l9x.org.apache.lucene.analysis.core.WhitespaceAnalyzer;
+import l9x.org.apache.lucene.analysis.cz.CzechAnalyzer;
+import l9x.org.apache.lucene.analysis.da.DanishAnalyzer;
+import l9x.org.apache.lucene.analysis.de.GermanAnalyzer;
+import l9x.org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer;
+import l9x.org.apache.lucene.analysis.en.EnglishAnalyzer;
+import l9x.org.apache.lucene.analysis.es.SpanishAnalyzer;
+import l9x.org.apache.lucene.analysis.eu.BasqueAnalyzer;
+import l9x.org.apache.lucene.analysis.fa.PersianAnalyzer;
+import l9x.org.apache.lucene.analysis.fi.FinnishAnalyzer;
+import l9x.org.apache.lucene.analysis.fr.FrenchAnalyzer;
+import l9x.org.apache.lucene.analysis.ga.IrishAnalyzer;
+import l9x.org.apache.lucene.analysis.gl.GalicianAnalyzer;
+import l9x.org.apache.lucene.analysis.hi.HindiAnalyzer;
+import l9x.org.apache.lucene.analysis.hu.HungarianAnalyzer;
+import l9x.org.apache.lucene.analysis.hy.ArmenianAnalyzer;
+import l9x.org.apache.lucene.analysis.id.IndonesianAnalyzer;
+import l9x.org.apache.lucene.analysis.it.ItalianAnalyzer;
+import l9x.org.apache.lucene.analysis.ja.JapaneseAnalyzer;
+import l9x.org.apache.lucene.analysis.lv.LatvianAnalyzer;
+import l9x.org.apache.lucene.analysis.nl.DutchAnalyzer;
+import l9x.org.apache.lucene.analysis.no.NorwegianAnalyzer;
+import l9x.org.apache.lucene.analysis.pl.PolishAnalyzer;
+import l9x.org.apache.lucene.analysis.pt.PortugueseAnalyzer;
+import l9x.org.apache.lucene.analysis.ro.RomanianAnalyzer;
+import l9x.org.apache.lucene.analysis.ru.RussianAnalyzer;
+import l9x.org.apache.lucene.analysis.standard.StandardAnalyzer;
+import l9x.org.apache.lucene.analysis.sv.SwedishAnalyzer;
+import l9x.org.apache.lucene.analysis.th.ThaiAnalyzer;
+import l9x.org.apache.lucene.analysis.tr.TurkishAnalyzer;
 import org.junit.jupiter.api.Test;
 
 public class Lucene9AnalyzerFactoryTest {
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java
index 30b45c46d..94ca72310 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java
@@ -18,13 +18,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.apache.lucene.document.DoublePoint;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.util.BytesRef;
+import l9x.org.apache.lucene.document.DoublePoint;
+import l9x.org.apache.lucene.document.Field.Store;
+import l9x.org.apache.lucene.document.StoredField;
+import l9x.org.apache.lucene.document.StringField;
+import l9x.org.apache.lucene.document.TextField;
+import l9x.org.apache.lucene.search.FieldDoc;
+import l9x.org.apache.lucene.util.BytesRef;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;