diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..d064a7cf
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,17 @@
+org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
+antlrVersion=2.7.7
+apacheGeodeVersion=1.15.0
+apacheLog4jBomVersion=2.19.0
+apacheShiroVersion=1.9.1
+aspectjVersion=1.9.9.1
+cacheApiVersion=1.1.1
+jacksonVersion=2.13.4
+logbackVersion="1.2.11"
+snappyVersion=0.4
+springVersion=6.0.0-M6
+springDataBomVersion=2021.2.4-SNAPSHOT
+#springDataBuildParentVersion=2.7.4-SNAPSHOT
+springDataCommonsVersion=2.7.4-SNAPSHOT
+springDataGeodeTestVersion=0.3.0-RAJ
+springShellVersion=1.2.0.RELEASE
+version=2.8.0-SNAPSHOT
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
new file mode 100644
index 00000000..984f9f2d
--- /dev/null
+++ b/gradle/dependency-management.gradle
@@ -0,0 +1,59 @@
+// Build-time dependency versions
+ext['assertjVersion'] = "3.23.1"
+ext['findbugsVersion'] = "3.0.2"
+ext['junitVersion'] = "4.13.2"
+ext['junitBomVersion'] = "5.9.1"
+ext['lombokVersion'] = "1.18.24"
+ext['mockitoBomVersion'] = "4.8.0"
+ext['multithreadedtcVersion'] = "1.01"
+ext['testcontainersVersion'] = "1.17.3"
+
+dependencyManagement {
+	imports {
+
+		// Declared and managed JUnit Platform BOM version
+		mavenBom "org.junit:junit-bom:$junitBomVersion"
+
+		// Declared and managed Mockito BOM version
+		mavenBom "org.mockito:mockito-bom:$mockitoBomVersion"
+
+		// Declared and managed Spring Framework BOM version
+		mavenBom "org.springframework:spring-framework-bom:$springVersion"
+
+		// Declared and managed Spring Data BOM version
+		mavenBom "org.springframework.data:spring-data-bom:$springDataBomVersion"
+
+		// Declared and managed Spring Data Build Parent version
+		//mavenBom "org.springframework.data.build:spring-data-parent:$springDataBuildParentVersion"
+
+		mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
+
+		// Declared and managed Micrometer (BOM) version based on Apache Geode 1.14.3's declared, required Micrometer
+		// version (1.6.3). Spring Boot 3.0 declares and depends on Micrometer 2.0.
+		//mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
+
+		// Declared and managed Testcontainers libraries version.
+		mavenBom "org.testcontainers:testcontainers-bom:$testcontainersVersion"
+
+	}
+	dependencies {
+		dependency "antlr:antlr:$antlrVersion"
+		dependency "ch.qos.logback:logback-classic:$logbackVersion"
+		dependency "com.google.code.findbugs:jsr305:$findbugsVersion"
+		dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"
+		dependency "org.iq80.snappy:snappy:$snappyVersion"
+		dependency "junit:junit:$junitVersion"
+		dependency "org.apache.geode:geode-core:$apacheGeodeVersion"
+		dependency "org.apache.geode:geode-cq:$apacheGeodeVersion"
+		dependency "org.apache.geode:geode-lucene:$apacheGeodeVersion"
+		dependency "org.apache.geode:geode-wan:$apacheGeodeVersion"
+		dependency "org.apache.logging.log4j:log4j-bom:$apacheLog4jBomVersion"
+		dependency "org.apache.shiro:shiro-spring:$apacheShiroVersion"
+		dependency "org.aspectj:aspectjweaver:$aspectjVersion"
+		dependency "org.assertj:assertj-core:$assertjVersion"
+		dependency "org.projectlombok:lombok:$lombokVersion"
+		dependency "org.springframework.data:spring-data-commons:$springDataCommonsVersion"
+		dependency "org.springframework.data:spring-data-geode-test:$springDataGeodeTestVersion"
+		dependency "org.springframework.shell:spring-shell:$springShellVersion"
+	}
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..758de960
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..ae04661e
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..8c56176f
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+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
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS="-Xmx1024m"
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+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
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..e95643d6
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..29890c40
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,34 @@
+rootProject.name = 'spring-boot-data-geode-build'
+
+FileTree buildFiles = fileTree(rootDir) {
+	include '**/*.gradle'
+	exclude '/build.gradle', 'settings.gradle', '**/gradle', 'buildSrc', '.*'
+}
+
+String rootDirPath = rootDir.absolutePath + File.separator
+
+buildFiles.each { File buildFile ->
+
+	boolean isDefaultName = 'build.gradle'.equals(buildFile.name)
+
+	if (isDefaultName) {
+
+		String buildFilePath = buildFile.parentFile.absolutePath
+		String projectPath = buildFilePath.replace(rootDirPath, '').replaceAll(File.separator, ':')
+
+		include projectPath
+	}
+	else {
+
+		String projectName = buildFile.name.replace('.gradle', '');
+		String projectPath = ':' + projectName;
+
+		include projectPath
+
+		def project = findProject("${projectPath}")
+
+		project.name = projectName
+		project.projectDir = buildFile.parentFile
+		project.buildFileName = buildFile.name
+	}
+}
diff --git a/spring-data-geode-docs/spring-data-geode-docs.gradle b/spring-data-geode-docs/spring-data-geode-docs.gradle
new file mode 100644
index 00000000..83ef67b9
--- /dev/null
+++ b/spring-data-geode-docs/spring-data-geode-docs.gradle
@@ -0,0 +1,106 @@
+plugins {
+	id "io.freefair.lombok" version "6.5.0.3"
+}
+
+import org.apache.tools.ant.filters.ReplaceTokens
+
+apply plugin: 'io.spring.convention.docs'
+apply plugin: 'io.spring.convention.spring-test'
+
+description = "Generate Javadoc and Reference Documentation on Spring Data for Apache Geode"
+
+repositories {
+	maven { url "https://repo.spring.io/release" }
+}
+
+dependencies {
+
+}
+
+def versions = dependencyManagement.managedVersions
+
+asciidoctor {
+	clearSources()
+	sources {
+		include "index.adoc"
+		include "guides/*.adoc"
+	}
+}
+
+asciidoctorj {
+
+	def javaVersion = JavaVersion.current()
+	def apacheGeodeDocVersion = resolveApacheGeodeDocVersion("${apacheGeodeVersion}")
+	def githubBaseUrl = "https://github.com/spring-projects/spring-data-geode"
+	def githubTag = snapshotBuild ? 'main' : project.version
+	def githubUrl = "$githubBaseUrl/tree/$githubTag"
+
+	attributes 'version' : project.version,
+	    'version-snapshot': snapshotBuild,
+		'version-milestone': milestoneBuild,
+		'version-release': releaseBuild,
+		'download-url' : "${githubBaseUrl}/archive/${githubTag}.zip",
+		'github-url': githubUrl,
+		'highlightjsdir@': "js/highlight",
+		'docinfodir@': ".",
+		'java-version' : "$javaVersion",
+		'apache-geode-artifact-version' : "${apacheGeodeVersion}",
+		'apache-geode-doc-version' : apacheGeodeDocVersion,
+		'apache-geode-src' : "https://github.com/apache/geode/blob/rel/v${apacheGeodeVersion}",
+		'spring-version' : versions['org.springframework:spring-core'],
+		'spring-data-commons-version' : "${springDataCommonsVersion}",
+		'spring-data-geode-version' : "$version",
+		'spring-test-data-geode-version' : "${springDataGeodeTestVersion}",
+		'docs-dir' : rootProject.projectDir.path + '/spring-data-geode-docs',
+		'docs-src-dir' : rootProject.projectDir.path + '/spring-data-geode-docs/src/main/java',
+		'docs-resources-dir' : rootProject.projectDir.path + '/spring-data-geode-docs/src/main/resources'
+}
+
+asciidoctorPdf {
+	clearSources()
+	sources {
+		include "index.adoc"
+//		include "guides/*.adoc"
+	}
+}
+
+javadoc {
+	configure(options) {
+		links = [
+			"https://docs.spring.io/spring/docs/current/javadoc-api/",
+			"https://docs.spring.io/spring-boot/docs/current/api/",
+			"https://docs.spring.io/spring-boot-data-geode/docs/${project.version}/api/",
+			"https://docs.spring.io/spring-data/commons/docs/current/api/",
+			"https://docs.spring.io/spring-data/geode/docs/current/api/",
+			"https://geode.apache.org/releases/latest/javadoc/",
+		]
+	}
+}
+
+processResources {
+	eachFile { file ->
+		if (!file.name.endsWith(".jks")) {
+			file.filter ReplaceTokens, tokens: [
+				'project-dir' : rootProject.projectDir.path,
+				'project-version' : project.version,
+				'docs-dir' : rootProject.projectDir.path + '/spring-data-geode-docs'
+			]
+		}
+	}
+}
+
+String resolveApacheGeodeDocVersion(String apacheGeodeVersion) {
+
+	def apacheGeodeDocVersion = ''
+	def index = apacheGeodeVersion.lastIndexOf(".")
+
+	apacheGeodeVersion = index > -1 ? apacheGeodeVersion.substring(0, index) : apacheGeodeVersion
+
+	for (char character : apacheGeodeVersion.toCharArray()) {
+		if (Character.isDigit(character)) {
+			apacheGeodeDocVersion += character
+		}
+	}
+
+	return apacheGeodeDocVersion
+}
diff --git a/spring-data-geode/spring-data-geode.gradle b/spring-data-geode/spring-data-geode.gradle
new file mode 100644
index 00000000..10edc4ba
--- /dev/null
+++ b/spring-data-geode/spring-data-geode.gradle
@@ -0,0 +1,69 @@
+plugins {
+	id "io.freefair.lombok" version "6.5.0.3"
+}
+
+apply plugin: 'io.spring.convention.spring-module'
+
+description = "Spring Data for Apache Geode"
+
+dependencies {
+
+	// Apache Geode dependencies
+	api("org.apache.geode:geode-core") {
+		exclude group: "org.apache.logging.log4j", module: "log4j-jcl"
+		exclude group: "org.apache.logging.log4j", module: "log4j-jul"
+		exclude group: "org.apache.logging.log4j", module: "log4j-slf4j-impl"
+	}
+
+	api "org.apache.geode:geode-cq"
+	api "org.apache.geode:geode-lucence"
+	api "org.apache.geode:geode-wan"
+
+	provided "org.apache.geode:geode-gfsh"
+
+	// Java & Javax
+	optional "javax.cache:cache-api"
+
+	// Spring Framework (core) dependencies
+	api "org.springframework:spring-context-support"
+	api "org.springframework:spring-tx"
+	api "org.springframework:spring-web"
+
+	// Spring Data Commons dependencies
+	api "org.springframework.data:spring-data-commons"
+
+	// Spring Data for Apache Geode & VMware Tanzu (Pivotal) GemFire shared dependencies
+	runtimeOnly "antlr:antlr"
+	implementation "org.apache.shiro:shiro-spring"
+	implementation "org.aspectj:aspectjweaver"
+	implementation "com.fasterxml.jackson.core:jackson-annotations"
+	implementation "com.fasterxml.jackson.core:jackson-databind"
+
+	compileOnly "com.google.code.findbugs:jsr305"
+
+	// Test CDI dependencies (dependency declaration order matters)
+	testImplementation "org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.0.1"
+	testImplementation "javax.interceptor:javax.interceptor-api:1.2.1"
+	testImplementation "javax.el:el-api:2.2"
+	testImplementation "javax.enterprise:cdi-api:1.0"
+	testImplementation "javax.annotation:javax.annotation-api:1.3.2"
+	testImplementation "org.apache.openwebbeans:openwebbeans-se:2.0.27"
+
+	// Unit & Integration Test dependencies
+	testImplementation "junit:junit"
+	testImplementation "org.assertj:assertj-core"
+	testImplementation "org.mockito:mockito-core"
+	testImplementation "edu.umd.cs.mtc:multithreadedtc"
+	testImplementation "org.springframework.data:spring-data-geode-test"
+	testImplementation "org.testcontainers:testcontainers"
+
+	testRuntimeOnly("org.apache.derby:derbyLocale_zh_TW:10.9.1.0") {
+		exclude group: "org.springframework.data", module: "spring-data-geode"
+	}
+
+	testRuntimeOnly "ch.qos.logback:logback-classic"
+	testRuntimeOnly "org.apache.logging.log4j:log4j-to-slf4j"
+	testRuntimeOnly "org.iq80.snappy:snappy"
+	testRuntimeOnly "org.springframeork.shell:spring-shell"
+
+}