diff --git a/pom.xml b/pom.xml
index 7278e451..b4469099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,197 +1,294 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  	
+    	
+  
   <modelVersion>4.0.0</modelVersion>
-  	
+    	
+  
   <parent>
-    		
+        		
+    
     <groupId>org.springframework.data.build</groupId>
-    		
+        		
+    
     <artifactId>spring-data-parent</artifactId>
-    		
-    <version>3.0.0-M4</version>
-    	
+        		
+    
+    <version>3.0.0-SNAPSHOT</version>
+        	
+  
   </parent>
-  	
+    	
+  
   <groupId>org.springframework.data</groupId>
-  	
+    	
+  
   <artifactId>spring-data-geode-parent</artifactId>
-  	
+    	
+  
   <version>3.0.0-SNAPSHOT</version>
-  	
+    	
+  
   <packaging>pom</packaging>
-  	
+    	
+  
   <name>Spring Data for Apache Geode Parent</name>
-  	
+    	
+  
   <description>Spring Data for Apache Geode Parent Maven POM</description>
-  	
+    	
+  
   <url>https://projects.spring.io/spring-data-geode/</url>
-  	
+    	
+  
   <organization>
-    		
+        		
+    
     <name>Pivotal Software, Inc.</name>
-    		
+        		
+    
     <url>https://www.spring.io</url>
-    	
+        	
+  
   </organization>
-  	
+    	
+  
   <developers>
-    		
+        		
+    
     <developer>
-      			
+            			
+      
       <id>jblum</id>
-      			
+            			
+      
       <name>John Blum</name>
-      			
+            			
+      
       <organization>Pivotal</organization>
-      			
+            			
+      
       <organizationUrl>https://www.pivotal.io</organizationUrl>
-      			
+            			
+      
       <roles>
-        				
+                				
+        
         <role>Lead Developer</role>
-        			
+                			
+      
       </roles>
-      		
+            		
+    
     </developer>
-    	
+        	
+  
   </developers>
-  	
+    	
+  
   <modules>
-    		
+        		
+    
     <module>spring-data-geode</module>
-    		
+        		
+    
     <module>spring-data-geode-distribution</module>
-    	
+        	
+  
   </modules>
-  	
+    	
+  
   <properties>
-    		
+        		
+    
     <java-module-name>spring.data.geode</java-module-name>
-    		
+        		
+    
     <source.level>17</source.level>
-    		
+        		
+    
     <antlr.version>2.7.7</antlr.version>
-    		
+        		
+    
     <apache-shiro.version>1.8.0</apache-shiro.version>
-    		
+        		
+    
     <cache-api.version>1.1.1</cache-api.version>
-    		
+        		
+    
     <log4j.version>2.16.0</log4j.version>
-    		
+        		
+    
     <micrometer>1.9.0-M4</micrometer>
-    		
+        		
+    
     <multithreadedtc.version>1.01</multithreadedtc.version>
-    		
+        		
+    
     <snappy.version>0.4</snappy.version>
-    		
-    <springdata.commons>3.0.0-M4</springdata.commons>
-    		
+        		
+    
+    <springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
+        		
+    
     <spring-shell.version>1.2.0.RELEASE</spring-shell.version>
-    	
+        	
+  
   </properties>
-  	
-  <build>
-    		
-    <plugins>
-      			
-      <plugin>
-        				
-        <groupId>org.apache.maven.plugins</groupId>
-        				
-        <artifactId>maven-javadoc-plugin</artifactId>
-        				
-        <configuration>
-          					
-          <dependencySourceExcludes>
-            						
-            <dependencySourceExclude>org.apache.geode:geode-gfsh</dependencySourceExclude>
-            					
-          </dependencySourceExcludes>
-          					
-          <failOnWarnings>false</failOnWarnings>
-          					
-          <links combine.children="append">
-            						
-            <link>https://geode.apache.org/releases/latest/javadoc/</link>
-            					
-          </links>
-          				
-        </configuration>
-        			
-      </plugin>
-      			
-      <plugin>
-        				
-        <groupId>org.apache.maven.plugins</groupId>
-        				
-        <artifactId>maven-surefire-plugin</artifactId>
-        				
-        <configuration>
-          					
-          <argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
-          					
-          <includes>
-            						
-            <include>**/*Tests.java</include>
-            						
-            <include>**/*Test.java</include>
-            					
-          </includes>
-          					
-          <reuseForks>false</reuseForks>
-          					
-          <systemProperties>
-            						
-            <java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
-            						
-            <gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
-            						
-            <logback.log.level>error</logback.log.level>
-            						
-            <spring.profiles.active>apache-geode</spring.profiles.active>
-            					
-          </systemProperties>
-          				
-        </configuration>
-        			
-      </plugin>
-      		
-    </plugins>
     	
+  
+  <build>
+        		
+    
+    <plugins>
+            			
+      
+      <plugin>
+                				
+        
+        <groupId>org.apache.maven.plugins</groupId>
+                				
+        
+        <artifactId>maven-javadoc-plugin</artifactId>
+                				
+        
+        <configuration>
+                    					
+          
+          <dependencySourceExcludes>
+                        						
+            
+            <dependencySourceExclude>org.apache.geode:geode-gfsh</dependencySourceExclude>
+                        					
+          
+          </dependencySourceExcludes>
+                    					
+          
+          <failOnWarnings>false</failOnWarnings>
+                    					
+          
+          <links combine.children="append">
+                        						
+            
+            <link>https://geode.apache.org/releases/latest/javadoc/</link>
+                        					
+          
+          </links>
+                    				
+        
+        </configuration>
+                			
+      
+      </plugin>
+            			
+      
+      <plugin>
+                				
+        
+        <groupId>org.apache.maven.plugins</groupId>
+                				
+        
+        <artifactId>maven-surefire-plugin</artifactId>
+                				
+        
+        <configuration>
+                    					
+          
+          <argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+                    					
+          
+          <includes>
+                        						
+            
+            <include>**/*Tests.java</include>
+                        						
+            
+            <include>**/*Test.java</include>
+                        					
+          
+          </includes>
+                    					
+          
+          <reuseForks>false</reuseForks>
+                    					
+          
+          <systemProperties>
+                        						
+            
+            <java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
+                        						
+            
+            <gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
+                        						
+            
+            <logback.log.level>error</logback.log.level>
+                        						
+            
+            <spring.profiles.active>apache-geode</spring.profiles.active>
+                        					
+          
+          </systemProperties>
+                    				
+        
+        </configuration>
+                			
+      
+      </plugin>
+            		
+    
+    </plugins>
+        	
+  
   </build>
-  	
+    	
+  
   <repositories>
-    		
+        		
+    
     <repository>
-      			
-      <id>spring-libs-milestone</id>
-      			
-      <url>https://repo.spring.io/libs-milestone</url>
-      		
+            			
+      
+      <id>spring-libs-snapshot</id>
+            			
+      
+      <url>https://repo.spring.io/libs-snapshot</url>
+            		
+    
     </repository>
-    		
+        		
+    
     <repository>
-      			
+            			
+      
       <id>geode-snapshot</id>
-      			
+            			
+      
       <name>Apache Geode Snapshots</name>
-      			
+            			
+      
       <url>https://maven.apachegeode-ci.info/snapshots</url>
-      			
+            			
+      
       <snapshots>
-        				
+                				
+        
         <enabled>true</enabled>
-        			
+                			
+      
       </snapshots>
-      			
+            			
+      
       <releases>
-        				
+                				
+        
         <enabled>true</enabled>
-        			
+                			
+      
       </releases>
-      		
+            		
+    
     </repository>
+        
     
     <!--
 		<repository>
@@ -199,19 +296,27 @@
 			<url>https://repository.apache.org/content/repositories/orgapachegeode-1128</url>
 		</repository>
 -->
-    	
-  </repositories>
-  	
-  <pluginRepositories>
-    		
-    <pluginRepository>
-      			
-      <id>spring-plugins-release</id>
-      			
-      <url>https://repo.spring.io/plugins-release</url>
-      		
-    </pluginRepository>
-    	
-  </pluginRepositories>
+        	
   
+  </repositories>
+    	
+  
+  <pluginRepositories>
+        		
+    
+    <pluginRepository>
+            			
+      
+      <id>spring-plugins-release</id>
+            			
+      
+      <url>https://repo.spring.io/plugins-release</url>
+            		
+    
+    </pluginRepository>
+        	
+  
+  </pluginRepositories>
+    
+
 </project>