diff --git a/Spring Data Commons.sonargraph b/Spring Data Commons.sonargraph
index 171fe2174..6784b0580 100644
--- a/Spring Data Commons.sonargraph	
+++ b/Spring Data Commons.sonargraph	
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<context version="7.1.10.209">
+<context version="7.2.2.230">
     <scope type="Project" name="spring-data-commons">
+        <element type="TypeFilterReferenceOverridden" name="Filter">
+            <element type="IncludeTypePattern" name="**"/>
+        </element>
         <architecture>
             <element type="Layer" name="Web">
                 <element type="TypeFilter" name="Assignment">
@@ -10,16 +13,11 @@
                     <element type="TypeFilter" name="Assignment">
                         <element type="IncludeTypePattern" name="**.config.**"/>
                     </element>
-                    <dependency toName="Project|spring-data-commons::Layer|Core::Subsystem|Geo" type="AllowedDependency"/>
                     <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|Support" type="AllowedDependency"/>
-                    <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
                 </element>
                 <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Repositories" type="AllowedDependency"/>
-                <dependency toName="External|External::Subsystem|Logging" type="AllowedDependency"/>
-                <dependency toName="External|External::Subsystem|Reflection" type="AllowedDependency"/>
-                <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
             </element>
             <element type="Layer" name="Repositories">
                 <element type="TypeFilter" name="Assignment">
@@ -71,6 +69,7 @@
                         <element type="IncludeTypePattern" name="**.config.**"/>
                     </element>
                     <stereotype name="Unrestricted"/>
+                    <dependency toName="Project|spring-data-commons::Layer|Repositories::Subsystem|CDI" type="DisallowedDependency"/>
                 </element>
                 <element type="Subsystem" name="CDI">
                     <element type="TypeFilter" name="Assignment">
@@ -93,13 +92,6 @@
                 <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
             </element>
-            <element type="Layer" name="Conversion">
-                <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="**.convert.**"/>
-                </element>
-                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
-                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
-            </element>
             <element type="Layer" name="Auditing">
                 <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.auditing.**"/>
@@ -114,6 +106,13 @@
                 <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
                 <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
             </element>
+            <element type="Layer" name="Conversion">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="**.convert.**"/>
+                </element>
+                <dependency toName="Project|spring-data-commons::Layer|Core" type="AllowedDependency"/>
+                <dependency toName="Project|spring-data-commons::Layer|Mapping" type="AllowedDependency"/>
+            </element>
             <element type="Layer" name="Mapping">
                 <element type="TypeFilter" name="Assignment">
                     <element type="IncludeTypePattern" name="**.mapping.**"/>
@@ -176,6 +175,11 @@
                         <element type="WeakTypePattern" name="**.config.**"/>
                     </element>
                 </element>
+                <element type="Subsystem" name="Querydsl">
+                    <element type="TypeFilter" name="Assignment">
+                        <element type="IncludeTypePattern" name="**.querydsl.**"/>
+                    </element>
+                </element>
                 <dependency toName="Project|spring-data-commons::Layer|Application" type="AllowedDependency"/>
             </element>
             <element type="Layer" name="Application">
@@ -193,12 +197,6 @@
                     <dependency toName="External|External::Subsystem|JAXB" type="AllowedDependency"/>
                     <dependency toName="External|External::Subsystem|Spring" type="AllowedDependency"/>
                 </element>
-                <element type="Subsystem" name="Querydsl">
-                    <element type="TypeFilter" name="Assignment">
-                        <element type="IncludeTypePattern" name="**.querydsl.**"/>
-                    </element>
-                    <dependency toName="Project|spring-data-commons::Layer|Application::Subsystem|Domain" type="AllowedDependency"/>
-                </element>
                 <element type="Subsystem" name="Cross store">
                     <element type="TypeFilter" name="Assignment">
                         <element type="IncludeTypePattern" name="**.crossstore.**"/>
@@ -324,6 +322,11 @@
                     <element type="WeakTypePattern" name="java.**"/>
                 </element>
             </element>
+            <element type="Subsystem" name="Guava">
+                <element type="TypeFilter" name="Assignment">
+                    <element type="IncludeTypePattern" name="com.google.common.**"/>
+                </element>
+            </element>
         </architecture>
     </scope>
     <scope type="Global" name="Global">
@@ -395,58 +398,58 @@
         </item>
     </itemDefinition>
     <attributeConfiguration type="AttributeConfiguration">
-        <property value="disabled" name="ExtendedCyclomaticComplexity"/>
-        <property value="disabled" name="MaxExtendedCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="NumberOfWarnings"/>
-        <property value="disabled" name="AverageCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="NumberOfAbstractTypes"/>
-        <property value="disabled" name="JdkVersion"/>
+        <property value="disabled" name="DistributedOverPathContainers"/>
+        <property value="disabled" name="AccumulatedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfCyclicDirectories"/>
+        <property value="disabled" name="AverageCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfCyclicProjects"/>
+        <property value="disabled" name="NumberOfCyclicSourceFiles"/>
+        <property value="disabled" name="RelativeAverageTypeDependency"/>
+        <property value="disabled" name="NumberOfLayers"/>
         <property value="disabled" name="CyclomaticComplexity"/>
         <property value="disabled" name="NumberOfMethodsWithImplementation"/>
-        <property value="disabled" name="NumberOfIgnoredWarnings"/>
-        <property value="disabled" name="NumberOfNamedInterfaces"/>
-        <property value="disabled" name="NumberOfCyclicProjects"/>
-        <property value="disabled" name="NumberOfRefactorings"/>
-        <property value="disabled" name="DependsUpon"/>
         <property value="disabled" name="NumberOfVerticalSliceGroups"/>
-        <property value="disabled" name="DistributedOverPathContainers"/>
-        <property value="disabled" name="AverageExtendedCyclomaticComplexityPerMethod"/>
-        <property value="disabled" name="AverageTypeDependency"/>
+        <property value="disabled" name="ExtendedCyclomaticComplexity"/>
         <property value="disabled" name="NumberOfDuplicateCodeBlocksWarnings"/>
-        <property value="disabled" name="RelativeAverageTypeDependency"/>
-        <property value="disabled" name="AverageAccumulatedExtendedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="NumberOfLayerGroups"/>
-        <property value="disabled" name="NumberOfIgnoredViolations"/>
-        <property value="disabled" name="NumberOfFixWarnings"/>
-        <property value="disabled" name="NumberOfExcludedSourceFiles"/>
-        <property value="disabled" name="NumberOfVerticalSlices"/>
-        <property value="disabled" name="AverageAccumulatedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="Timestamp"/>
-        <property value="disabled" name="AverageAssertionUsage"/>
-        <property value="disabled" name="NumberOfCyclicSubsystems"/>
-        <property value="disabled" name="NumberOfCyclicNamespaces"/>
-        <property value="disabled" name="NumberOfExcludedTargetFiles"/>
-        <property value="disabled" name="NumberOfCyclicVerticalSliceGroups"/>
+        <property value="disabled" name="NormalizedCumulativeTypeDependency"/>
         <property value="disabled" name="AccumulatedExtendedCyclomaticComplexity"/>
-        <property value="disabled" name="NumberOfLayers"/>
-        <property value="disabled" name="NumberOfCyclicSourceFiles"/>
+        <property value="disabled" name="NumberOfLayerGroups"/>
+        <property value="disabled" name="NumberOfExcludedTargetFiles"/>
+        <property value="disabled" name="NumberOfCyclicLayers"/>
+        <property value="disabled" name="NumberOfRefactorings"/>
+        <property value="disabled" name="NumberOfSubsystems"/>
+        <property value="disabled" name="MaxCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfWorkspaceWarnings"/>
+        <property value="disabled" name="NumberOfCyclicLayerGroups"/>
+        <property value="disabled" name="NumberOfTasks"/>
+        <property value="disabled" name="JdkVersion"/>
+        <property value="disabled" name="AverageAccumulatedExtendedCyclomaticComplexityPerType"/>
+        <property value="disabled" name="NumberOfAbstractMethods"/>
+        <property value="disabled" name="NumberOfCyclicVerticalSliceGroups"/>
+        <property value="disabled" name="AverageAssertionUsage"/>
+        <property value="disabled" name="NumberOfFixWarnings"/>
+        <property value="disabled" name="Timestamp"/>
+        <property value="disabled" name="NumberOfNameParts"/>
+        <property value="disabled" name="NumberOfAssertions"/>
+        <property value="disabled" name="AverageTypeDependency"/>
+        <property value="disabled" name="NumberOfNamedInterfaces"/>
+        <property value="disabled" name="NumberOfTypesWithImplementation"/>
+        <property value="disabled" name="NumberOfAbstractTypes"/>
+        <property value="disabled" name="NumberOfVerticalSlices"/>
+        <property value="disabled" name="NumberOfMetricWarnings"/>
+        <property value="disabled" name="MaxExtendedCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="DependsUpon"/>
+        <property value="disabled" name="NumberOfExcludedSourceFiles"/>
+        <property value="disabled" name="AverageExtendedCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfCyclicSubsystems"/>
         <property value="disabled" name="MaxAccumulatedCyclomaticComplexityPerType"/>
         <property value="disabled" name="MaxAccumulatedExtendedCyclomaticComplexityPerType"/>
-        <property value="disabled" name="NumberOfCyclicLayerGroups"/>
-        <property value="disabled" name="NumberOfAssertions"/>
-        <property value="disabled" name="NumberOfCyclicVerticalSlices"/>
-        <property value="disabled" name="NormalizedCumulativeTypeDependency"/>
-        <property value="disabled" name="AccumulatedCyclomaticComplexity"/>
-        <property value="disabled" name="NumberOfMetricWarnings"/>
-        <property value="disabled" name="NumberOfNameParts"/>
-        <property value="disabled" name="NumberOfTasks"/>
-        <property value="disabled" name="NumberOfWorkspaceWarnings"/>
-        <property value="disabled" name="NumberOfAbstractMethods"/>
-        <property value="disabled" name="NumberOfTypesWithImplementation"/>
+        <property value="disabled" name="NumberOfIgnoredViolations"/>
         <property value="disabled" name="Level"/>
-        <property value="disabled" name="NumberOfSubsystems"/>
-        <property value="disabled" name="NumberOfCyclicLayers"/>
-        <property value="disabled" name="MaxCyclomaticComplexityPerMethod"/>
+        <property value="disabled" name="NumberOfWarnings"/>
+        <property value="disabled" name="NumberOfCyclicNamespaces"/>
+        <property value="disabled" name="NumberOfCyclicVerticalSlices"/>
+        <property value="disabled" name="NumberOfIgnoredWarnings"/>
+        <property value="disabled" name="AverageAccumulatedCyclomaticComplexityPerType"/>
     </attributeConfiguration>
 </context>