diff --git a/pom.xml b/pom.xml index b23f80d55..8f34614db 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,10 @@ 4.0.0 org.springframework.data - spring-data-couchbase-parent + spring-data-couchbase 5.0.0-SNAPSHOT - pom - Spring Data Couchbase Parent + Spring Data Couchbase Spring Data integration for Couchbase https://github.com/spring-projects/spring-data-couchbase @@ -18,24 +17,234 @@ 3.0.0-SNAPSHOT - - spring-data-couchbase - spring-data-couchbase-distribution - - 3.3.4 3.3.4 3.0.0-SNAPSHOT spring.data.couchbase + 7.0.1.Final + 1.1.3 + 5.0.0 + 3.7.4 + 3.1.0 + 2.10.13 + 2.13.4 + 4.0.0 + + + + org.testcontainers + testcontainers-bom + ${testcontainers} + pom + import + + + + + + + com.querydsl + querydsl-apt + ${querydsl} + provided + + + + org.springframework + spring-context-support + + + + org.springframework + spring-web + + + + org.springframework + spring-tx + + + + ${project.groupId} + spring-data-commons + ${springdata.commons} + + com.couchbase.client java-client ${couchbase} + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${cdi} + provided + true + + + + org.springframework + spring-test + ${spring} + test + + + + org.hibernate.validator + hibernate-validator + 7.0.1.Final + test + + + + org.apache.httpcomponents + httpclient + 4.5.13 + test + + + + io.projectreactor + reactor-test + test + + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-joda} + test + + + + com.fasterxml.jackson.core + jackson-databind + + + + joda-time + joda-time + ${jodatime} + true + + + + org.testcontainers + testcontainers + test + + + + + jakarta.validation + jakarta.validation-api + ${validation} + true + + + + jakarta.el + jakarta.el-api + ${jakarta.el} + provided + true + + + + org.glassfish + jakarta.el + ${jakarta.el} + provided + true + + + + + + org.apache.geronimo.specs + geronimo-jcdi_2.0_spec + 1.0.1 + test + + + + javax.interceptor + javax.interceptor-api + 1.2.1 + test + + + + org.apache.openwebbeans + openwebbeans-se + ${webbeans} + test + + + + com.couchbase.mock + CouchbaseMock + 1.5.25 + test + + + + com.squareup.okhttp3 + okhttp + 4.8.1 + test + + + + com.squareup.okhttp3 + okhttp-tls + 4.8.1 + test + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin} + true + + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin} + true + + + + org.jetbrains.kotlin + kotlin-test + ${kotlin} + test + + + + org.awaitility + awaitility + 4.0.3 + test + + + + com.couchbase.client + couchbase-encryption + ${couchbase.encryption} + test + + @@ -62,4 +271,104 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + false + + **/*Test.java + **/*Tests.java + + + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + false + + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${java-module-name} + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + org.asciidoctor + asciidoctor-maven-plugin + + + com.mysema.maven + apt-maven-plugin + ${apt} + + + com.querydsl + querydsl-apt + ${querydsl} + + + + + generate-test-sources + + test-process + + + target/generated-test-sources + org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + generate-test-sources + + add-source + + + + target/generated-test-sources + + + + + + + diff --git a/spring-data-couchbase-distribution/pom.xml b/spring-data-couchbase-distribution/pom.xml deleted file mode 100644 index d0dde5ff4..000000000 --- a/spring-data-couchbase-distribution/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 4.0.0 - - spring-data-couchbase-distribution - - pom - - Spring Data Couchbase - Distribution - Distribution build for Spring Data Couchbase - - - org.springframework.data - spring-data-couchbase-parent - 5.0.0-SNAPSHOT - ../pom.xml - - - - ${basedir}/.. - SDCOUCH - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.asciidoctor - asciidoctor-maven-plugin - - - - - - diff --git a/spring-data-testapp/HELP.md b/spring-data-testapp/HELP.md deleted file mode 100644 index b54a59088..000000000 --- a/spring-data-testapp/HELP.md +++ /dev/null @@ -1,10 +0,0 @@ -# Getting Started - -### Reference Documentation -For further reference, please consider the following sections: - -* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) -* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.5.2/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.5.2/maven-plugin/reference/html/#build-image) -* [Spring Data Couchbase](https://docs.spring.io/spring-boot/docs/2.5.2/reference/htmlsingle/#boot-features-couchbase) - diff --git a/spring-data-testapp/mvnw b/spring-data-testapp/mvnw deleted file mode 100644 index a16b5431b..000000000 --- a/spring-data-testapp/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-data-testapp/mvnw.cmd b/spring-data-testapp/mvnw.cmd deleted file mode 100644 index c8d43372c..000000000 --- a/spring-data-testapp/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. 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, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - -FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/spring-data-testapp/pom.xml b/spring-data-testapp/pom.xml deleted file mode 100644 index 47c0cfb6d..000000000 --- a/spring-data-testapp/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot - spring-boot-starter-parent - 3.0.0-SNAPSHOT - - - com.example - demo - 0.0.1-SNAPSHOT - demo - Demo project for Spring Boot - - - 5.0.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-data-couchbase - - - org.springframework.data - spring-data-couchbase - - - - - - org.springframework.data - spring-data-couchbase - ${springdata.couchbase} - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - spring-libs-snapshot - https://repo.spring.io/libs-snapshot - - - sonatype-snapshot - https://oss.sonatype.org/content/repositories/snapshots - - true - - - false - - - - - - - spring-snapshots - https://repo.spring.io/snapshot - - - spring-milestones - https://repo.spring.io/milestone - - - - diff --git a/spring-data-testapp/src/main/java/com/example/demo/AirlineGates.java b/spring-data-testapp/src/main/java/com/example/demo/AirlineGates.java deleted file mode 100644 index c2a166973..000000000 --- a/spring-data-testapp/src/main/java/com/example/demo/AirlineGates.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2012-2022 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.demo; - -import org.springframework.data.annotation.Id; -import org.springframework.data.annotation.PersistenceConstructor; -import org.springframework.data.annotation.Version; -import org.springframework.data.couchbase.core.index.QueryIndexed; -import org.springframework.data.couchbase.core.mapping.Document; - -@Document -/** - * @author Michael Reiche - */ -public class AirlineGates { - @Id String id; - @Version Long version; - - @QueryIndexed String name; - String iata; - Long gates; - - @PersistenceConstructor - public AirlineGates(String id, String name, String iata, Long gates) { - this.id = id; - this.name = name; - this.iata = iata; - this.gates = gates; - } - - public String getId() { - return id; - } - - public String getName() { - return name; - } - - public String getIata() { - return iata; - } - - public Long getGates() { - return gates; - } - - public String toString(){ - StringBuffer sb=new StringBuffer(); - sb.append("{"); - sb.append("\"id\":"+id); - sb.append(", \"name\":"+name); - sb.append(", \"iata\":"+iata); - sb.append(", \"gates\":"+gates); - sb.append("}"); - - return sb.toString(); - } - -} diff --git a/spring-data-testapp/src/main/java/com/example/demo/AirlineGatesRepository.java b/spring-data-testapp/src/main/java/com/example/demo/AirlineGatesRepository.java deleted file mode 100644 index 49b974edd..000000000 --- a/spring-data-testapp/src/main/java/com/example/demo/AirlineGatesRepository.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2017-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.demo; - -import org.springframework.data.couchbase.repository.CouchbaseRepository; -import org.springframework.data.couchbase.repository.DynamicProxyable; -import org.springframework.stereotype.Repository; - -/** - * @author Michael Reiche - */ -@Repository -public interface AirlineGatesRepository - extends CouchbaseRepository, DynamicProxyable { - -} diff --git a/spring-data-testapp/src/main/java/com/example/demo/AirlineGatesService.java b/spring-data-testapp/src/main/java/com/example/demo/AirlineGatesService.java deleted file mode 100644 index b6c8a16c4..000000000 --- a/spring-data-testapp/src/main/java/com/example/demo/AirlineGatesService.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2022 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.demo; - -import org.springframework.data.couchbase.core.CouchbaseTemplate; -import org.springframework.data.couchbase.core.ReactiveCouchbaseOperations; -import org.springframework.data.couchbase.core.ReactiveCouchbaseTemplate; -import org.springframework.data.couchbase.core.TransactionalSupport; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import reactor.core.publisher.Mono; - -/** - * @author Michael Reiche - */ -@Service -public class AirlineGatesService { - CouchbaseTemplate template; - ReactiveCouchbaseTemplate reactiveTemplate; - public AirlineGatesService(CouchbaseTemplate template) { - this.template = template; - this.reactiveTemplate = template.reactive(); - } - - - // The @Transactional annotation results in the method of the proxy for the service executing this in a transaction - @Transactional - public void transferGates(String fromId, String toId, int gatesToTransfer, RuntimeException exceptionToThrow) { - // May wish to include this check to confirm this is actually in a transaction. - TransactionalSupport.checkForTransactionInThreadLocalStorage().map((h) -> { - if (!h.isPresent()) - throw new RuntimeException("not in transaction!"); - return h; - }); - - AirlineGates fromAirlineGates = template.findById(AirlineGates.class).one(fromId); - AirlineGates toAirlineGates = template.findById(AirlineGates.class).one(toId); - toAirlineGates.gates += gatesToTransfer; - fromAirlineGates.gates -= gatesToTransfer; - template.save(fromAirlineGates); - if(exceptionToThrow != null){ - throw exceptionToThrow; - } - template.save(toAirlineGates); - } - // The @Transactional annotation results in the method of the proxy for the service executing this in a transaction - @Transactional - public Mono transferGatesReactive(String fromId, String toId, int gatesToTransfer, RuntimeException exceptionToThrow) { - return Mono.deferContextual(ctx -> { - // May wish to include this check to confirm this is actually in a transaction. - TransactionalSupport.checkForTransactionInThreadLocalStorage().map((h) -> { - if (!h.isPresent()) - throw new RuntimeException("not in transaction!"); - return h; - }); - - AirlineGates fromAirlineGates = template.findById(AirlineGates.class).one(fromId); - AirlineGates toAirlineGates = template.findById(AirlineGates.class).one(toId); - toAirlineGates.gates += gatesToTransfer; - fromAirlineGates.gates -= gatesToTransfer; - template.save(fromAirlineGates); - if(exceptionToThrow != null){ - throw exceptionToThrow; - } - return reactiveTemplate.save(toAirlineGates).then(); - }); - } - - // This does not have the @Transactional annotation therefore is not executed in a transaction - public AirlineGates save(AirlineGates airlineGates) { - return template.save(airlineGates); - } - - // This does not have the @Transactional annotation therefore is not executed in a transaction - public AirlineGates findById(String id) { - return template.findById(AirlineGates.class).one(id); - } -} diff --git a/spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java b/spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java deleted file mode 100644 index 0f3486572..000000000 --- a/spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2022 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.demo; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; -import org.springframework.data.couchbase.core.CouchbaseTemplate; -import org.springframework.data.couchbase.transaction.error.TransactionSystemUnambiguousException; -import org.springframework.stereotype.Component; -import org.springframework.util.Assert; - -/** - * Components of the type CommandLineRunner are called right after the application start up. So the method *run* is - * called as soon as the application starts. - * - * @author Michael Reiche - */ -@Component -public class CmdRunner implements CommandLineRunner { - - @Autowired CouchbaseTemplate template; - @Autowired AirlineGatesService airlineGatesService; - - @Override - public void run(String... strings) { - - try { // remove leftovers from previous run - template.removeById(AirlineGates.class).one("1"); - } catch (Exception e) {} - try { - template.removeById(AirlineGates.class).one("2"); - } catch (Exception e) {} - - AirlineGates airlineGates1 = new AirlineGates("1", "JFK", "American Airlines", Long.valueOf(200)); //1 - AirlineGates airlineGates2 = new AirlineGates("2", "JFK", "Lufthansa", Long.valueOf(200)); - AirlineGates saved1 = airlineGatesService.save(airlineGates1); - AirlineGates saved2 = airlineGatesService.save(airlineGates2); - AirlineGates found1 = airlineGatesService.findById(saved1.getId()); //2 - AirlineGates found2 = airlineGatesService.findById(saved2.getId()); - System.err.println("initialized airlines"); - System.err.println(" found before transferGates: " + found1); - System.err.println(" found before transferGates: " + found2); - System.err.println("this transferGates attempt will succeed"); - // move 50 gates from airline1 to airline2 - int gatesToTransfer=50; - airlineGatesService.transferGates(airlineGates1.getId(), airlineGates2.getId(), gatesToTransfer, null); //3 - found1 = airlineGatesService.findById(saved1.getId()); - found2 = airlineGatesService.findById(saved2.getId()); - System.err.println(" found after transferGates: " + found1); //4 - System.err.println(" found after transferGates: " + found2); - Assert.isTrue(found1.getGates().equals(airlineGates1.getGates()-gatesToTransfer), "should have transferred"); - Assert.isTrue(found2.getGates().equals(airlineGates1.getGates()+gatesToTransfer), "should have transferred"); - System.err.println("this transferGates attempt will fail"); - // attempt to move 44 gates from airline1 to airline2, but it fails. - try { - // 5 - airlineGatesService.transferGates(airlineGates1.getId(), airlineGates2.getId(), 44, new SimulateErrorException()); - } catch (RuntimeException rte) { - if (!(rte instanceof TransactionSystemUnambiguousException) && rte != null - && rte.getCause() instanceof SimulateErrorException) { - throw rte; - } - System.err.println(" got exception "+rte); - } - System.err.println(" found after transferGates: " + airlineGatesService.findById(airlineGates1.getId())); - System.err.println(" found after transferGates: " + airlineGatesService.findById(airlineGates2.getId())); - Assert.isTrue(found1.getGates().equals(airlineGates1.getGates()-gatesToTransfer), "should be same as previous"); - Assert.isTrue(found2.getGates().equals(airlineGates1.getGates()+gatesToTransfer), "should be same as previous"); - System.err.println("this transferGates attempt will succeed"); - try { - // 5 - airlineGatesService.transferGatesReactive(airlineGates1.getId(), airlineGates2.getId(), 44, null).block(); - } catch (RuntimeException rte) { - if (!(rte instanceof TransactionSystemUnambiguousException) && rte != null - && rte.getCause() instanceof SimulateErrorException) { - throw rte; - } - System.err.println(" got exception "+rte); - } - System.err.println(" found after transferGates: " + airlineGatesService.findById(airlineGates1.getId())); - System.err.println(" found after transferGates: " + airlineGatesService.findById(airlineGates2.getId())); - Assert.isTrue(found1.getGates().equals(airlineGates1.getGates()-gatesToTransfer), "should have transferred"); - Assert.isTrue(found2.getGates().equals(airlineGates1.getGates()+gatesToTransfer), "should have transferred"); - } - - static class SimulateErrorException extends RuntimeException {} -} diff --git a/spring-data-testapp/src/main/java/com/example/demo/Config.java b/spring-data-testapp/src/main/java/com/example/demo/Config.java deleted file mode 100644 index 40286eabd..000000000 --- a/spring-data-testapp/src/main/java/com/example/demo/Config.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2022 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.demo; - -import com.couchbase.client.core.msg.kv.DurabilityLevel; -import com.couchbase.client.java.env.ClusterEnvironment; -import com.couchbase.client.java.transactions.config.TransactionsConfig; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration; -import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * - * - * @author Michael Reiche - */ -@Configuration -@EnableCouchbaseRepositories({"com.example.demo"}) -@EnableTransactionManagement -public class Config extends AbstractCouchbaseConfiguration { - @Override - public String getConnectionString() { - return "127.0.0.1"; - } - - @Override - public String getUserName() { - return "Administrator"; - } - - @Override - public String getPassword() { - return "password"; - } - - @Override - public String getBucketName() { - return "travel-sample"; - } - - @Override - public void configureEnvironment(ClusterEnvironment.Builder builder){ - builder.transactionsConfig(TransactionsConfig.durabilityLevel(DurabilityLevel.NONE)); - } - - -} diff --git a/spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java b/spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100644 index cd3e158e8..000000000 --- a/spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2022 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import java.util.Properties; - -/** - * - * - * @author Michael Reiche - */ -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run( DemoApplication.class, args ); - } - -} diff --git a/spring-data-testapp/src/main/resources/application.properties b/spring-data-testapp/src/main/resources/application.properties deleted file mode 100644 index e439ebd85..000000000 --- a/spring-data-testapp/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.main.allow-bean-definition-overriding=true diff --git a/spring-data-testapp/src/main/resources/logback.xml b/spring-data-testapp/src/main/resources/logback.xml deleted file mode 100644 index 6d412e44e..000000000 --- a/spring-data-testapp/src/main/resources/logback.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - %d %5p %40.40c:%4L - %m%n - - - - - - - - - - - - " - - " - - - diff --git a/spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java b/spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java deleted file mode 100644 index 2408a6191..000000000 --- a/spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2022 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.example.demo; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * - * - * @author Michael Reiche - */ -@SpringBootTest -class DemoApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/spring-data-couchbase/src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java b/src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java similarity index 100% rename from spring-data-couchbase/src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java rename to src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java diff --git a/spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java b/src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java similarity index 100% rename from spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java rename to src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java diff --git a/spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java b/src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java similarity index 100% rename from spring-data-couchbase/src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java rename to src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java b/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java rename to src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java b/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java rename to src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java b/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java rename to src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java rename to src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java rename to src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java rename to src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java rename to src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java b/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java rename to src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java rename to src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/BeanNames.java b/src/main/java/org/springframework/data/couchbase/config/BeanNames.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/BeanNames.java rename to src/main/java/org/springframework/data/couchbase/config/BeanNames.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/package-info.java b/src/main/java/org/springframework/data/couchbase/config/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/config/package-info.java rename to src/main/java/org/springframework/data/couchbase/config/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java rename to src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java b/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java rename to src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java rename to src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java b/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java rename to src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java b/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java rename to src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java b/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java rename to src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java rename to src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java b/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java rename to src/main/java/org/springframework/data/couchbase/core/RemoveResult.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java rename to src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java b/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java rename to src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java b/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java rename to src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java rename to src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java b/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java rename to src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java b/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java rename to src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java b/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java rename to src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java b/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java rename to src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java rename to src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java rename to src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java b/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java rename to src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java rename to src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/package-info.java b/src/main/java/org/springframework/data/couchbase/core/convert/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/package-info.java rename to src/main/java/org/springframework/data/couchbase/core/convert/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java b/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java rename to src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java b/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java rename to src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java b/src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java rename to src/main/java/org/springframework/data/couchbase/core/convert/translation/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java b/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java rename to src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java b/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java rename to src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java b/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java rename to src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java b/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java rename to src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java b/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java rename to src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java rename to src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java rename to src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java rename to src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/Document.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/Field.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java b/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/event/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java b/src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java rename to src/main/java/org/springframework/data/couchbase/core/mapping/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/package-info.java b/src/main/java/org/springframework/data/couchbase/core/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/package-info.java rename to src/main/java/org/springframework/data/couchbase/core/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java b/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java rename to src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java b/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java rename to src/main/java/org/springframework/data/couchbase/core/query/Consistency.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java b/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java rename to src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java b/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java rename to src/main/java/org/springframework/data/couchbase/core/query/FetchType.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java b/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java rename to src/main/java/org/springframework/data/couchbase/core/query/HashSide.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Meta.java b/src/main/java/org/springframework/data/couchbase/core/query/Meta.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Meta.java rename to src/main/java/org/springframework/data/couchbase/core/query/Meta.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java b/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java rename to src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java b/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java rename to src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java b/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java rename to src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java b/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java rename to src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java b/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java rename to src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java b/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java rename to src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Query.java b/src/main/java/org/springframework/data/couchbase/core/query/Query.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/Query.java rename to src/main/java/org/springframework/data/couchbase/core/query/Query.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java rename to src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java rename to src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java b/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java rename to src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/View.java b/src/main/java/org/springframework/data/couchbase/core/query/View.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/View.java rename to src/main/java/org/springframework/data/couchbase/core/query/View.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java b/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java rename to src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java b/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java rename to src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/package-info.java b/src/main/java/org/springframework/data/couchbase/core/query/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/query/package-info.java rename to src/main/java/org/springframework/data/couchbase/core/query/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java b/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java rename to src/main/java/org/springframework/data/couchbase/core/support/AnyId.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java rename to src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java b/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java rename to src/main/java/org/springframework/data/couchbase/core/support/InCollection.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InScope.java b/src/main/java/org/springframework/data/couchbase/core/support/InScope.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/InScope.java rename to src/main/java/org/springframework/data/couchbase/core/support/InScope.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java rename to src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java b/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java rename to src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java b/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java rename to src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java b/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java b/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java b/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java b/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java b/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java b/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java b/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java b/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java rename to src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Collection.java b/src/main/java/org/springframework/data/couchbase/repository/Collection.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Collection.java rename to src/main/java/org/springframework/data/couchbase/repository/Collection.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java rename to src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java b/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java rename to src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Options.java b/src/main/java/org/springframework/data/couchbase/repository/Options.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Options.java rename to src/main/java/org/springframework/data/couchbase/repository/Options.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Query.java b/src/main/java/org/springframework/data/couchbase/repository/Query.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Query.java rename to src/main/java/org/springframework/data/couchbase/repository/Query.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java rename to src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java b/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java rename to src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Scope.java b/src/main/java/org/springframework/data/couchbase/repository/Scope.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/Scope.java rename to src/main/java/org/springframework/data/couchbase/repository/Scope.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java rename to src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java rename to src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java rename to src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java rename to src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java rename to src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java rename to src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java b/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java rename to src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java rename to src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java rename to src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java b/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java rename to src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java b/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java rename to src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java rename to src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java rename to src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java rename to src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java b/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java rename to src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/config/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/config/package-info.java rename to src/main/java/org/springframework/data/couchbase/repository/config/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/package-info.java rename to src/main/java/org/springframework/data/couchbase/repository/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java rename to src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java b/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java rename to src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java rename to src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java rename to src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java rename to src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java b/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java rename to src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java rename to src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java b/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java rename to src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java rename to src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/query/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/package-info.java rename to src/main/java/org/springframework/data/couchbase/repository/query/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java rename to src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java rename to src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java rename to src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java rename to src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java rename to src/main/java/org/springframework/data/couchbase/repository/query/support/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java b/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java rename to src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java rename to src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java rename to src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java rename to src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java b/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java rename to src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java rename to src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java b/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java rename to src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java b/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java rename to src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java b/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java rename to src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java b/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java rename to src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java b/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java rename to src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java b/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java rename to src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java b/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java rename to src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java rename to src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java rename to src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java rename to src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java rename to src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java rename to src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java rename to src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/Util.java b/src/main/java/org/springframework/data/couchbase/repository/support/Util.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/Util.java rename to src/main/java/org/springframework/data/couchbase/repository/support/Util.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java b/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java rename to src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java rename to src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java rename to src/main/java/org/springframework/data/couchbase/repository/support/package-info.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java rename to src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java rename to src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java rename to src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java rename to src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java rename to src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java rename to src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java rename to src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java rename to src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java rename to src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java rename to src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java diff --git a/spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java similarity index 100% rename from spring-data-couchbase/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java rename to src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java diff --git a/spring-data-couchbase/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from spring-data-couchbase/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension rename to src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/spring-data-couchbase/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-data-couchbase/src/main/resources/META-INF/spring.factories rename to src/main/resources/META-INF/spring.factories diff --git a/spring-data-couchbase/src/main/resources/META-INF/spring.handlers b/src/main/resources/META-INF/spring.handlers similarity index 100% rename from spring-data-couchbase/src/main/resources/META-INF/spring.handlers rename to src/main/resources/META-INF/spring.handlers diff --git a/spring-data-couchbase/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas similarity index 100% rename from spring-data-couchbase/src/main/resources/META-INF/spring.schemas rename to src/main/resources/META-INF/spring.schemas diff --git a/spring-data-couchbase/src/main/resources/META-INF/spring.tooling b/src/main/resources/META-INF/spring.tooling similarity index 100% rename from spring-data-couchbase/src/main/resources/META-INF/spring.tooling rename to src/main/resources/META-INF/spring.tooling diff --git a/spring-data-couchbase/src/main/resources/changelog.txt b/src/main/resources/changelog.txt similarity index 100% rename from spring-data-couchbase/src/main/resources/changelog.txt rename to src/main/resources/changelog.txt diff --git a/spring-data-couchbase/src/main/resources/license.txt b/src/main/resources/license.txt similarity index 100% rename from spring-data-couchbase/src/main/resources/license.txt rename to src/main/resources/license.txt diff --git a/spring-data-couchbase/src/main/resources/notice.txt b/src/main/resources/notice.txt similarity index 100% rename from spring-data-couchbase/src/main/resources/notice.txt rename to src/main/resources/notice.txt diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java b/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java rename to src/test/java/org/springframework/data/couchbase/cache/CacheUser.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java b/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java rename to src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java rename to src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java b/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java rename to src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java rename to src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java rename to src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java rename to src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java rename to src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Address.java b/src/test/java/org/springframework/data/couchbase/domain/Address.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Address.java rename to src/test/java/org/springframework/data/couchbase/domain/Address.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java rename to src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java b/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java rename to src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airline.java b/src/test/java/org/springframework/data/couchbase/domain/Airline.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airline.java rename to src/test/java/org/springframework/data/couchbase/domain/Airline.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airport.java b/src/test/java/org/springframework/data/couchbase/domain/Airport.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Airport.java rename to src/test/java/org/springframework/data/couchbase/domain/Airport.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java b/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java rename to src/test/java/org/springframework/data/couchbase/domain/AirportMini.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java rename to src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java rename to src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java b/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java rename to src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java b/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java rename to src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java b/src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java rename to src/test/java/org/springframework/data/couchbase/domain/CollectionsConfig.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java b/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java rename to src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Config.java b/src/test/java/org/springframework/data/couchbase/domain/Config.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Config.java rename to src/test/java/org/springframework/data/couchbase/domain/Config.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Course.java b/src/test/java/org/springframework/data/couchbase/domain/Course.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Course.java rename to src/test/java/org/springframework/data/couchbase/domain/Course.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java b/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java rename to src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Iata.java b/src/test/java/org/springframework/data/couchbase/domain/Iata.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Iata.java rename to src/test/java/org/springframework/data/couchbase/domain/Iata.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Library.java b/src/test/java/org/springframework/data/couchbase/domain/Library.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Library.java rename to src/test/java/org/springframework/data/couchbase/domain/Library.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java b/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java b/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java rename to src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java b/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java rename to src/test/java/org/springframework/data/couchbase/domain/OtherUser.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Person.java b/src/test/java/org/springframework/data/couchbase/domain/Person.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Person.java rename to src/test/java/org/springframework/data/couchbase/domain/Person.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java b/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java rename to src/test/java/org/springframework/data/couchbase/domain/PersonValue.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java b/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java b/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java rename to src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Submission.java b/src/test/java/org/springframework/data/couchbase/domain/Submission.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/Submission.java rename to src/test/java/org/springframework/data/couchbase/domain/Submission.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java rename to src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java b/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java rename to src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java b/src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java rename to src/test/java/org/springframework/data/couchbase/domain/TypeAwareTypeInformationMapper.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java b/src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java rename to src/test/java/org/springframework/data/couchbase/domain/TypeBasedCouchbaseTypeMapper.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/User.java b/src/test/java/org/springframework/data/couchbase/domain/User.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/User.java rename to src/test/java/org/springframework/data/couchbase/domain/User.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java rename to src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java rename to src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java rename to src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserCol.java b/src/test/java/org/springframework/data/couchbase/domain/UserCol.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserCol.java rename to src/test/java/org/springframework/data/couchbase/domain/UserCol.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java b/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java rename to src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java b/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java rename to src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/UserRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java rename to src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java b/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java rename to src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java b/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java rename to src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java b/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java rename to src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java b/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java rename to src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java rename to src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java rename to src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java b/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java rename to src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java b/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java rename to src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java b/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java rename to src/test/java/org/springframework/data/couchbase/transactions/PersonService.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java b/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java rename to src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java b/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java rename to src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java b/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java rename to src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java b/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java rename to src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java b/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java rename to src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Capabilities.java b/src/test/java/org/springframework/data/couchbase/util/Capabilities.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Capabilities.java rename to src/test/java/org/springframework/data/couchbase/util/Capabilities.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java b/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java rename to src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterType.java b/src/test/java/org/springframework/data/couchbase/util/ClusterType.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/ClusterType.java rename to src/test/java/org/springframework/data/couchbase/util/ClusterType.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java b/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java rename to src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java rename to src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java b/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java rename to src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Services.java b/src/test/java/org/springframework/data/couchbase/util/Services.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Services.java rename to src/test/java/org/springframework/data/couchbase/util/Services.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestCluster.java b/src/test/java/org/springframework/data/couchbase/util/TestCluster.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestCluster.java rename to src/test/java/org/springframework/data/couchbase/util/TestCluster.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java b/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java rename to src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java b/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java rename to src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java b/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java rename to src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java diff --git a/spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Util.java b/src/test/java/org/springframework/data/couchbase/util/Util.java similarity index 100% rename from spring-data-couchbase/src/test/java/org/springframework/data/couchbase/util/Util.java rename to src/test/java/org/springframework/data/couchbase/util/Util.java diff --git a/spring-data-couchbase/src/test/resources/META-INF/beans.xml b/src/test/resources/META-INF/beans.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/META-INF/beans.xml rename to src/test/resources/META-INF/beans.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbase-consistency.xml b/src/test/resources/configurations/couchbase-consistency.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbase-consistency.xml rename to src/test/resources/configurations/couchbase-consistency.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbase-multi-bucket-bean.xml b/src/test/resources/configurations/couchbase-multi-bucket-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbase-multi-bucket-bean.xml rename to src/test/resources/configurations/couchbase-multi-bucket-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbase-repository-bean.xml b/src/test/resources/configurations/couchbase-repository-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbase-repository-bean.xml rename to src/test/resources/configurations/couchbase-repository-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbase-template-bean.xml b/src/test/resources/configurations/couchbase-template-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbase-template-bean.xml rename to src/test/resources/configurations/couchbase-template-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml b/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml rename to src/test/resources/configurations/couchbase-template-with-translation-service-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbase-typekey.xml b/src/test/resources/configurations/couchbase-typekey.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbase-typekey.xml rename to src/test/resources/configurations/couchbase-typekey.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbaseBucket-bean.xml b/src/test/resources/configurations/couchbaseBucket-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbaseBucket-bean.xml rename to src/test/resources/configurations/couchbaseBucket-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbaseCluster-bean.xml b/src/test/resources/configurations/couchbaseCluster-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbaseCluster-bean.xml rename to src/test/resources/configurations/couchbaseCluster-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbaseEnv-bean.xml b/src/test/resources/configurations/couchbaseEnv-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbaseEnv-bean.xml rename to src/test/resources/configurations/couchbaseEnv-bean.xml diff --git a/spring-data-couchbase/src/test/resources/configurations/couchbaseSingleEnv-bean.xml b/src/test/resources/configurations/couchbaseSingleEnv-bean.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/configurations/couchbaseSingleEnv-bean.xml rename to src/test/resources/configurations/couchbaseSingleEnv-bean.xml diff --git a/spring-data-couchbase/src/test/resources/integration.properties b/src/test/resources/integration.properties similarity index 100% rename from spring-data-couchbase/src/test/resources/integration.properties rename to src/test/resources/integration.properties diff --git a/spring-data-couchbase/src/test/resources/logback.xml b/src/test/resources/logback.xml similarity index 100% rename from spring-data-couchbase/src/test/resources/logback.xml rename to src/test/resources/logback.xml diff --git a/spring-data-couchbase/src/test/resources/server.properties b/src/test/resources/server.properties similarity index 100% rename from spring-data-couchbase/src/test/resources/server.properties rename to src/test/resources/server.properties