From 8e326d9b8c617caed6e9ecf1c2f69b823244221f Mon Sep 17 00:00:00 2001
From: Jinwoo Hwang <jinwoo@apache.org>
Date: Sun, 30 Nov 2025 18:42:50 -0500
Subject: [PATCH 1/2] GEODE-10467: Roll develop to 2.1.0

Now that support/2.0 has been created, develop advances.
---
 ci/pipelines/shared/jinja.variables.yml       |   2 +-
 .../src/test/resources/expected-pom.xml       |  55 +++
 .../src/test/resources/expected-pom.xml       | 110 +++++
 geode-book/config.yml                         |  10 +-
 geode-book/redirects.rb                       |   4 +-
 .../src/test/resources/expected-pom.xml       |  66 +++
 .../src/test/resources/expected-pom.xml       |  55 +++
 .../src/test/resources/expected-pom.xml       | 201 ++++++++
 .../src/test/resources/expected-pom.xml       | 436 ++++++++++++++++++
 geode-cq/src/test/resources/expected-pom.xml  |  88 ++++
 .../src/test/resources/expected-pom.xml       |  33 +-
 .../src/test/resources/expected-pom.xml       | 320 +++++++++++++
 .../src/test/resources/expected-pom.xml       | 110 +++++
 geode-jmh/src/test/resources/expected-pom.xml |  44 ++
 .../src/test/resources/expected-pom.xml       | 283 ++++++++++++
 .../src/test/resources/expected-pom.xml       | 128 +++++
 .../src/test/resources/expected-pom.xml       |  55 +++
 .../src/test/resources/expected-pom.xml       | 180 ++++++++
 .../src/test/resources/expected-pom.xml       | 132 ++++++
 .../src/test/resources/expected-pom.xml       | 132 ++++++
 .../src/test/resources/expected-pom.xml       |  77 ++++
 .../src/test/resources/expected-pom.xml       |  66 +++
 .../src/test/resources/expected-pom.xml       | 100 ++++
 .../internal/serialization/KnownVersion.java  |  11 +-
 .../src/test/resources/expected-pom.xml       |  88 ++++
 .../src/test/resources/expected-pom.xml       | 242 ++++++++++
 .../src/test/resources/expected-pom.xml       |  88 ++++
 .../src/test/resources/expected-pom.xml       |  33 +-
 geode-wan/src/test/resources/expected-pom.xml | 110 +++++
 gradle.properties                             |   2 +-
 30 files changed, 3248 insertions(+), 13 deletions(-)

diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index a5d455af2347..3e313310a309 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -76,7 +76,7 @@ java_test_versions:
   version: 17
 
 metadata:
-  initial_version: 1.16.0-((semver-prerelease-token)).0
+  initial_version: 2.1.0-((semver-prerelease-token)).0
   mass_test_run_iterations: 100
 
 publish_artifacts:
diff --git a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
index 1b3957f9ed07..129199c05267 100644
--- a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
+++ b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,57 +17,111 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-modules-tomcat10</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-modules</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/extensions/geode-modules/src/test/resources/expected-pom.xml b/extensions/geode-modules/src/test/resources/expected-pom.xml
index c97e5872d641..0713703e0e78 100644
--- a/extensions/geode-modules/src/test/resources/expected-pom.xml
+++ b/extensions/geode-modules/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,112 +17,221 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-modules</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-membership</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.slf4j</groupId>
+            
       <artifactId>slf4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-book/config.yml b/geode-book/config.yml
index c156d7e965c2..68c3d58ff07d 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -21,17 +21,17 @@ public_host: localhost
 sections:
 - repository:
     name: geode-docs
-  directory: docs/guide/115
+  directory: docs/guide/21
   subnav_template: geode-subnav
 
 template_variables:
   product_name_long: Apache Geode
   product_name: Geode
   product_name_lowercase: geode
-  product_version: '1.15'
-  product_version_nodot: '115'
-  product_version_old_minor: '1.14'
-  product_version_geode: '1.15'
+  product_version: '2.1'
+  product_version_nodot: '21'
+  product_version_old_minor: '2.0'
+  product_version_geode: '2.1'
   min_java_version: '8'
   min_java_update: '121'
   support_url: http://geode.apache.org/community
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
index 54079e7ea54f..74ba185f791f 100644
--- a/geode-book/redirects.rb
+++ b/geode-book/redirects.rb
@@ -14,5 +14,5 @@
 #permissions and limitations under the License.
 
 r301 %r{/releases/latest/javadoc/(.*)}, 'http://geode.apache.org/releases/latest/javadoc/$1'
-rewrite '/', '/docs/guide/116/about_geode.html'
-rewrite '/index.html', '/docs/guide/116/about_geode.html'
+rewrite '/', '/docs/guide/21/about_geode.html'
+rewrite '/index.html', '/docs/guide/21/about_geode.html'
diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml
index 374eda1da262..370cd09b8628 100644
--- a/geode-common/src/test/resources/expected-pom.xml
+++ b/geode-common/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,68 +17,133 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-common</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-databind</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.datatype</groupId>
+            
       <artifactId>jackson-datatype-jsr310</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.datatype</groupId>
+            
       <artifactId>jackson-datatype-joda</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml
index 2940e8b56ce4..adeca1b084ee 100644
--- a/geode-concurrency-test/src/test/resources/expected-pom.xml
+++ b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,57 +17,111 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-concurrency-test</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>junit</groupId>
+            
       <artifactId>junit</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
index 6a30589edb13..f60de5c5fcb2 100644
--- a/geode-connectors/src/test/resources/expected-pom.xml
+++ b/geode-connectors/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,203 +17,403 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-connectors</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-gfsh</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.httpcomponents.core5</groupId>
+            
       <artifactId>httpcore5</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-databind</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.zaxxer</groupId>
+            
       <artifactId>HikariCP</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>jakarta.xml.bind</groupId>
+            
       <artifactId>jakarta.xml.bind-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-jcl</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.springframework.shell</groupId>
+            
       <artifactId>spring-shell-starter</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>cglib</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>asm</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-aop</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>guava</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>aopalliance</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-context-support</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.healthmarketscience.rmiio</groupId>
+            
       <artifactId>rmiio</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index 4b0caecf2602..4f72e77fc581 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,438 +17,873 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-core</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>commons-io</groupId>
+            
       <artifactId>commons-io</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>io.micrometer</groupId>
+            
       <artifactId>micrometer-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>jakarta.resource</groupId>
+            
       <artifactId>jakarta.resource-api</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>jakarta.transaction</groupId>
+            
       <artifactId>jakarta.transaction-api</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.shiro</groupId>
+            
       <artifactId>shiro-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-management</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>antlr</groupId>
+            
       <artifactId>antlr</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.jgroups</groupId>
+            
       <artifactId>jgroups</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-annotations</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-databind</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>commons-validator</groupId>
+            
       <artifactId>commons-validator</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>jakarta.xml.bind</groupId>
+            
       <artifactId>jakarta.xml.bind-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>it.unimi.dsi</groupId>
+            
       <artifactId>fastutil</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>net.java.dev.jna</groupId>
+            
       <artifactId>jna</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>net.java.dev.jna</groupId>
+            
       <artifactId>jna-platform</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>net.sf.jopt-simple</groupId>
+            
       <artifactId>jopt-simple</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>io.swagger.core.v3</groupId>
+            
       <artifactId>swagger-annotations</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.iq80.snappy</groupId>
+            
       <artifactId>snappy</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>io.github.classgraph</groupId>
+            
       <artifactId>classgraph</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.healthmarketscience.rmiio</groupId>
+            
       <artifactId>rmiio</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-membership</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-unsafe</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-tcp-server</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.springframework</groupId>
+            
       <artifactId>spring-aop</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.dataformat</groupId>
+            
       <artifactId>jackson-dataformat-yaml</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.glassfish.jaxb</groupId>
+            
       <artifactId>jaxb-runtime</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>jakarta.activation</groupId>
+            
       <artifactId>jakarta.activation-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.sun.istack</groupId>
+            
       <artifactId>istack-commons-runtime</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>*</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-deployment-legacy</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-http-service</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-gfsh</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml
index 3238e6c3c48f..1e7eea0d7ca7 100644
--- a/geode-cq/src/test/resources/expected-pom.xml
+++ b/geode-cq/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,90 +17,177 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-cq</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-membership</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
index 70dd4cd8828d..e24ae374bcf3 100644
--- a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
+++ b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,33 +17,63 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-deployment-legacy</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+  
 </project>
diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
index d33bf896f47f..fe58e574e490 100644
--- a/geode-dunit/src/test/resources/expected-pom.xml
+++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,322 +17,641 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-dunit</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-junit</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>geode-core</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-membership</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-tcp-server</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-gfsh</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-cq</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-log4j</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>geode-core</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.jayway.jsonpath</groupId>
+            
       <artifactId>json-path</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>commons-io</groupId>
+            
       <artifactId>commons-io</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.springframework.shell</groupId>
+            
       <artifactId>spring-shell-starter</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>cglib</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-core</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>asm</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-aop</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>guava</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>aopalliance</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-context-support</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.google.guava</groupId>
+            
       <artifactId>guava</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.github.stefanbirkner</groupId>
+            
       <artifactId>system-rules</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>junit-dep</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.assertj</groupId>
+            
       <artifactId>assertj-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.mockito</groupId>
+            
       <artifactId>mockito-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.awaitility</groupId>
+            
       <artifactId>awaitility</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>pl.pragmatists</groupId>
+            
       <artifactId>JUnitParams</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>junit</groupId>
+            
       <artifactId>junit</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>hamcrest</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml
index b768efe732db..6e27cde1ed46 100644
--- a/geode-http-service/src/test/resources/expected-pom.xml
+++ b/geode-http-service/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,112 +17,221 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-http-service</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.eclipse.jetty.ee10</groupId>
+            
       <artifactId>jetty-ee10-webapp</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.eclipse.jetty.ee10</groupId>
+            
       <artifactId>jetty-ee10-annotations</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.eclipse.jetty</groupId>
+            
       <artifactId>jetty-server</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.springframework</groupId>
+            
       <artifactId>spring-aop</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-jmh/src/test/resources/expected-pom.xml b/geode-jmh/src/test/resources/expected-pom.xml
index be1bcecb491b..9bbbc9953592 100644
--- a/geode-jmh/src/test/resources/expected-pom.xml
+++ b/geode-jmh/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,46 +17,89 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-jmh</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.openjdk.jmh</groupId>
+            
       <artifactId>jmh-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml
index 2c6a64729c78..609be51741e8 100644
--- a/geode-junit/src/test/resources/expected-pom.xml
+++ b/geode-junit/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,285 +17,567 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-junit</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>junit</groupId>
+            
       <artifactId>junit</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>hamcrest</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.junit.jupiter</groupId>
+            
       <artifactId>junit-jupiter-api</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.junit.jupiter</groupId>
+            
       <artifactId>junit-jupiter-params</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.assertj</groupId>
+            
       <artifactId>assertj-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.mockito</groupId>
+            
       <artifactId>mockito-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>io.github.classgraph</groupId>
+            
       <artifactId>classgraph</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-annotations</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-databind</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>joda-time</groupId>
+            
       <artifactId>joda-time</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.github.stefanbirkner</groupId>
+            
       <artifactId>system-rules</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>junit-dep</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.google.guava</groupId>
+            
       <artifactId>guava</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.jayway.jsonpath</groupId>
+            
       <artifactId>json-path</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>commons-io</groupId>
+            
       <artifactId>commons-io</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.awaitility</groupId>
+            
       <artifactId>awaitility</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.hamcrest</groupId>
+            
       <artifactId>hamcrest</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>io.micrometer</groupId>
+            
       <artifactId>micrometer-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.skyscreamer</groupId>
+            
       <artifactId>jsonassert</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.junit.jupiter</groupId>
+            
       <artifactId>junit-jupiter-engine</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.junit.vintage</groupId>
+            
       <artifactId>junit-vintage-engine</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>pl.pragmatists</groupId>
+            
       <artifactId>JUnitParams</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-log4j/src/test/resources/expected-pom.xml b/geode-log4j/src/test/resources/expected-pom.xml
index 1dd30357b2a9..ca552a936460 100644
--- a/geode-log4j/src/test/resources/expected-pom.xml
+++ b/geode-log4j/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,130 +17,257 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-log4j</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-slf4j-impl</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>slf4j-api</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-jcl</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-jul</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+            
       <optional>true</optional>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-logging/src/test/resources/expected-pom.xml b/geode-logging/src/test/resources/expected-pom.xml
index b2528f6ba474..9204acc252bd 100644
--- a/geode-logging/src/test/resources/expected-pom.xml
+++ b/geode-logging/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,57 +17,111 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-logging</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml
index 4899bb2f4fef..5ac6b12e8a7c 100644
--- a/geode-lucene/src/test/resources/expected-pom.xml
+++ b/geode-lucene/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,182 +17,361 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-lucene</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.lucene</groupId>
+            
       <artifactId>lucene-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-gfsh</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-membership</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.lucene</groupId>
+            
       <artifactId>lucene-analysis-common</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.lucene</groupId>
+            
       <artifactId>lucene-queryparser</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>lucene-sandbox</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>jakarta.xml.bind</groupId>
+            
       <artifactId>jakarta.xml.bind-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.glassfish.jaxb</groupId>
+            
       <artifactId>jaxb-runtime</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.lucene</groupId>
+            
       <artifactId>lucene-analysis-phonetic</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-management/src/test/resources/expected-pom.xml b/geode-management/src/test/resources/expected-pom.xml
index 738c52522175..3256ca876b57 100644
--- a/geode-management/src/test/resources/expected-pom.xml
+++ b/geode-management/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,134 +17,265 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-management</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>commons-io</groupId>
+            
       <artifactId>commons-io</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-databind</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>com.fasterxml.jackson.core</groupId>
+            
       <artifactId>jackson-annotations</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.springframework</groupId>
+            
       <artifactId>spring-web</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.httpcomponents.client5</groupId>
+            
       <artifactId>httpclient5</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.httpcomponents.core5</groupId>
+            
       <artifactId>httpcore5</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml
index 3fd2e3cf4e3c..26ed756ec1b4 100644
--- a/geode-membership/src/test/resources/expected-pom.xml
+++ b/geode-membership/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,134 +17,265 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-membership</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-tcp-server</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.jgroups</groupId>
+            
       <artifactId>jgroups</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>it.unimi.dsi</groupId>
+            
       <artifactId>fastutil</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>commons-validator</groupId>
+            
       <artifactId>commons-validator</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml
index b9ea313d1ed7..c2aa1e47d9f8 100644
--- a/geode-memcached/src/test/resources/expected-pom.xml
+++ b/geode-memcached/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,79 +17,155 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-memcached</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml b/geode-old-client-support/src/test/resources/expected-pom.xml
index 4b50e9620ae0..edbbda18ef54 100644
--- a/geode-old-client-support/src/test/resources/expected-pom.xml
+++ b/geode-old-client-support/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,68 +17,133 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-old-client-support</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml
index 2d94a9365349..c91a8eaf2d62 100644
--- a/geode-rebalancer/src/test/resources/expected-pom.xml
+++ b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,102 +17,201 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-rebalancer</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.springframework</groupId>
+            
       <artifactId>spring-context</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-beans</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-expression</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+                
         <exclusion>
+                    
           <artifactId>spring-aop</artifactId>
+                    
           <groupId>*</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
index 935a749a87f9..218edf37b6e5 100644
--- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
+++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
@@ -48,7 +48,7 @@ public class KnownVersion extends AbstractVersion {
   private final byte patch;
   private final boolean modifiesClientServerProtocol;
 
-  public static final int HIGHEST_VERSION = 160;
+  public static final int HIGHEST_VERSION = 170;
 
   @Immutable
   private static final KnownVersion[] VALUES = new KnownVersion[HIGHEST_VERSION + 1];
@@ -216,6 +216,13 @@ public class KnownVersion extends AbstractVersion {
       new KnownVersion("GEODE", "1.16.0", (byte) 1, (byte) 16, (byte) 0, (byte) 0,
           GEODE_1_16_0_ORDINAL);
 
+  private static final short GEODE_2_1_0_ORDINAL = 170;
+
+  @Immutable
+  public static final KnownVersion GEODE_2_1_0 =
+      new KnownVersion("GEODE", "2.1.0", (byte) 2, (byte) 1, (byte) 0, (byte) 0,
+          GEODE_2_1_0_ORDINAL);
+
   /* NOTE: when adding a new version bump the ordinal by 10. Ordinals can be short ints */
 
   /**
@@ -229,7 +236,7 @@ public class KnownVersion extends AbstractVersion {
    * HIGHEST_VERSION when changing CURRENT !!!
    */
   @Immutable
-  public static final KnownVersion CURRENT = GEODE_1_16_0;
+  public static final KnownVersion CURRENT = GEODE_2_1_0;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal
diff --git a/geode-serialization/src/test/resources/expected-pom.xml b/geode-serialization/src/test/resources/expected-pom.xml
index 719336ecdbab..3edd44776ef0 100644
--- a/geode-serialization/src/test/resources/expected-pom.xml
+++ b/geode-serialization/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,90 +17,177 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-serialization</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>it.unimi.dsi</groupId>
+            
       <artifactId>fastutil</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-server-all/src/test/resources/expected-pom.xml b/geode-server-all/src/test/resources/expected-pom.xml
index 7c572939f7a7..78940b2d9df7 100644
--- a/geode-server-all/src/test/resources/expected-pom.xml
+++ b/geode-server-all/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,244 +17,485 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-server-all</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-connectors</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-cq</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-gfsh</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-log4j</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-management</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-lucene</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-rebalancer</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>compile</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-memcached</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-old-client-support</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-wan</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-tcp-server</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-unsafe</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-http-service</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.iq80.snappy</groupId>
+            
       <artifactId>snappy</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>io.swagger.core.v3</groupId>
+            
       <artifactId>swagger-annotations</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-tcp-server/src/test/resources/expected-pom.xml b/geode-tcp-server/src/test/resources/expected-pom.xml
index e8b3e583a3b8..5f48c3fb4a45 100644
--- a/geode-tcp-server/src/test/resources/expected-pom.xml
+++ b/geode-tcp-server/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,90 +17,177 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-tcp-server</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-common</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.logging.log4j</groupId>
+            
       <artifactId>log4j-api</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>commons-validator</groupId>
+            
       <artifactId>commons-validator</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/geode-unsafe/src/test/resources/expected-pom.xml b/geode-unsafe/src/test/resources/expected-pom.xml
index a5533e9a7c87..5e8612feab93 100644
--- a/geode-unsafe/src/test/resources/expected-pom.xml
+++ b/geode-unsafe/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,33 +17,63 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-unsafe</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+  
 </project>
diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml
index cfc6b77738da..18c62f9a39f0 100644
--- a/geode-wan/src/test/resources/expected-pom.xml
+++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,112 +17,221 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+    
   <modelVersion>4.0.0</modelVersion>
+    
   <groupId>org.apache.geode</groupId>
+    
   <artifactId>geode-wan</artifactId>
+    
   <version>${version}</version>
+    
   <name>Apache Geode</name>
+    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
+    
   <url>http://geode.apache.org</url>
+    
   <licenses>
+        
     <license>
+            
       <name>The Apache Software License, Version 2.0</name>
+            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          
     </license>
+      
   </licenses>
+    
   <scm>
+        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
+        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
+        
     <url>https://github.com/apache/geode</url>
+      
   </scm>
+    
   <dependencyManagement>
+        
     <dependencies>
+            
       <dependency>
+                
         <groupId>org.apache.geode</groupId>
+                
         <artifactId>geode-all-bom</artifactId>
+                
         <version>${version}</version>
+                
         <type>pom</type>
+                
         <scope>import</scope>
+              
       </dependency>
+          
     </dependencies>
+      
   </dependencyManagement>
+    
   <dependencies>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-logging</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-membership</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-serialization</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-tcp-server</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-core</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.geode</groupId>
+            
       <artifactId>geode-gfsh</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+        
     <dependency>
+            
       <groupId>org.apache.commons</groupId>
+            
       <artifactId>commons-lang3</artifactId>
+            
       <scope>runtime</scope>
+            
       <exclusions>
+                
         <exclusion>
+                    
           <artifactId>log4j-to-slf4j</artifactId>
+                    
           <groupId>org.apache.logging.log4j</groupId>
+                  
         </exclusion>
+              
       </exclusions>
+          
     </dependency>
+      
   </dependencies>
+  
 </project>
diff --git a/gradle.properties b/gradle.properties
index 72695f0437e1..22c3554f4129 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@
 #   <blank>   - release
 #
 # The full version string consists of 'versionNumber + releaseQualifier + releaseType'
-version = 1.16.0-build.0
+version = 2.1.0-build.0
 
 # Default Maven targets
 mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots

From 387fe5fefaa0da49aaac27193a339c547879f329 Mon Sep 17 00:00:00 2001
From: Jinwoo Hwang <jinwoo@apache.org>
Date: Fri, 5 Dec 2025 14:10:41 -0500
Subject: [PATCH 2/2] Remove whitespace pollution from expected-pom.xml files

The roll to 2.1.0 commit (8e326d9b8c) inadvertently added blank lines
with trailing whitespace throughout all expected-pom.xml test files.
This commit reverts those files to their clean state.

- 25 files affected
- Removed 3,230 lines of whitespace pollution
- No functional changes to actual POM content
---
 .../src/test/resources/expected-pom.xml       |  55 ---
 .../src/test/resources/expected-pom.xml       | 110 -----
 .../src/test/resources/expected-pom.xml       |  66 ---
 .../src/test/resources/expected-pom.xml       |  55 ---
 .../src/test/resources/expected-pom.xml       | 201 --------
 .../src/test/resources/expected-pom.xml       | 436 ------------------
 geode-cq/src/test/resources/expected-pom.xml  |  88 ----
 .../src/test/resources/expected-pom.xml       |  33 +-
 .../src/test/resources/expected-pom.xml       | 320 -------------
 .../src/test/resources/expected-pom.xml       | 110 -----
 geode-jmh/src/test/resources/expected-pom.xml |  44 --
 .../src/test/resources/expected-pom.xml       | 283 ------------
 .../src/test/resources/expected-pom.xml       | 128 -----
 .../src/test/resources/expected-pom.xml       |  55 ---
 .../src/test/resources/expected-pom.xml       | 180 --------
 .../src/test/resources/expected-pom.xml       | 132 ------
 .../src/test/resources/expected-pom.xml       | 132 ------
 .../src/test/resources/expected-pom.xml       |  77 ----
 .../src/test/resources/expected-pom.xml       |  66 ---
 .../src/test/resources/expected-pom.xml       | 100 ----
 .../src/test/resources/expected-pom.xml       |  88 ----
 .../src/test/resources/expected-pom.xml       | 242 ----------
 .../src/test/resources/expected-pom.xml       |  88 ----
 .../src/test/resources/expected-pom.xml       |  33 +-
 geode-wan/src/test/resources/expected-pom.xml | 110 -----
 25 files changed, 2 insertions(+), 3230 deletions(-)

diff --git a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
index 129199c05267..1b3957f9ed07 100644
--- a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
+++ b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,111 +16,57 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-modules-tomcat10</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-modules</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/extensions/geode-modules/src/test/resources/expected-pom.xml b/extensions/geode-modules/src/test/resources/expected-pom.xml
index 0713703e0e78..c97e5872d641 100644
--- a/extensions/geode-modules/src/test/resources/expected-pom.xml
+++ b/extensions/geode-modules/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,221 +16,112 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-modules</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-membership</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.slf4j</groupId>
-            
       <artifactId>slf4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml
index 370cd09b8628..374eda1da262 100644
--- a/geode-common/src/test/resources/expected-pom.xml
+++ b/geode-common/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,133 +16,68 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-common</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-databind</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.datatype</groupId>
-            
       <artifactId>jackson-datatype-jsr310</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.datatype</groupId>
-            
       <artifactId>jackson-datatype-joda</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml
index adeca1b084ee..2940e8b56ce4 100644
--- a/geode-concurrency-test/src/test/resources/expected-pom.xml
+++ b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,111 +16,57 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-concurrency-test</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>junit</groupId>
-            
       <artifactId>junit</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
index f60de5c5fcb2..6a30589edb13 100644
--- a/geode-connectors/src/test/resources/expected-pom.xml
+++ b/geode-connectors/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,403 +16,203 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-connectors</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-gfsh</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.httpcomponents.core5</groupId>
-            
       <artifactId>httpcore5</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-databind</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.zaxxer</groupId>
-            
       <artifactId>HikariCP</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>jakarta.xml.bind</groupId>
-            
       <artifactId>jakarta.xml.bind-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-jcl</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.springframework.shell</groupId>
-            
       <artifactId>spring-shell-starter</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>cglib</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>asm</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-aop</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>guava</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>aopalliance</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-context-support</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.healthmarketscience.rmiio</groupId>
-            
       <artifactId>rmiio</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index 4f72e77fc581..4b0caecf2602 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,873 +16,438 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-core</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>commons-io</groupId>
-            
       <artifactId>commons-io</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>io.micrometer</groupId>
-            
       <artifactId>micrometer-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>jakarta.resource</groupId>
-            
       <artifactId>jakarta.resource-api</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>jakarta.transaction</groupId>
-            
       <artifactId>jakarta.transaction-api</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.shiro</groupId>
-            
       <artifactId>shiro-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-management</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>antlr</groupId>
-            
       <artifactId>antlr</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.jgroups</groupId>
-            
       <artifactId>jgroups</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-annotations</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-databind</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>commons-validator</groupId>
-            
       <artifactId>commons-validator</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>jakarta.xml.bind</groupId>
-            
       <artifactId>jakarta.xml.bind-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>it.unimi.dsi</groupId>
-            
       <artifactId>fastutil</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>net.java.dev.jna</groupId>
-            
       <artifactId>jna</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>net.java.dev.jna</groupId>
-            
       <artifactId>jna-platform</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>net.sf.jopt-simple</groupId>
-            
       <artifactId>jopt-simple</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>io.swagger.core.v3</groupId>
-            
       <artifactId>swagger-annotations</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.iq80.snappy</groupId>
-            
       <artifactId>snappy</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>io.github.classgraph</groupId>
-            
       <artifactId>classgraph</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.healthmarketscience.rmiio</groupId>
-            
       <artifactId>rmiio</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-membership</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-unsafe</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-tcp-server</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.springframework</groupId>
-            
       <artifactId>spring-aop</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.dataformat</groupId>
-            
       <artifactId>jackson-dataformat-yaml</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.glassfish.jaxb</groupId>
-            
       <artifactId>jaxb-runtime</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>jakarta.activation</groupId>
-            
       <artifactId>jakarta.activation-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.sun.istack</groupId>
-            
       <artifactId>istack-commons-runtime</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>*</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-deployment-legacy</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-http-service</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-gfsh</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml
index 1e7eea0d7ca7..3238e6c3c48f 100644
--- a/geode-cq/src/test/resources/expected-pom.xml
+++ b/geode-cq/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,177 +16,90 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-cq</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-membership</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
index e24ae374bcf3..70dd4cd8828d 100644
--- a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
+++ b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
-    
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,63 +16,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-deployment-legacy</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-  
 </project>
diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
index fe58e574e490..d33bf896f47f 100644
--- a/geode-dunit/src/test/resources/expected-pom.xml
+++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,641 +16,322 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-dunit</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-junit</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>geode-core</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-membership</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-tcp-server</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-gfsh</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-cq</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-log4j</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>geode-core</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.jayway.jsonpath</groupId>
-            
       <artifactId>json-path</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>commons-io</groupId>
-            
       <artifactId>commons-io</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.springframework.shell</groupId>
-            
       <artifactId>spring-shell-starter</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>cglib</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-core</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>asm</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-aop</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>guava</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>aopalliance</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-context-support</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.google.guava</groupId>
-            
       <artifactId>guava</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.github.stefanbirkner</groupId>
-            
       <artifactId>system-rules</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>junit-dep</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.assertj</groupId>
-            
       <artifactId>assertj-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.mockito</groupId>
-            
       <artifactId>mockito-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.awaitility</groupId>
-            
       <artifactId>awaitility</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>pl.pragmatists</groupId>
-            
       <artifactId>JUnitParams</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>junit</groupId>
-            
       <artifactId>junit</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>hamcrest</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml
index 6e27cde1ed46..b768efe732db 100644
--- a/geode-http-service/src/test/resources/expected-pom.xml
+++ b/geode-http-service/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,221 +16,112 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-http-service</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.eclipse.jetty.ee10</groupId>
-            
       <artifactId>jetty-ee10-webapp</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.eclipse.jetty.ee10</groupId>
-            
       <artifactId>jetty-ee10-annotations</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.eclipse.jetty</groupId>
-            
       <artifactId>jetty-server</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.springframework</groupId>
-            
       <artifactId>spring-aop</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-jmh/src/test/resources/expected-pom.xml b/geode-jmh/src/test/resources/expected-pom.xml
index 9bbbc9953592..be1bcecb491b 100644
--- a/geode-jmh/src/test/resources/expected-pom.xml
+++ b/geode-jmh/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,89 +16,46 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-jmh</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.openjdk.jmh</groupId>
-            
       <artifactId>jmh-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml
index 609be51741e8..2c6a64729c78 100644
--- a/geode-junit/src/test/resources/expected-pom.xml
+++ b/geode-junit/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,567 +16,285 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-junit</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>junit</groupId>
-            
       <artifactId>junit</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>hamcrest</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.junit.jupiter</groupId>
-            
       <artifactId>junit-jupiter-api</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.junit.jupiter</groupId>
-            
       <artifactId>junit-jupiter-params</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.assertj</groupId>
-            
       <artifactId>assertj-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.mockito</groupId>
-            
       <artifactId>mockito-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>io.github.classgraph</groupId>
-            
       <artifactId>classgraph</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-annotations</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-databind</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>joda-time</groupId>
-            
       <artifactId>joda-time</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.github.stefanbirkner</groupId>
-            
       <artifactId>system-rules</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>junit-dep</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.google.guava</groupId>
-            
       <artifactId>guava</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.jayway.jsonpath</groupId>
-            
       <artifactId>json-path</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>commons-io</groupId>
-            
       <artifactId>commons-io</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.awaitility</groupId>
-            
       <artifactId>awaitility</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.hamcrest</groupId>
-            
       <artifactId>hamcrest</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>io.micrometer</groupId>
-            
       <artifactId>micrometer-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.skyscreamer</groupId>
-            
       <artifactId>jsonassert</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.junit.jupiter</groupId>
-            
       <artifactId>junit-jupiter-engine</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.junit.vintage</groupId>
-            
       <artifactId>junit-vintage-engine</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>pl.pragmatists</groupId>
-            
       <artifactId>JUnitParams</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-log4j/src/test/resources/expected-pom.xml b/geode-log4j/src/test/resources/expected-pom.xml
index ca552a936460..1dd30357b2a9 100644
--- a/geode-log4j/src/test/resources/expected-pom.xml
+++ b/geode-log4j/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,257 +16,130 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-log4j</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-slf4j-impl</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>slf4j-api</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-jcl</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-jul</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-            
       <optional>true</optional>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-logging/src/test/resources/expected-pom.xml b/geode-logging/src/test/resources/expected-pom.xml
index 9204acc252bd..b2528f6ba474 100644
--- a/geode-logging/src/test/resources/expected-pom.xml
+++ b/geode-logging/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,111 +16,57 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-logging</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml
index 5ac6b12e8a7c..4899bb2f4fef 100644
--- a/geode-lucene/src/test/resources/expected-pom.xml
+++ b/geode-lucene/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,361 +16,182 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-lucene</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.lucene</groupId>
-            
       <artifactId>lucene-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-gfsh</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-membership</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.lucene</groupId>
-            
       <artifactId>lucene-analysis-common</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.lucene</groupId>
-            
       <artifactId>lucene-queryparser</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>lucene-sandbox</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>jakarta.xml.bind</groupId>
-            
       <artifactId>jakarta.xml.bind-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.glassfish.jaxb</groupId>
-            
       <artifactId>jaxb-runtime</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.lucene</groupId>
-            
       <artifactId>lucene-analysis-phonetic</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-management/src/test/resources/expected-pom.xml b/geode-management/src/test/resources/expected-pom.xml
index 3256ca876b57..738c52522175 100644
--- a/geode-management/src/test/resources/expected-pom.xml
+++ b/geode-management/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,265 +16,134 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-management</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>commons-io</groupId>
-            
       <artifactId>commons-io</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-databind</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>com.fasterxml.jackson.core</groupId>
-            
       <artifactId>jackson-annotations</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.springframework</groupId>
-            
       <artifactId>spring-web</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.httpcomponents.client5</groupId>
-            
       <artifactId>httpclient5</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.httpcomponents.core5</groupId>
-            
       <artifactId>httpcore5</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml
index 26ed756ec1b4..3fd2e3cf4e3c 100644
--- a/geode-membership/src/test/resources/expected-pom.xml
+++ b/geode-membership/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,265 +16,134 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-membership</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-tcp-server</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.jgroups</groupId>
-            
       <artifactId>jgroups</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>it.unimi.dsi</groupId>
-            
       <artifactId>fastutil</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>commons-validator</groupId>
-            
       <artifactId>commons-validator</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml
index c2aa1e47d9f8..b9ea313d1ed7 100644
--- a/geode-memcached/src/test/resources/expected-pom.xml
+++ b/geode-memcached/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,155 +16,79 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-memcached</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml b/geode-old-client-support/src/test/resources/expected-pom.xml
index edbbda18ef54..4b50e9620ae0 100644
--- a/geode-old-client-support/src/test/resources/expected-pom.xml
+++ b/geode-old-client-support/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,133 +16,68 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-old-client-support</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml
index c91a8eaf2d62..2d94a9365349 100644
--- a/geode-rebalancer/src/test/resources/expected-pom.xml
+++ b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,201 +16,102 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-rebalancer</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.springframework</groupId>
-            
       <artifactId>spring-context</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-beans</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-expression</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-                
         <exclusion>
-                    
           <artifactId>spring-aop</artifactId>
-                    
           <groupId>*</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-serialization/src/test/resources/expected-pom.xml b/geode-serialization/src/test/resources/expected-pom.xml
index 3edd44776ef0..719336ecdbab 100644
--- a/geode-serialization/src/test/resources/expected-pom.xml
+++ b/geode-serialization/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,177 +16,90 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-serialization</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>it.unimi.dsi</groupId>
-            
       <artifactId>fastutil</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-server-all/src/test/resources/expected-pom.xml b/geode-server-all/src/test/resources/expected-pom.xml
index 78940b2d9df7..7c572939f7a7 100644
--- a/geode-server-all/src/test/resources/expected-pom.xml
+++ b/geode-server-all/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,485 +16,244 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-server-all</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-connectors</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-cq</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-gfsh</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-log4j</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-management</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-lucene</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-rebalancer</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>compile</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-memcached</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-old-client-support</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-wan</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-tcp-server</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-unsafe</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-http-service</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.iq80.snappy</groupId>
-            
       <artifactId>snappy</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>io.swagger.core.v3</groupId>
-            
       <artifactId>swagger-annotations</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-tcp-server/src/test/resources/expected-pom.xml b/geode-tcp-server/src/test/resources/expected-pom.xml
index 5f48c3fb4a45..e8b3e583a3b8 100644
--- a/geode-tcp-server/src/test/resources/expected-pom.xml
+++ b/geode-tcp-server/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,177 +16,90 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-tcp-server</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-common</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.logging.log4j</groupId>
-            
       <artifactId>log4j-api</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>commons-validator</groupId>
-            
       <artifactId>commons-validator</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>
diff --git a/geode-unsafe/src/test/resources/expected-pom.xml b/geode-unsafe/src/test/resources/expected-pom.xml
index 5e8612feab93..a5533e9a7c87 100644
--- a/geode-unsafe/src/test/resources/expected-pom.xml
+++ b/geode-unsafe/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
-    
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,63 +16,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-unsafe</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-  
 </project>
diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml
index 18c62f9a39f0..cfc6b77738da 100644
--- a/geode-wan/src/test/resources/expected-pom.xml
+++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-    
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,221 +16,112 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-    
   <modelVersion>4.0.0</modelVersion>
-    
   <groupId>org.apache.geode</groupId>
-    
   <artifactId>geode-wan</artifactId>
-    
   <version>${version}</version>
-    
   <name>Apache Geode</name>
-    
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
-    
   <url>http://geode.apache.org</url>
-    
   <licenses>
-        
     <license>
-            
       <name>The Apache Software License, Version 2.0</name>
-            
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-          
     </license>
-      
   </licenses>
-    
   <scm>
-        
     <connection>scm:git:https://github.com:apache/geode.git</connection>
-        
     <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
-        
     <url>https://github.com/apache/geode</url>
-      
   </scm>
-    
   <dependencyManagement>
-        
     <dependencies>
-            
       <dependency>
-                
         <groupId>org.apache.geode</groupId>
-                
         <artifactId>geode-all-bom</artifactId>
-                
         <version>${version}</version>
-                
         <type>pom</type>
-                
         <scope>import</scope>
-              
       </dependency>
-          
     </dependencies>
-      
   </dependencyManagement>
-    
   <dependencies>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-logging</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-membership</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-serialization</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-tcp-server</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-core</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.geode</groupId>
-            
       <artifactId>geode-gfsh</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-        
     <dependency>
-            
       <groupId>org.apache.commons</groupId>
-            
       <artifactId>commons-lang3</artifactId>
-            
       <scope>runtime</scope>
-            
       <exclusions>
-                
         <exclusion>
-                    
           <artifactId>log4j-to-slf4j</artifactId>
-                    
           <groupId>org.apache.logging.log4j</groupId>
-                  
         </exclusion>
-              
       </exclusions>
-          
     </dependency>
-      
   </dependencies>
-  
 </project>