This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch parallel-check in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit bb6e053f11ede39108a0ce00fd6358113c09ea7c Author: Jan Lehnardt <[email protected]> AuthorDate: Thu Dec 4 10:33:12 2025 +0100 chore: move nouveau to extra/nouveau to avoid parallel make target clobbering --- .gitattributes | 6 +- Makefile | 24 +-- dev/run | 4 +- {nouveau => extra/nouveau}/.gitignore | 0 {nouveau => extra/nouveau}/LICENSE | 0 {nouveau => extra/nouveau}/README.md | 0 {nouveau => extra/nouveau}/TODO | 0 {nouveau => extra/nouveau}/build.gradle | 0 .../nouveau}/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {nouveau => extra/nouveau}/gradlew | 0 {nouveau => extra/nouveau}/gradlew.bat | 184 ++++++++++----------- {nouveau => extra/nouveau}/settings.gradle | 0 .../apache/couchdb/nouveau/NouveauApplication.java | 0 .../nouveau/NouveauApplicationConfiguration.java | 0 .../apache/couchdb/nouveau/api/AnalyzeRequest.java | 0 .../couchdb/nouveau/api/AnalyzeResponse.java | 0 .../couchdb/nouveau/api/DocumentDeleteRequest.java | 0 .../couchdb/nouveau/api/DocumentUpdateRequest.java | 0 .../apache/couchdb/nouveau/api/DoubleField.java | 0 .../apache/couchdb/nouveau/api/DoubleRange.java | 0 .../java/org/apache/couchdb/nouveau/api/Field.java | 0 .../couchdb/nouveau/api/IndexDefinition.java | 0 .../org/apache/couchdb/nouveau/api/IndexInfo.java | 0 .../couchdb/nouveau/api/IndexInfoRequest.java | 0 .../java/org/apache/couchdb/nouveau/api/Ok.java | 0 .../java/org/apache/couchdb/nouveau/api/Range.java | 0 .../org/apache/couchdb/nouveau/api/SearchHit.java | 0 .../apache/couchdb/nouveau/api/SearchRequest.java | 0 .../apache/couchdb/nouveau/api/SearchResults.java | 0 .../apache/couchdb/nouveau/api/StoredField.java | 0 .../apache/couchdb/nouveau/api/StringField.java | 0 .../org/apache/couchdb/nouveau/api/TextField.java | 0 .../org/apache/couchdb/nouveau/core/IOUtils.java | 0 .../org/apache/couchdb/nouveau/core/Index.java | 0 .../apache/couchdb/nouveau/core/IndexFunction.java | 0 .../apache/couchdb/nouveau/core/IndexManager.java | 0 .../couchdb/nouveau/core/StaleIndexException.java | 0 .../apache/couchdb/nouveau/core/StripedLock.java | 0 .../nouveau/core/UpdatesOutOfOrderException.java | 0 .../couchdb/nouveau/core/UserAgentFilter.java | 0 .../couchdb/nouveau/core/ser/ByteArrayWrapper.java | 0 .../couchdb/nouveau/core/ser/DoubleWrapper.java | 0 .../couchdb/nouveau/core/ser/FloatWrapper.java | 0 .../couchdb/nouveau/core/ser/IntWrapper.java | 0 .../couchdb/nouveau/core/ser/LongWrapper.java | 0 .../couchdb/nouveau/core/ser/NullWrapper.java | 0 .../couchdb/nouveau/core/ser/PrimitiveWrapper.java | 0 .../couchdb/nouveau/core/ser/StringWrapper.java | 0 .../couchdb/nouveau/health/AnalyzeHealthCheck.java | 0 .../couchdb/nouveau/health/IndexHealthCheck.java | 0 .../nouveau/lucene9/Lucene9AnalyzerFactory.java | 0 .../couchdb/nouveau/lucene9/Lucene9Index.java | 0 .../nouveau/lucene9/Lucene9IndexSchema.java | 0 .../couchdb/nouveau/lucene9/Lucene9Module.java | 0 .../nouveau/lucene9/NouveauQueryParser.java | 0 .../nouveau/lucene9/ParallelSearcherFactory.java | 0 .../couchdb/nouveau/lucene9/QueryDeserializer.java | 0 .../couchdb/nouveau/lucene9/QuerySerializer.java | 0 .../lucene9/SimpleAsciiFoldingAnalyzer.java | 0 .../couchdb/nouveau/resources/AnalyzeResource.java | 0 .../couchdb/nouveau/resources/IndexResource.java | 0 .../couchdb/nouveau/tasks/CloseAllIndexesTask.java | 0 .../nouveau}/src/main/resources/banner.txt | 0 .../nouveau}/src/main/resources/openapi.yaml | 0 .../couchdb/nouveau/api/SearchRequestTest.java | 0 .../couchdb/nouveau/core/IndexManagerTest.java | 0 .../nouveau/health/AnalyzeHealthCheckTest.java | 0 .../nouveau/health/IndexHealthCheckTest.java | 0 .../lucene9/Lucene9AnalyzerFactoryTest.java | 0 .../couchdb/nouveau/lucene9/Lucene9IndexTest.java | 0 .../nouveau/lucene9/NouveauQueryParserTest.java | 0 .../nouveau/lucene9/QuerySerializationTest.java | 0 .../resources/fixtures/DocumentUpdateRequest.json | 0 .../src/test/resources/fixtures/SearchRequest.json | 0 75 files changed, 109 insertions(+), 109 deletions(-) diff --git a/.gitattributes b/.gitattributes index 7b7f56abb..0c4d7cf7b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -nouveau/**/* text eol=lf -nouveau/**/*.bat text eol=crlf -nouveau/**/*.jar binary +extra/nouveau/**/* text eol=lf +extra/nouveau/**/*.bat text eol=crlf +extra/nouveau/**/*.jar binary diff --git a/Makefile b/Makefile index eaa443f2f..947371e3c 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ include version.mk REBAR?=$(CURDIR)/bin/rebar REBAR3?=$(CURDIR)/bin/rebar3 ERLFMT?=$(CURDIR)/bin/erlfmt -GRADLE?=$(CURDIR)/nouveau/gradlew +GRADLE?=$(CURDIR)/extra/nouveau/gradlew # Handle the following scenarios: # 1. When building from a tarball, use version.mk. @@ -106,7 +106,7 @@ endif .PHONY: all # target: all - Build everything -all: couch-core fauxton docs escriptize nouveau +all: couch-core fauxton docs escriptize extra/nouveau .PHONY: help @@ -461,8 +461,8 @@ endif ifeq ($(with_nouveau), true) @mkdir rel/couchdb/nouveau - @cd nouveau && $(GRADLE) installDist - @cp -R nouveau/build/install/nouveau rel/couchdb + @cd extra/nouveau && $(GRADLE) installDist + @cp -R extra/nouveau/build/install/nouveau rel/couchdb endif @echo "... done" @@ -511,7 +511,7 @@ clean: @rm -rf src/couch_dist/certs/out @rm -rf src/docs/build src/docs/.venv ifeq ($(with_nouveau), true) - @cd nouveau && $(GRADLE) clean + @cd extra/nouveau && $(GRADLE) clean endif @@ -576,12 +576,12 @@ derived: # Nouveau ################################################################################ -.PHONY: nouveau +.PHONY: extra/nouveau # target: nouveau - Build nouveau -nouveau: +extra/nouveau: ifeq ($(with_nouveau), true) - @cd nouveau && $(GRADLE) spotlessApply - @cd nouveau && $(GRADLE) build -x test + @cd extra/nouveau && $(GRADLE) spotlessApply + @cd extra/nouveau && $(GRADLE) build -x test endif .PHONY: nouveau-test @@ -589,15 +589,15 @@ endif nouveau-test: nouveau-test-gradle nouveau-test-elixir .PHONY: nouveau-test-gradle -nouveau-test-gradle: couch-core nouveau +nouveau-test-gradle: couch-core extra/nouveau ifeq ($(with_nouveau), true) - @cd nouveau && $(GRADLE) test --info --rerun + @cd extra/nouveau && $(GRADLE) test --info --rerun endif .PHONY: nouveau-test-elixir nouveau-test-elixir: export MIX_ENV=integration nouveau-test-elixir: elixir-init devclean -nouveau-test-elixir: couch-core nouveau +nouveau-test-elixir: couch-core extra/nouveau ifeq ($(with_nouveau), true) @dev/run "$(TEST_OPTS)" -n 1 -q -a adm:pass --with-nouveau \ --locald-config test/config/test-config.ini \ diff --git a/dev/run b/dev/run index 640d15d22..c58b8a7cf 100755 --- a/dev/run +++ b/dev/run @@ -546,7 +546,7 @@ def boot_nouveau(ctx): config = os.path.join(ctx["devdir"], "lib", "nouveau.yaml") gradle = "gradlew.bat" if os.name == "nt" else "gradlew" cmd = [ - os.path.join(ctx["rootdir"], "nouveau", gradle), + os.path.join(ctx["rootdir"], "extra", "nouveau", gradle), "run", "--args", f"server '{config}'", @@ -555,7 +555,7 @@ def boot_nouveau(ctx): log = open(logfname, "w") return sp.Popen( cmd, - cwd=os.path.join(ctx["rootdir"], "nouveau"), + cwd=os.path.join(ctx["rootdir"], "extra", "nouveau"), stdin=sp.PIPE, stdout=log, stderr=sp.STDOUT, diff --git a/nouveau/.gitignore b/extra/nouveau/.gitignore similarity index 100% rename from nouveau/.gitignore rename to extra/nouveau/.gitignore diff --git a/nouveau/LICENSE b/extra/nouveau/LICENSE similarity index 100% rename from nouveau/LICENSE rename to extra/nouveau/LICENSE diff --git a/nouveau/README.md b/extra/nouveau/README.md similarity index 100% rename from nouveau/README.md rename to extra/nouveau/README.md diff --git a/nouveau/TODO b/extra/nouveau/TODO similarity index 100% rename from nouveau/TODO rename to extra/nouveau/TODO diff --git a/nouveau/build.gradle b/extra/nouveau/build.gradle similarity index 100% rename from nouveau/build.gradle rename to extra/nouveau/build.gradle diff --git a/nouveau/gradle/wrapper/gradle-wrapper.jar b/extra/nouveau/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from nouveau/gradle/wrapper/gradle-wrapper.jar rename to extra/nouveau/gradle/wrapper/gradle-wrapper.jar diff --git a/nouveau/gradle/wrapper/gradle-wrapper.properties b/extra/nouveau/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from nouveau/gradle/wrapper/gradle-wrapper.properties rename to extra/nouveau/gradle/wrapper/gradle-wrapper.properties diff --git a/nouveau/gradlew b/extra/nouveau/gradlew similarity index 100% rename from nouveau/gradlew rename to extra/nouveau/gradlew diff --git a/nouveau/gradlew.bat b/extra/nouveau/gradlew.bat similarity index 96% rename from nouveau/gradlew.bat rename to extra/nouveau/gradlew.bat index 25da30dbd..7101f8e46 100644 --- a/nouveau/gradlew.bat +++ b/extra/nouveau/gradlew.bat @@ -1,92 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/nouveau/settings.gradle b/extra/nouveau/settings.gradle similarity index 100% rename from nouveau/settings.gradle rename to extra/nouveau/settings.gradle diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleField.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleField.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleField.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleField.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleRange.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleRange.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleRange.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DoubleRange.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Field.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfoRequest.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Ok.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Ok.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/Ok.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Ok.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Range.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Range.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/Range.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/Range.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/StoredField.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/StoredField.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/StoredField.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/StoredField.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/StringField.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/StringField.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/StringField.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/StringField.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/api/TextField.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/TextField.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/api/TextField.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/api/TextField.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IOUtils.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IOUtils.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/IOUtils.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IOUtils.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexFunction.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexFunction.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexFunction.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexFunction.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/StaleIndexException.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/StaleIndexException.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/StaleIndexException.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/StaleIndexException.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/StripedLock.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/StripedLock.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/StripedLock.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/StripedLock.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UserAgentFilter.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UserAgentFilter.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/UserAgentFilter.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UserAgentFilter.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/ByteArrayWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/ByteArrayWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/ByteArrayWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/ByteArrayWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FloatWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FloatWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FloatWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FloatWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IntWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IntWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IntWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IntWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/LongWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/LongWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/LongWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/LongWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/NullWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/NullWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/NullWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/NullWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/PrimitiveWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/PrimitiveWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/PrimitiveWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/PrimitiveWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/StringWrapper.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/StringWrapper.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/StringWrapper.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/StringWrapper.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexHealthCheck.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactory.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Index.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexSchema.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Module.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParser.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/ParallelSearcherFactory.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QueryDeserializer.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/QuerySerializer.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/lucene9/SimpleAsciiFoldingAnalyzer.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/tasks/CloseAllIndexesTask.java b/extra/nouveau/src/main/java/org/apache/couchdb/nouveau/tasks/CloseAllIndexesTask.java similarity index 100% rename from nouveau/src/main/java/org/apache/couchdb/nouveau/tasks/CloseAllIndexesTask.java rename to extra/nouveau/src/main/java/org/apache/couchdb/nouveau/tasks/CloseAllIndexesTask.java diff --git a/nouveau/src/main/resources/banner.txt b/extra/nouveau/src/main/resources/banner.txt similarity index 100% rename from nouveau/src/main/resources/banner.txt rename to extra/nouveau/src/main/resources/banner.txt diff --git a/nouveau/src/main/resources/openapi.yaml b/extra/nouveau/src/main/resources/openapi.yaml similarity index 100% rename from nouveau/src/main/resources/openapi.yaml rename to extra/nouveau/src/main/resources/openapi.yaml diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheckTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheckTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheckTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheckTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/health/IndexHealthCheckTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/health/IndexHealthCheckTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/health/IndexHealthCheckTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/health/IndexHealthCheckTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9AnalyzerFactoryTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/Lucene9IndexTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/NouveauQueryParserTest.java diff --git a/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java b/extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java similarity index 100% rename from nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java rename to extra/nouveau/src/test/java/org/apache/couchdb/nouveau/lucene9/QuerySerializationTest.java diff --git a/nouveau/src/test/resources/fixtures/DocumentUpdateRequest.json b/extra/nouveau/src/test/resources/fixtures/DocumentUpdateRequest.json similarity index 100% rename from nouveau/src/test/resources/fixtures/DocumentUpdateRequest.json rename to extra/nouveau/src/test/resources/fixtures/DocumentUpdateRequest.json diff --git a/nouveau/src/test/resources/fixtures/SearchRequest.json b/extra/nouveau/src/test/resources/fixtures/SearchRequest.json similarity index 100% rename from nouveau/src/test/resources/fixtures/SearchRequest.json rename to extra/nouveau/src/test/resources/fixtures/SearchRequest.json
