You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jm...@apache.org on 2022/02/16 21:34:15 UTC

[geode] branch feature/GEODE-7665 updated: Rebase on GEODE develop (#7372)

This is an automated email from the ASF dual-hosted git repository.

jmelchior pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this push:
     new cd94f07  Rebase on GEODE develop (#7372)
cd94f07 is described below

commit cd94f073946f203e10eef6a45ec485d3a8e5be54
Author: Joris Melchior <jo...@gmail.com>
AuthorDate: Wed Feb 16 16:32:27 2022 -0500

    Rebase on GEODE develop (#7372)
---
 .asf.yaml                                          |    8 +-
 .github/PULL_REQUEST_TEMPLATE.md                   |   10 +-
 BUILDING.md                                        |    2 +-
 CODEOWNERS                                         |  102 +-
 CODEWATCHERS                                       |   22 +-
 KEYS                                               |  131 +-
 LICENSE                                            |    2 +
 NOTICE                                             |    6 +-
 README.md                                          |   28 +-
 boms/build.gradle                                  |   16 -
 .../src/test/resources/expected-pom.xml            |  212 +-
 boms/geode-client-bom/build.gradle                 |    1 -
 build.gradle                                       |   12 +-
 buildSrc/build.gradle                              |   14 +-
 .../org/apache/geode/gradle/PasswordDialog.groovy  |    4 +-
 .../geode/gradle/TestPropertiesWriter.groovy       |   18 +-
 .../japicmp/AllowMajorBreakingChanges.groovy       |    2 +-
 .../gradle/japicmp/GeodeApiRegressionRule.groovy   |    2 +-
 .../gradle/japicmp/GeodeSpiRegressionRule.groovy   |   45 +
 .../gradle/japicmp/ParentIsExperimental.groovy     |    6 +-
 .../gradle/plugins/DependencyConstraints.groovy    |  103 +-
 .../dockerized/DockerTestWorkerConfig.groovy       |   92 -
 .../testing/dockerized/DockerizedTestPlugin.groovy |  137 -
 .../testing/isolation/IsolatedTestPlugin.groovy    |   87 +
 .../geode/gradle/testing/repeat/RepeatTest.groovy  |    5 +-
 .../dockerized/DockerConnectionAcceptor.java       |  114 -
 .../testing/dockerized/DockerMessagingServer.java  |   69 -
 .../gradle/testing/dockerized/DockerProcess.java   |  287 --
 .../testing/dockerized/DockerProcessLauncher.java  |  227 --
 .../WildcardBindingInetAddressFactory.java         |   32 -
 .../testing/isolation/CompletableProcess.java      |   95 +
 .../geode/gradle/testing/isolation/PortRange.java  |   60 +
 .../gradle/testing/isolation/PortRangeContext.java |   83 +
 .../isolation/PortRangeProcessLauncher.java        |   81 +
 .../isolation/WorkingDirectoryIsolator.java        |    2 +-
 .../ExecutionTrackingTestClassProcessor.java       |   55 +
 .../ExecutionTrackingTestResultProcessor.java      |  121 +
 .../gradle/testing/repeat/RepeatTestExecuter.java  |  162 +
 .../testing/repeat/RepeatableTestExecuter.java     |  159 -
 .../geode-dockerized-test.properties               |    1 -
 .../gradle-plugins/geode-isolated-test.properties  |    1 +
 .../src/main/resources/japicmp_exceptions.json     |   10 +-
 .../geode/gradle/test/isolation/PortRangeTest.java |   85 +
 .../org/apache/geode/javac/SimpleFileManager.java  |    2 +-
 .../org/apache/geode/javac/SimpleSourceFile.java   |    2 +-
 .../geode/javac/TestAnnotationProcessor.java       |    2 +-
 ci/bin/concourse_job_performance.py                |    4 +-
 ci/images/google-geode-builder/packer.json         |    5 +-
 ci/images/google-geode-builder/scripts/setup.sh    |    2 +-
 ci/images/google-windows-geode-builder/packer.json |    4 +-
 ci/images/test-container/Dockerfile                |   64 -
 ci/pipelines/examples/deploy_pipeline.sh           |   10 -
 ci/pipelines/examples/jinja.template.yml           |    3 +
 ci/pipelines/geode-build/deploy_pipeline.sh        |   10 -
 ci/pipelines/geode-build/jinja.template.yml        |   11 +-
 ci/pipelines/images/jinja.template.yml             |   47 +-
 ci/pipelines/mass-test-run/deploy_pipeline.sh      |   10 -
 ci/pipelines/mass-test-run/jinja.template.yml      |   20 +-
 ci/pipelines/meta/deploy_meta.sh                   |    8 +-
 ci/pipelines/meta/jinja.template.yml               |    6 +-
 ci/pipelines/pull-request/jinja.template.yml       |   23 +-
 ci/pipelines/render.py                             |    4 +-
 ci/pipelines/shared/jinja.variables.yml            |   61 +-
 ci/scripts/build_image.sh                          |   17 +-
 ci/scripts/capture-call-stacks.sh                  |   37 +-
 ci/scripts/cleanup_benchmarks.sh                   |   22 +-
 ci/scripts/create_instance.sh                      |   23 +-
 ci/scripts/execute_build.sh                        |    7 +-
 ci/scripts/execute_redis_tests.sh                  |   43 +-
 ci/scripts/execute_tests.sh                        |    2 +-
 ci/scripts/rsync_code_down.sh                      |    2 +-
 dev-tools/dependencies/bump.sh                     |   11 +-
 dev-tools/docker/docs/Dockerfile                   |    4 +-
 dev-tools/docker/docs/preview-user-guide.sh        |   42 +-
 dev-tools/release-testing/README.md                |   12 +
 dev-tools/release-testing/smoketest_rc.sh          |  235 ++
 dev-tools/release/README.md                        |    5 +-
 dev-tools/release/commit_rc.sh                     |   31 +-
 dev-tools/release/create_support_branches.sh       |   58 +-
 dev-tools/release/deploy_rc_pipeline.sh            |  140 +-
 dev-tools/release/license_review.sh                |   10 +-
 dev-tools/release/prepare_rc.sh                    |   44 +-
 dev-tools/release/print_announce_email.sh          |  102 +
 dev-tools/release/promote_rc.sh                    |  281 +-
 dev-tools/release/set_copyright.sh                 |   17 +-
 dev-tools/release/set_versions.sh                  |   55 +-
 docker/Dockerfile                                  |   17 +-
 extensions/geode-modules-assembly/build.gradle     |    9 +-
 .../release/session/bin/modify_war                 |    3 +-
 .../internal/common/AbstractSessionCache.java      |    4 +-
 .../internal/common/ClientServerSessionCache.java  |   31 +-
 .../internal/common/PeerToPeerSessionCache.java    |   18 +-
 .../internal/filter/GemfireHttpSession.java        |    6 +-
 .../internal/filter/GemfireSessionManager.java     |    4 +-
 .../attributes/AbstractDeltaSessionAttributes.java |    4 +-
 .../attributes/AbstractSessionAttributes.java      |    2 +-
 .../internal/filter/attributes/DeltaEvent.java     |    6 +-
 .../session/internal/filter/util/TypeAwareMap.java |    2 +-
 .../session/internal/jmx/SessionStatistics.java    |    6 +-
 .../session/internal/filter/CommonTests.java       |   14 +-
 .../SessionReplicationIntegrationJUnitTest.java    |    7 +-
 .../session/filter/SessionCachingFilter.java       |   12 +-
 .../geode/modules/session/installer/Installer.java |    2 +-
 .../session/installer/args/ArgumentProcessor.java  |   10 +-
 .../geode/modules/session/CommandServlet.java      |    4 +-
 .../geode/modules/session/EmbeddedTomcat.java      |   10 +-
 .../apache/geode/modules/session/QueryCommand.java |    2 +-
 .../AbstractCommitSessionValveIntegrationTest.java |    4 +-
 .../AbstractSessionValveIntegrationTest.java       |    4 +-
 .../catalina/Tomcat7DeltaSessionManager.java       |   20 +-
 .../catalina/Tomcat7DeltaSessionManagerTest.java   |   30 +-
 .../geode/modules/session/EmbeddedTomcat8.java     |    6 +-
 .../catalina/Tomcat8DeltaSessionManager.java       |    8 +-
 .../catalina/Tomcat8DeltaSessionManagerTest.java   |   30 +-
 .../catalina/Tomcat9DeltaSessionManager.java       |    8 +-
 .../catalina/Tomcat9DeltaSessionManagerTest.java   |   30 +-
 extensions/geode-modules/build.gradle              |    1 +
 .../util/ClientServerSessionCacheDUnitTest.java    |   80 +-
 .../JvmRouteBinderValveIntegrationTest.java        |    4 +-
 .../LocalSessionCacheLoaderIntegrationTest.java    |    4 +-
 .../LocalSessionCacheWriterIntegrationTest.java    |    4 +-
 ...sionExpirationCacheListenerIntegrationTest.java |    4 +-
 .../AbstractDeltaSessionIntegrationTest.java       |    2 +-
 ...aSessionAttributeEventBatchIntegrationTest.java |    4 +-
 ...essionDestroyAttributeEventIntegrationTest.java |    4 +-
 .../DeltaSessionStatisticsIntegrationTest.java     |    4 +-
 ...SessionUpdateAttributeEventIntegrationTest.java |    4 +-
 .../modules/util/ModuleFunctionsSecurityTest.java  |    2 +-
 ...tionedRegionEntriesFunctionIntegrationTest.java |    2 +-
 ...icatedRegionEntriesFunctionIntegrationTest.java |    2 +-
 .../gatewaydelta/AbstractGatewayDeltaEvent.java    |   14 +-
 .../gatewaydelta/GatewayDeltaCreateEvent.java      |   12 +-
 .../gatewaydelta/GatewayDeltaDestroyEvent.java     |    6 +-
 .../GatewayDeltaEventApplicationCacheListener.java |   12 +-
 .../GatewayDeltaForwarderCacheListener.java        |   38 +-
 .../modules/session/bootstrap/AbstractCache.java   |   40 +-
 .../session/bootstrap/ClientServerCache.java       |    8 +-
 .../modules/session/bootstrap/PeerToPeerCache.java |   14 +-
 .../session/catalina/AbstractSessionCache.java     |   10 +-
 .../session/catalina/ClientServerSessionCache.java |   34 +-
 .../session/catalina/DeltaSessionFacade.java       |    6 +-
 .../session/catalina/DeltaSessionManager.java      |    2 +-
 .../session/catalina/PeerToPeerSessionCache.java   |   24 +-
 .../catalina/Tomcat6DeltaSessionManager.java       |   22 +-
 .../catalina/callback/LocalSessionCacheLoader.java |    2 +-
 .../catalina/callback/LocalSessionCacheWriter.java |    6 +-
 .../internal/DeltaSessionAttributeEventBatch.java  |   14 +-
 .../DeltaSessionDestroyAttributeEvent.java         |    8 +-
 .../catalina/internal/DeltaSessionStatistics.java  |   16 +-
 .../internal/DeltaSessionUpdateAttributeEvent.java |   12 +-
 .../geode/modules/util/BootstrappingFunction.java  |    5 +-
 .../apache/geode/modules/util/ContextMapper.java   |    2 +-
 .../geode/modules/util/CreateRegionFunction.java   |   48 +-
 .../geode/modules/util/RegionConfiguration.java    |   66 +-
 .../util/RegionConfigurationCacheListener.java     |   32 +-
 .../modules/util/ResourceManagerValidator.java     |   20 +-
 .../geode/modules/util/SessionCustomExpiry.java    |    2 +-
 .../session/bootstrap/AbstractCacheTest.java       |   62 +
 .../session/bootstrap/ClientServerCacheTest.java   |   25 +
 .../session/bootstrap/PeerToPeerCacheTest.java     |   25 +
 .../util/ClassLoaderObjectInputStreamTest.java     |   20 +-
 extensions/session-testing-war/build.gradle        |    2 +-
 .../session/AccessAttributeValueListener.java      |    6 +-
 .../geode/modules/session/CommandServlet.java      |    6 +-
 .../apache/geode/modules/session/QueryCommand.java |    2 +-
 geode-apis-compatible-with-redis/README.md         |  228 --
 geode-apis-compatible-with-redis/build.gradle      |  121 -
 .../apache/geode/redis/NativeRedisClusterTest.java |   80 -
 .../GeodeRedisServerStartUpAcceptanceTest.java     |   99 -
 .../GlobPatternNativeRedisAcceptanceTest.java      |   32 -
 .../executor/UnknownNativeRedisAcceptanceTest.java |   32 -
 .../cluster/ClusterNativeRedisAcceptanceTest.java  |   31 -
 .../connection/AuthNativeRedisAcceptanceTest.java  |   68 -
 .../connection/EchoNativeRedisAcceptanceTest.java  |   33 -
 .../connection/PingNativeRedisAcceptanceTest.java  |   33 -
 .../SelectNativeRedisAcceptanceTest.java           |   33 -
 .../hash/HScanNativeRedisAcceptanceTest.java       |   35 -
 .../hash/HashesNativeRedisAcceptanceTest.java      |   36 -
 .../hash/HincrByFloatNativeRedisAccetanceTest.java |   36 -
 .../MemoryOverheadNativeRedisAcceptanceTest.java   |   60 -
 .../executor/key/DelNativeRedisAcceptanceTest.java |   37 -
 .../key/ExistsNativeRedisAcceptanceTest.java       |   37 -
 .../key/ExpireAtNativeRedisAcceptanceTest.java     |   37 -
 .../key/ExpireNativeRedisAcceptanceTest.java       |   37 -
 .../key/KeysNativeRedisAcceptanceTest.java         |   36 -
 .../key/PExpireAtNativeRedisAcceptanceTest.java    |   37 -
 .../key/PTTLNativeRedisAcceptanceTest.java         |   37 -
 .../key/PersistNativeRedisAcceptanceTest.java      |   37 -
 .../key/PexpireNativeRedisAcceptanceTest.java      |   37 -
 .../key/RenameNativeRedisAcceptanceTest.java       |   36 -
 .../key/ScanNativeRedisAcceptanceTest.java         |   37 -
 .../executor/key/TTLNativeRedisAcceptanceTest.java |   35 -
 .../key/TypeNativeRedisAcceptanceTest.java         |   35 -
 .../key/UnlinkNativeRedisAcceptanceTest.java       |   37 -
 .../LettucePubSubNativeRedisAcceptanceTest.java    |   32 -
 .../pubsub/PubSubNativeRedisAcceptanceTest.java    |   31 -
 .../SubscriptionsNativeRedisAcceptanceTest.java    |   31 -
 .../server/DBSizeNativeRedisAcceptanceTest.java    |   32 -
 .../server/FlushAllNativeRedisAcceptanceTest.java  |   32 -
 .../server/FlushDBNativeRedisAcceptanceTest.java   |   32 -
 .../HitsMissesNativeRedisAcceptanceTest.java       |   31 -
 .../server/InfoNativeRedisAcceptanceTest.java      |   31 -
 .../server/InfoStatsNativeRedisAcceptanceTest.java |   41 -
 .../MemoryStatsNativeRedisAcceptanceTest.java      |   37 -
 .../server/ShutDownNativeRedisAcceptanceTest.java  |   32 -
 .../server/SlowlogNativeRedisAcceptanceTest.java   |   31 -
 .../server/TimeNativeRedisAcceptanceTest.java      |   32 -
 .../set/SDiffNativeRedisAcceptanceTest.java        |   37 -
 .../set/SInterNativeRedisAcceptanceTest.java       |   37 -
 .../set/SIsMemberNativeRedisAcceptanceTest.java    |   36 -
 .../set/SMoveNativeRedisAcceptanceTest.java        |   37 -
 .../set/SPopNativeRedisAcceptanceTest.java         |   37 -
 .../set/SRemNativeRedisAcceptanceTest.java         |   37 -
 .../set/SScanNativeRedisAcceptanceTest.java        |   37 -
 .../set/SUnionNativeRedisAcceptanceTest.java       |   37 -
 .../set/SetsNativeRedisAcceptanceTest.java         |   37 -
 .../sortedset/ZAddNativeRedisAcceptanceTest.java   |   36 -
 .../sortedset/ZCardNativeRedisAcceptanceTest.java  |   36 -
 .../ZIncrByNativeRedisIntegrationTest.java         |   35 -
 .../sortedset/ZRemNativeRedisAcceptanceTest.java   |   34 -
 .../sortedset/ZScoreNativeRedisAcceptanceTest.java |   35 -
 .../AppendMemoryNativeRedisAcceptanceTest.java     |   30 -
 .../string/AppendNativeRedisAcceptanceTest.java    |   35 -
 .../string/BitCountNativeRedisAcceptanceTest.java  |   35 -
 .../string/BitOpNativeRedisAcceptanceTest.java     |   35 -
 .../string/BitPosNativeRedisAcceptanceTest.java    |   31 -
 .../string/DecrByNativeRedisAcceptanceTest.java    |   35 -
 .../string/DecrNativeRedisAcceptanceTest.java      |   36 -
 .../string/GetBitNativeRedisAcceptanceTest.java    |   35 -
 .../string/GetNativeRedisAcceptanceTest.java       |   35 -
 .../string/GetRangeNativeRedisAcceptanceTest.java  |   36 -
 .../string/GetSetNativeRedisAcceptanceTest.java    |   36 -
 .../IncrByFloatNativeRedisAcceptanceTest.java      |   35 -
 .../string/IncrByNativeRedisAcceptanceTest.java    |   35 -
 .../string/IncrNativeRedisAcceptanceTest.java      |   36 -
 .../string/MGetNativeRedisAcceptanceTest.java      |   35 -
 .../string/MSetNXNativeRedisAcceptanceTest.java    |   36 -
 .../string/MSetNativeRedisAcceptanceTest.java      |   36 -
 .../string/PSetEXNativeRedisAcceptanceTest.java    |   36 -
 .../string/SetBitNativeRedisAcceptanceTest.java    |   36 -
 .../string/SetExNativeRedisAcceptanceTest.java     |   36 -
 .../string/SetNXNativeRedisAcceptanceTest.java     |   36 -
 .../string/SetNativeRedisAcceptanceTest.java       |   35 -
 .../string/SetRangeNativeRedisAcceptanceTest.java  |   36 -
 .../string/StringNativeRedisAcceptanceTest.java    |   36 -
 .../session/NativeRedisSessionAcceptanceTest.java  |   64 -
 ...NativeRedisSessionExpirationAcceptanceTest.java |   58 -
 .../resources/0001-configure-redis-tests.patch     |  808 -----
 .../java/org/apache/geode/NativeRedisTestRule.java |   84 -
 .../java/org/apache/geode/redis/ClusterNode.java   |   67 -
 .../java/org/apache/geode/redis/ClusterNodes.java  |  126 -
 .../geode/redis/ConcurrentLoopingThreads.java      |  140 -
 .../apache/geode/redis/GeodeRedisServerRule.java   |   78 -
 .../geode/redis/NativeRedisClusterTestRule.java    |  173 --
 .../apache/geode/redis/RedisIntegrationTest.java   |   43 -
 .../proxy/ClusterNodesResponseProcessor.java       |   65 -
 .../geode/redis/internal/proxy/RedisProxy.java     |   88 -
 .../internal/proxy/RedisProxyInboundHandler.java   |  180 --
 .../geode/redis/mocks/MockBinarySubscriber.java    |   45 -
 .../apache/geode/redis/mocks/MockSubscriber.java   |  231 --
 .../test/dunit/rules/RedisClusterStartupRule.java  |  132 -
 .../commonTest/resources/redis-cluster-compose.yml |   65 -
 .../geode/redis/CheckPrimaryBucketFunction.java    |  133 -
 .../redis/GeodeRedisServerStartupDUnitTest.java    |  142 -
 .../apache/geode/redis/OutOfMemoryDUnitTest.java   |  235 --
 .../org/apache/geode/redis/RedisDistDUnitTest.java |  290 --
 .../cluster/RedisPartitionResolverDUnitTest.java   |  113 -
 .../geode/redis/internal/data/DeltaDUnitTest.java  |  224 --
 .../data/PartitionedRegionStatsUpdateTest.java     |  413 ---
 .../executor/CrashAndNoRepeatDUnitTest.java        |  327 --
 .../redis/internal/executor/FlushAllDUnitTest.java |  108 -
 .../redis/internal/executor/InfoDUnitTest.java     |  134 -
 .../cluster/ClusterSlotsAndNodesDUnitTest.java     |  309 --
 .../cluster/JedisAndLettuceClusterDUnitTest.java   |   89 -
 .../internal/executor/hash/HExistsDUnitTest.java   |  137 -
 .../internal/executor/hash/HGetDUnitTest.java      |   92 -
 .../internal/executor/hash/HKeysDUnitTest.java     |  160 -
 .../internal/executor/hash/HMgetDUnitTest.java     |   99 -
 .../internal/executor/hash/HMsetDUnitTest.java     |  235 --
 .../internal/executor/hash/HScanDunitTest.java     |  221 --
 .../internal/executor/hash/HSetNXDunitTest.java    |  119 -
 .../executor/hash/HashesAndCrashesDUnitTest.java   |  331 --
 .../internal/executor/hash/HdelDUnitTest.java      |  182 --
 .../internal/executor/hash/HlenDUnitTest.java      |  198 --
 .../internal/executor/hash/HsetDUnitTest.java      |  236 --
 .../internal/executor/hash/HstrlenDUnitTest.java   |   97 -
 .../internal/executor/hash/HvalsDUnitTest.java     |   96 -
 .../internal/executor/key/ExpireDUnitTest.java     |  183 --
 .../internal/executor/key/PersistDUnitTest.java    |  129 -
 .../internal/executor/key/RenameDUnitTest.java     |  202 --
 .../internal/executor/pubsub/PubSubDUnitTest.java  |  525 ----
 .../redis/internal/executor/set/SaddDUnitTest.java |  154 -
 .../redis/internal/executor/set/SremDUnitTest.java |  177 --
 .../internal/executor/sortedset/ZAddDUnitTest.java |  162 -
 .../executor/sortedset/ZCardDUnitTest.java         |   88 -
 .../internal/executor/sortedset/ZRemDUnitTest.java |  249 --
 .../internal/executor/string/StringsDUnitTest.java |  269 --
 .../geode/redis/session/RedisSessionDUnitTest.java |  159 -
 .../geode/redis/session/SessionDUnitTest.java      |  259 --
 .../redis/session/SessionExpirationDUnitTest.java  |  179 --
 .../redis/session/SessionsAndCrashesDUnitTest.java |  230 --
 .../config/DUnitSocketAddressResolver.java         |   57 -
 .../config/WebMvcConfig.java                       |   61 -
 .../AnalyzeRedisSerializablesIntegrationTest.java  |   31 -
 .../AbstractCommandPipeliningIntegrationTest.java  |  123 -
 .../redis/RedisCommandArgumentsTestHelper.java     |  104 -
 .../org/apache/geode/redis/RedisTestHelper.java    |   41 -
 .../java/org/apache/geode/redis/SSLTest.java       |   80 -
 .../AbstractGlobPatternIntegrationTest.java        |  255 --
 .../executor/AbstractUnknownIntegrationTest.java   |   89 -
 .../executor/GlobPatternIntegrationTest.java       |   32 -
 .../internal/executor/UnknownIntegrationTest.java  |   38 -
 .../cluster/AbstractClusterIntegrationTest.java    |   56 -
 .../executor/cluster/ClusterIntegrationTest.java   |   32 -
 .../common/UnsupportedCommandsIntegrationTest.java |  131 -
 .../connection/AbstractEchoIntegrationTest.java    |   50 -
 .../connection/AbstractPingIntegrationTest.java    |   74 -
 .../connection/AbstractSelectIntegrationTest.java  |   56 -
 .../executor/connection/AuthIntegrationTest.java   |  163 -
 .../executor/connection/EchoIntegrationTest.java   |   33 -
 .../executor/connection/PingIntegrationTest.java   |   33 -
 .../executor/connection/QuitIntegrationTest.java   |   83 -
 .../executor/connection/SelectIntegrationTest.java |   44 -
 .../hash/AbstractHScanIntegrationTest.java         |  585 ----
 .../hash/AbstractHashesIntegrationTest.java        |  922 ------
 .../hash/AbstractHincrByFloatIntegrationTest.java  |  182 --
 .../AbstractMemoryOverheadIntegrationTest.java     |  253 --
 .../executor/hash/HScanIntegrationTest.java        |   62 -
 .../executor/hash/HashesIntegrationTest.java       |   31 -
 .../executor/hash/HincrByFloatIntegrationTest.java |   32 -
 .../hash/MemoryOverheadIntegrationTest.java        |  104 -
 .../executor/key/AbstractDelIntegrationTest.java   |  118 -
 .../key/AbstractExistsIntegrationTest.java         |  192 --
 .../key/AbstractExpireAtIntegrationTest.java       |  129 -
 .../key/AbstractExpireIntegrationTest.java         |  357 ---
 .../executor/key/AbstractKeysIntegrationTest.java  |  126 -
 .../key/AbstractPExpireAtIntegrationTest.java      |   72 -
 .../executor/key/AbstractPTTLIntegrationTest.java  |   67 -
 .../key/AbstractPersistIntegrationTest.java        |  147 -
 .../key/AbstractPexpireIntegrationTest.java        |  108 -
 .../key/AbstractRenameIntegrationTest.java         |  382 ---
 .../executor/key/AbstractScanIntegrationTest.java  |  304 --
 .../executor/key/AbstractTTLIntegrationTest.java   |   85 -
 .../executor/key/AbstractTypeIntegrationTest.java  |   78 -
 .../key/AbstractUnlinkIntegrationTest.java         |  118 -
 .../internal/executor/key/DelIntegrationTest.java  |   32 -
 .../executor/key/ExistsIntegrationTest.java        |   32 -
 .../executor/key/ExpireAtIntegrationTest.java      |   32 -
 .../executor/key/ExpireIntegrationTest.java        |   32 -
 .../internal/executor/key/KeysIntegrationTest.java |   33 -
 .../executor/key/PExpireAtIntegrationTest.java     |   32 -
 .../internal/executor/key/PTTLIntegrationTest.java |   32 -
 .../executor/key/PersistIntegrationTest.java       |   31 -
 .../executor/key/PexpireIntegrationTest.java       |   32 -
 .../executor/key/RenameIntegrationTest.java        |   32 -
 .../internal/executor/key/ScanIntegrationTest.java |   56 -
 .../internal/executor/key/TTLIntegrationTest.java  |   32 -
 .../internal/executor/key/TypeIntegrationTest.java |   33 -
 .../executor/key/UnlinkIntegrationTest.java        |   32 -
 .../AbstractLettucePubSubIntegrationTest.java      |  377 ---
 .../pubsub/AbstractPubSubIntegrationTest.java      |  883 ------
 .../AbstractSubscriptionsIntegrationTest.java      |  201 --
 .../pubsub/LettucePubSubIntegrationTest.java       |   32 -
 .../executor/pubsub/PubSubIntegrationTest.java     |   31 -
 .../pubsub/SubscriptionsIntegrationTest.java       |   53 -
 .../server/AbstractDBSizeIntegrationTest.java      |   52 -
 .../server/AbstractFlushAllIntegrationTest.java    |   67 -
 .../server/AbstractFlushDBIntegrationTest.java     |   59 -
 .../server/AbstractHitsMissesIntegrationTest.java  |  617 ----
 .../server/AbstractInfoIntegrationTest.java        |  293 --
 .../AbstractRedisInfoStatsIntegrationTest.java     |  333 --
 .../AbstractRedisMemoryStatsIntegrationTest.java   |   93 -
 .../server/AbstractShutDownIntegrationTest.java    |   60 -
 .../server/AbstractSlowlogIntegrationTest.java     |  151 -
 .../server/AbstractTimeIntegrationTest.java        |   74 -
 .../executor/server/DBSizeIntegrationTest.java     |   32 -
 .../executor/server/FlushAllIntegrationTest.java   |   39 -
 .../executor/server/FlushDBIntegrationTest.java    |   33 -
 .../executor/server/HitsMissesIntegrationTest.java |   32 -
 .../executor/server/InfoIntegrationTest.java       |   34 -
 .../executor/server/InfoStatsIntegrationTest.java  |   41 -
 .../server/MemoryStatsIntegrationTest.java         |   30 -
 .../executor/server/ShutdownIntegrationTest.java   |   46 -
 .../executor/server/SlowlogIntegrationTest.java    |   34 -
 .../executor/server/TimeIntegrationTest.java       |   32 -
 .../executor/set/AbstractSDiffIntegrationTest.java |  210 --
 .../set/AbstractSInterIntegrationTest.java         |  208 --
 .../set/AbstractSIsMemberIntegrationTest.java      |   90 -
 .../executor/set/AbstractSMoveIntegrationTest.java |  170 --
 .../executor/set/AbstractSPopIntegrationTest.java  |  264 --
 .../executor/set/AbstractSRemIntegrationTest.java  |  180 --
 .../executor/set/AbstractSScanIntegrationTest.java |  341 ---
 .../set/AbstractSUnionIntegrationTest.java         |  201 --
 .../executor/set/AbstractSetsIntegrationTest.java  |  274 --
 .../executor/set/SDiffIntegrationTest.java         |   31 -
 .../executor/set/SInterIntegrationTest.java        |   31 -
 .../executor/set/SIsMemberIntegrationTest.java     |   31 -
 .../executor/set/SMoveIntegrationTest.java         |   31 -
 .../internal/executor/set/SPopIntegrationTest.java |   31 -
 .../internal/executor/set/SRemIntegrationTest.java |   31 -
 .../executor/set/SScanIntegrationTest.java         |   56 -
 .../executor/set/SUnionIntegrationTest.java        |   31 -
 .../internal/executor/set/SetsIntegrationTest.java |   31 -
 .../sortedset/AbstractZAddIntegrationTest.java     |  280 --
 .../sortedset/AbstractZCardIntegrationTest.java    |   87 -
 .../sortedset/AbstractZIncrByIntegrationTest.java  |  298 --
 .../sortedset/AbstractZRemIntegrationTest.java     |  152 -
 .../sortedset/AbstractZScoreIntegrationTest.java   |   67 -
 .../executor/sortedset/ZAddIntegrationTest.java    |   31 -
 .../executor/sortedset/ZCardIntegrationTest.java   |   31 -
 .../executor/sortedset/ZIncrByIntegrationTest.java |   30 -
 .../executor/sortedset/ZRemIntegrationTest.java    |   29 -
 .../executor/sortedset/ZScoreIntegrationTest.java  |   31 -
 .../string/AbstractAppendIntegrationTest.java      |  136 -
 .../AbstractAppendMemoryIntegrationTest.java       |   65 -
 .../string/AbstractBitCountIntegrationTest.java    |  111 -
 .../string/AbstractBitOpIntegrationTest.java       |  222 --
 .../string/AbstractBitPosIntegrationTest.java      |  182 --
 .../string/AbstractDecrByIntegrationTest.java      |  165 -
 .../string/AbstractDecrIntegrationTest.java        |   89 -
 .../string/AbstractGetBitIntegrationTest.java      |   88 -
 .../string/AbstractGetIntegrationTest.java         |   93 -
 .../string/AbstractGetRangeIntegrationTest.java    |  267 --
 .../string/AbstractGetSetIntegrationTest.java      |  163 -
 .../string/AbstractIncrByFloatIntegrationTest.java |  183 --
 .../string/AbstractIncrByIntegrationTest.java      |  137 -
 .../string/AbstractIncrIntegrationTest.java        |  121 -
 .../AbstractLettuceAppendIntegrationTest.java      |   61 -
 .../string/AbstractMGetIntegrationTest.java        |   97 -
 .../string/AbstractMSetIntegrationTest.java        |  176 --
 .../string/AbstractMSetNXIntegrationTest.java      |   91 -
 .../string/AbstractPSetEXIntegrationTest.java      |   58 -
 .../string/AbstractSetBitIntegrationTest.java      |  104 -
 .../string/AbstractSetEXIntegrationTest.java       |   72 -
 .../string/AbstractSetIntegrationTest.java         |  544 ----
 .../string/AbstractSetNXIntegrationTest.java       |  105 -
 .../string/AbstractSetRangeIntegrationTest.java    |  109 -
 .../string/AbstractStringIntegrationTest.java      |  159 -
 .../executor/string/AppendIntegrationTest.java     |   31 -
 .../string/AppendMemoryIntegrationTest.java        |   29 -
 .../executor/string/BitCountIntegrationTest.java   |   31 -
 .../executor/string/BitOpIntegrationTest.java      |   31 -
 .../executor/string/BitPosIntegrationTest.java     |   32 -
 .../executor/string/DecrByIntegrationTest.java     |   31 -
 .../executor/string/DecrIntegrationTest.java       |   31 -
 .../executor/string/GetBitIntegrationTest.java     |   31 -
 .../executor/string/GetIntegrationTest.java        |   31 -
 .../executor/string/GetRangeIntegrationTest.java   |   31 -
 .../executor/string/GetSetIntegrationTest.java     |   31 -
 .../string/IncrByFloatIntegrationTest.java         |   31 -
 .../executor/string/IncrByIntegrationTest.java     |   31 -
 .../executor/string/IncrIntegrationTest.java       |   31 -
 .../string/LettuceAppendIntegrationTest.java       |   31 -
 .../executor/string/MGetIntegrationTest.java       |   31 -
 .../executor/string/MSetIntegrationTest.java       |   31 -
 .../executor/string/MSetNXIntegrationTest.java     |   31 -
 .../executor/string/PSetEXIntegrationTest.java     |   31 -
 .../executor/string/SetBitIntegrationTest.java     |   31 -
 .../executor/string/SetEXIntegrationTest.java      |   31 -
 .../executor/string/SetIntegrationTest.java        |   31 -
 .../executor/string/SetNXIntegrationTest.java      |   31 -
 .../executor/string/SetRangeIntegrationTest.java   |   31 -
 .../executor/string/StringIntegrationTest.java     |   31 -
 .../pubsub/SubscriptionsIntegrationTest.java       |  150 -
 .../geode/redis/mocks/DummySubscription.java       |   66 -
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    2 -
 .../org/apache/geode/codeAnalysis/openBugs.txt     |   21 -
 .../codeAnalysis/sanctionedDataSerializables.txt   |   48 -
 ...ObjectOpenCustomHashmapWithCursorBenchmark.java |   70 -
 .../geode/redis/internal/GeodeRedisServer.java     |  166 -
 .../geode/redis/internal/GeodeRedisService.java    |  149 -
 .../ClusterParameterRequirements.java              |   36 -
 .../EvenParameterRequirements.java                 |   51 -
 .../ExactParameterRequirements.java                |   34 -
 .../MaximumParameterRequirements.java              |   49 -
 .../MinimumParameterRequirements.java              |   35 -
 .../MultipleParameterRequirements.java             |   36 -
 .../OddParameterRequirements.java                  |   50 -
 .../ParameterRequirements.java                     |   27 -
 .../RedisParametersMismatchException.java          |   24 -
 .../SlowlogParameterRequirements.java              |   62 -
 .../SpopParameterRequirements.java                 |   34 -
 .../UnspecifiedParameterRequirements.java          |   27 -
 .../redis/internal/PassiveExpirationManager.java   |   88 -
 .../redis/internal/RedisCommandSupportLevel.java   |   24 -
 .../geode/redis/internal/RedisCommandType.java     |  355 ---
 .../geode/redis/internal/RedisConstants.java       |   62 -
 .../internal/RedisDistributedSystemService.java    |   43 -
 .../geode/redis/internal/RegionProvider.java       |  107 -
 .../apache/geode/redis/internal/SlotAdvisor.java   |  180 --
 .../redis/internal/cluster/RedisMemberInfo.java    |   84 -
 .../cluster/RedisMemberInfoRetrievalFunction.java  |   76 -
 .../Object2ObjectOpenCustomHashMapWithCursor.java  |  189 --
 .../redis/internal/data/AbstractRedisData.java     |  243 --
 .../redis/internal/data/ByteArrayWrapper.java      |  170 --
 .../geode/redis/internal/data/CommandHelper.java   |  206 --
 .../geode/redis/internal/data/NullRedisData.java   |  130 -
 .../geode/redis/internal/data/NullRedisHash.java   |   62 -
 .../geode/redis/internal/data/NullRedisSet.java    |  170 --
 .../redis/internal/data/NullRedisSortedSet.java    |   96 -
 .../geode/redis/internal/data/NullRedisString.java |  296 --
 .../geode/redis/internal/data/RedisData.java       |   65 -
 .../data/RedisDataCommandsFunctionExecutor.java    |   49 -
 .../geode/redis/internal/data/RedisDataType.java   |   37 -
 .../data/RedisDataTypeMismatchException.java       |   34 -
 .../geode/redis/internal/data/RedisHash.java       |  425 ---
 .../data/RedisHashCommandsFunctionExecutor.java    |  115 -
 .../apache/geode/redis/internal/data/RedisKey.java |   96 -
 .../data/RedisKeyCommandsFunctionExecutor.java     |   99 -
 .../apache/geode/redis/internal/data/RedisSet.java |  357 ---
 .../data/RedisSetCommandsFunctionExecutor.java     |  108 -
 .../geode/redis/internal/data/RedisSortedSet.java  |  339 ---
 .../RedisSortedSetCommandsFunctionExecutor.java    |   63 -
 .../geode/redis/internal/data/RedisString.java     |  486 ---
 .../data/RedisStringCommandsFunctionExecutor.java  |  145 -
 .../geode/redis/internal/delta/AddsDeltaInfo.java  |   51 -
 .../redis/internal/delta/AppendDeltaInfo.java      |   46 -
 .../geode/redis/internal/delta/DeltaInfo.java      |   24 -
 .../geode/redis/internal/delta/DeltaType.java      |   24 -
 .../geode/redis/internal/delta/RemsDeltaInfo.java  |   51 -
 .../redis/internal/delta/TimestampDeltaInfo.java   |   35 -
 .../redis/internal/executor/AbstractExecutor.java  |   47 -
 .../redis/internal/executor/BaseSetOptions.java    |   82 -
 .../redis/internal/executor/CommandFunction.java   |  303 --
 .../geode/redis/internal/executor/Executor.java    |   35 -
 .../geode/redis/internal/executor/GlobPattern.java |  163 -
 .../executor/RedisCommandsFunctionInvoker.java     |   73 -
 .../redis/internal/executor/RedisResponse.java     |  155 -
 .../internal/executor/SingleResultCollector.java   |   57 -
 .../executor/SingleResultRedisFunction.java        |   63 -
 .../redis/internal/executor/StripedExecutor.java   |   41 -
 .../executor/SynchronizedStripedExecutor.java      |   72 -
 .../redis/internal/executor/UnknownExecutor.java   |   52 -
 .../redis/internal/executor/cluster/CRC16.java     |   76 -
 .../internal/executor/cluster/ClusterExecutor.java |  168 --
 .../executor/cluster/RedisPartitionResolver.java   |   35 -
 .../internal/executor/connection/AuthExecutor.java |   49 -
 .../internal/executor/connection/EchoExecutor.java |   35 -
 .../internal/executor/connection/PingExecutor.java |   59 -
 .../internal/executor/connection/QuitExecutor.java |   35 -
 .../executor/connection/SelectExecutor.java        |   38 -
 .../redis/internal/executor/hash/HDelExecutor.java |   58 -
 .../internal/executor/hash/HExistsExecutor.java    |   54 -
 .../internal/executor/hash/HGetAllExecutor.java    |   55 -
 .../redis/internal/executor/hash/HGetExecutor.java |   55 -
 .../internal/executor/hash/HIncrByExecutor.java    |   73 -
 .../executor/hash/HIncrByFloatExecutor.java        |   75 -
 .../internal/executor/hash/HKeysExecutor.java      |   57 -
 .../redis/internal/executor/hash/HLenExecutor.java |   48 -
 .../internal/executor/hash/HMGetExecutor.java      |   59 -
 .../internal/executor/hash/HMSetExecutor.java      |   62 -
 .../internal/executor/hash/HScanExecutor.java      |  118 -
 .../redis/internal/executor/hash/HSetExecutor.java |   60 -
 .../internal/executor/hash/HSetNXExecutor.java     |   41 -
 .../internal/executor/hash/HStrLenExecutor.java    |   39 -
 .../internal/executor/hash/HValsExecutor.java      |   66 -
 .../redis/internal/executor/hash/HashExecutor.java |   26 -
 .../internal/executor/hash/RedisHashCommands.java  |   54 -
 .../hash/RedisHashCommandsFunctionInvoker.java     |  122 -
 .../executor/key/AbstractScanExecutor.java         |   39 -
 .../redis/internal/executor/key/DelExecutor.java   |   41 -
 .../internal/executor/key/ExistsExecutor.java      |   42 -
 .../internal/executor/key/ExpireAtExecutor.java    |   61 -
 .../internal/executor/key/ExpireExecutor.java      |   67 -
 .../redis/internal/executor/key/KeysExecutor.java  |   70 -
 .../internal/executor/key/PExpireAtExecutor.java   |   26 -
 .../internal/executor/key/PExpireExecutor.java     |   26 -
 .../redis/internal/executor/key/PTTLExecutor.java  |   27 -
 .../internal/executor/key/PersistExecutor.java     |   38 -
 .../internal/executor/key/RedisKeyCommands.java    |   39 -
 .../key/RedisKeyCommandsFunctionInvoker.java       |  100 -
 .../internal/executor/key/RenameExecutor.java      |   49 -
 .../internal/executor/key/RenameFunction.java      |  253 --
 .../redis/internal/executor/key/ScanExecutor.java  |  142 -
 .../redis/internal/executor/key/TTLExecutor.java   |   47 -
 .../redis/internal/executor/key/TypeExecutor.java  |   37 -
 .../executor/pubsub/PsubscribeExecutor.java        |   80 -
 .../internal/executor/pubsub/PublishExecutor.java  |   39 -
 .../executor/pubsub/PunsubscribeExecutor.java      |   86 -
 .../executor/pubsub/SubscribeExecutor.java         |   78 -
 .../executor/pubsub/UnsubscribeExecutor.java       |   82 -
 .../internal/executor/server/DBSizeExecutor.java   |   33 -
 .../internal/executor/server/FlushAllExecutor.java |   44 -
 .../internal/executor/server/InfoExecutor.java     |  192 --
 .../internal/executor/server/ShutDownExecutor.java |   31 -
 .../internal/executor/server/SlowlogExecutor.java  |   41 -
 .../internal/executor/server/TimeExecutor.java     |   41 -
 .../internal/executor/set/RedisSetCommands.java    |   54 -
 .../set/RedisSetCommandsFunctionInvoker.java       |  116 -
 .../redis/internal/executor/set/SAddExecutor.java  |   38 -
 .../redis/internal/executor/set/SCardExecutor.java |   31 -
 .../redis/internal/executor/set/SDiffExecutor.java |   31 -
 .../internal/executor/set/SDiffStoreExecutor.java  |   23 -
 .../internal/executor/set/SInterExecutor.java      |   31 -
 .../internal/executor/set/SInterStoreExecutor.java |   25 -
 .../internal/executor/set/SIsMemberExecutor.java   |   36 -
 .../internal/executor/set/SMembersExecutor.java    |   34 -
 .../redis/internal/executor/set/SMoveExecutor.java |   58 -
 .../redis/internal/executor/set/SPopExecutor.java  |   53 -
 .../internal/executor/set/SRandMemberExecutor.java |   63 -
 .../redis/internal/executor/set/SRemExecutor.java  |   41 -
 .../redis/internal/executor/set/SScanExecutor.java |  121 -
 .../internal/executor/set/SUnionExecutor.java      |   31 -
 .../internal/executor/set/SUnionStoreExecutor.java |   23 -
 .../redis/internal/executor/set/SetExecutor.java   |   22 -
 .../redis/internal/executor/set/SetOpExecutor.java |   95 -
 .../executor/sortedset/RedisSortedSetCommands.java |   34 -
 .../RedisSortedSetCommandsFunctionInvoker.java     |   69 -
 .../internal/executor/sortedset/ZAddExecutor.java  |  122 -
 .../internal/executor/sortedset/ZAddOptions.java   |   63 -
 .../internal/executor/sortedset/ZCardExecutor.java |   32 -
 .../executor/sortedset/ZIncrByExecutor.java        |   38 -
 .../internal/executor/sortedset/ZRemExecutor.java  |   40 -
 .../executor/sortedset/ZScoreExecutor.java         |   39 -
 .../internal/executor/string/AppendExecutor.java   |   39 -
 .../internal/executor/string/BitCountExecutor.java |   56 -
 .../internal/executor/string/BitOpExecutor.java    |   60 -
 .../internal/executor/string/BitPosExecutor.java   |   74 -
 .../internal/executor/string/DecrByExecutor.java   |   50 -
 .../internal/executor/string/DecrExecutor.java     |   33 -
 .../internal/executor/string/GetBitExecutor.java   |   48 -
 .../internal/executor/string/GetExecutor.java      |   34 -
 .../internal/executor/string/GetRangeExecutor.java |   61 -
 .../internal/executor/string/GetSetExecutor.java   |   41 -
 .../internal/executor/string/IncrByExecutor.java   |   51 -
 .../executor/string/IncrByFloatExecutor.java       |   69 -
 .../internal/executor/string/IncrExecutor.java     |   34 -
 .../internal/executor/string/MGetExecutor.java     |   43 -
 .../internal/executor/string/MSetExecutor.java     |   45 -
 .../internal/executor/string/MSetNXExecutor.java   |   59 -
 .../internal/executor/string/PSetEXExecutor.java   |   24 -
 .../executor/string/RedisStringCommands.java       |   60 -
 .../string/RedisStringCommandsFunctionInvoker.java |  150 -
 .../internal/executor/string/SetBitExecutor.java   |   64 -
 .../internal/executor/string/SetEXExecutor.java    |   74 -
 .../internal/executor/string/SetExecutor.java      |  218 --
 .../internal/executor/string/SetNXExecutor.java    |   42 -
 .../redis/internal/executor/string/SetOptions.java |   70 -
 .../internal/executor/string/SetRangeExecutor.java |   59 -
 .../internal/executor/string/StringExecutor.java   |   26 -
 .../internal/executor/string/StrlenExecutor.java   |   32 -
 .../redis/internal/netty/ByteToCommandDecoder.java |  216 --
 .../apache/geode/redis/internal/netty/Client.java  |   62 -
 .../apache/geode/redis/internal/netty/Coder.java   |  390 ---
 .../apache/geode/redis/internal/netty/Command.java |  221 --
 .../internal/netty/ExecutionHandlerContext.java    |  490 ---
 .../redis/internal/netty/NettyRedisServer.java     |  281 --
 .../netty/RedisCommandParserException.java         |   41 -
 .../internal/pubsub/AbstractSubscription.java      |  120 -
 .../redis/internal/pubsub/ChannelSubscription.java |   68 -
 .../redis/internal/pubsub/PatternSubscription.java |   67 -
 .../apache/geode/redis/internal/pubsub/PubSub.java |   99 -
 .../geode/redis/internal/pubsub/PubSubImpl.java    |  171 --
 .../internal/pubsub/PublishResultCollector.java    |   63 -
 .../geode/redis/internal/pubsub/Subscription.java  |   73 -
 .../geode/redis/internal/pubsub/Subscriptions.java |  131 -
 .../redis/internal/statistics/GeodeRedisStats.java |  252 --
 .../redis/internal/statistics/RedisStats.java      |  203 --
 ...e.distributed.internal.DistributedSystemService |    1 -
 .../org.apache.geode.internal.cache.CacheService   |    1 -
 ...de-apis-compatible-with-redis-serializables.txt |   16 -
 .../src/performanceTest/environment-setup.sh       |  124 -
 .../redis/internal/RegionProviderJUnitTest.java    |   36 -
 .../redis/internal/SupportedCommandsJUnitTest.java |  215 --
 ...tOpenCustomHashMapWithCursorQuickCheckTest.java |   89 -
 ...ject2ObjectOpenCustomHashMapWithCursorTest.java |  204 --
 .../geode/redis/internal/data/RedisHashTest.java   |  560 ----
 .../redis/internal/data/RedisKeyJUnitTest.java     |  100 -
 .../geode/redis/internal/data/RedisSetTest.java    |  399 ---
 .../redis/internal/data/RedisSortedSetTest.java    |  308 --
 .../geode/redis/internal/data/RedisStringTest.java |  414 ---
 .../internal/executor/cluster/CRC16JUnitTest.java  |   52 -
 .../redis/internal/netty/CommandJUnitTest.java     |   71 -
 .../redis/internal/pubsub/PubSubImplJUnitTest.java |   98 -
 .../internal/pubsub/SubscriptionsJUnitTest.java    |  198 --
 .../src/test/resources/expected-pom.xml            |  176 --
 geode-assembly/build.gradle                        |  278 +-
 geode-assembly/geode-assembly-test/build.gradle    |    1 -
 .../web/controllers/AddFreeItemToOrders.java       |    8 +-
 .../rest/internal/web/controllers/Customer.java    |   34 +-
 .../web/controllers/GetDeliveredOrders.java        |    2 +-
 .../rest/internal/web/controllers/GetRegions.java  |    4 +-
 .../geode/rest/internal/web/controllers/Item.java  |   42 +-
 .../geode/rest/internal/web/controllers/Order.java |   22 +-
 .../rest/internal/web/controllers/Person.java      |   38 +-
 .../org/apache/geode/session/tests/Client.java     |   10 +-
 .../geode/session/tests/ContainerInstall.java      |    4 +-
 .../geode/session/tests/ContainerManager.java      |    2 +-
 .../geode/session/tests/ServerContainer.java       |    4 +-
 .../geode/session/tests/TomcatContainer.java       |    4 +-
 .../apache/geode/session/tests/TomcatInstall.java  |    6 +-
 .../geode/test/junit/rules/GeodeDevRestClient.java |   15 +-
 .../test/junit/rules/GeodeHttpClientRule.java      |    6 +-
 .../geode/test/junit/rules/HttpResponseAssert.java |    9 +-
 ...iversWithSamePortAndHostnameForSendersTest.java |   34 +-
 ...gerConfiguresJmxSerialFilterAcceptanceTest.java |  115 -
 ...gerConfiguresJmxSerialFilterAcceptanceTest.java |  111 -
 ...scribeConfigAreFullyRedactedAcceptanceTest.java |  111 +-
 ...tandaloneClientManagementAPIAcceptanceTest.java |    2 +-
 .../geode/modules/DeployJarAcceptanceTest.java     |   11 +-
 .../org/apache/geode/rules/DockerComposeRule.java  |   22 +
 ...artLocatorGlobalSerialFilterAcceptanceTest.java |  138 +
 .../StartLocatorJmxSerialFilterAcceptanceTest.java |  111 +
 ...tartServerGlobalSerialFilterAcceptanceTest.java |  150 +
 .../StartServerJmxSerialFilterAcceptanceTest.java  |  108 +
 .../gradle-test-projects/management/build.gradle   |   16 +-
 .../cache/wan/scripts/geode-starter-create.gfsh    |    1 -
 .../management/JQFilterVerificationDUnitTest.java  |    8 +-
 .../cli/commands/StartServerCommandDUnitTest.java  |   19 +-
 .../cli/commands/StopLocatorCommandDUnitTest.java  |    2 +-
 .../ClientClusterManagementServiceDunitTest.java   |    2 +-
 .../rest/ClusterManagementServiceOnServerTest.java |    2 +-
 .../rest/DeploymentManagementDUnitTest.java        |    2 +-
 .../DeploymentSemanticVersionJarDUnitTest.java     |   17 +-
 ...eveloperRestSecurityConfigurationDUnitTest.java |    4 +-
 .../rest/GeodeManagementServiceFlagDUnitTest.java  |    3 +-
 .../rest/ListRegionManagementDunitTest.java        |    3 +-
 ...nagementRestSecurityConfigurationDUnitTest.java |    4 +-
 .../rest/RestoreRedundancyManagementDUnitTest.java |   92 +-
 .../internal/web/controllers/RestAPITestBase.java  |    2 +-
 .../web/controllers/RestAPIsWithSSLDUnitTest.java  |    2 +-
 .../session/tests/GenericAppServerInstall.java     |    4 +-
 .../org/apache/geode/session/tests/LogChecker.java |    6 +-
 .../geode/AssemblyContentsIntegrationTest.java     |    2 +-
 .../geode/GfshDependencyJarIntegrationTest.java    |   92 +
 .../StartLocatorCommandIntegrationTest.java        |   16 +-
 .../internal/web/RestInterfaceIntegrationTest.java |    3 +-
 .../rest/internal/web/RestRegionAPIDUnitTest.java  |  424 ---
 .../internal/web/RestRegionAPIIntegrationTest.java |  514 ++++
 .../PdxBasedCrudControllerIntegrationTest.java     |   46 +-
 .../geode/tools/pulse/PulseConnectivityTest.java   |    2 +-
 .../tools/pulse/PulseSecurityWithSSLTest.java      |    2 +-
 .../integrationTest/resources/assembly_content.txt |   95 +-
 .../resources/dependency_classpath.txt             |   91 +-
 .../integrationTest/resources/expected_jars.txt    |   12 +-
 .../resources/gfsh_dependency_classpath.txt        |   98 +
 geode-assembly/src/main/dist/LICENSE               |   10 +-
 geode-assembly/src/main/dist/NOTICE                |    2 +-
 .../tools/pulse/ui/PulseAcceptanceAuthTest.java    |    2 +-
 .../tools/pulse/ui/PulseAcceptanceNoAuthTest.java  |    2 +-
 .../tools/pulse/ui/PulseAcceptanceTestBase.java    |    2 +-
 .../DeploymentManagementUpgradeTest.java           |    4 +-
 .../management/OperationManagementUpgradeTest.java |   18 +-
 .../RollingUpgradeWithGfshDUnitTest.java           |   25 +-
 .../management/RollingUpgradeWithSslDUnitTest.java |  276 ++
 .../cli/commands/ConnectCommandUpgradeTest.java    |   57 +-
 .../web/controllers/RestAPICompatibilityTest.java  |   19 +-
 .../Tomcat8ClientServerRollingUpgradeTest.java     |    2 +-
 .../org/apache/geode/management/gemfire.properties |   17 +
 geode-book/README.md                               |   20 +-
 geode-book/config.yml                              |   10 +-
 .../source/subnavs/geode-subnav.erb                |   40 +-
 geode-book/redirects.rb                            |    4 +-
 geode-common/build.gradle                          |   12 +
 .../apache/geode/internal/lang/SystemProperty.java |  118 +
 .../geode/internal/lang/utils/ClassUtils.java      |  143 +
 .../geode/internal/version/ComponentVersion.java   |   72 +
 .../internal/version/DistributionVersion.java      |   76 +
 .../geode/util/internal/GeodeJsonMapper.java       |   13 +-
 .../geode/util/internal/TeeOutputStream.java       |   19 +-
 .../apache/geode/util/internal/TeePrintStream.java |    9 +-
 .../geode/annotations/ExperimentalJUnitTest.java   |   12 +-
 .../geode/internal/lang/SystemPropertyTest.java    |  107 +
 .../geode/internal/lang/utils/ClassUtilsTest.java  |  163 +
 geode-concurrency-test/build.gradle                |    1 +
 .../geode/test/concurrency/loop/LoopRunner.java    |    3 +-
 geode-connectors/build.gradle                      |    2 +-
 .../jdbc/CacheXmlJdbcMappingIntegrationTest.java   |  268 ++
 .../org/apache/geode/connectors/jdbc/Employee.java |   12 +-
 .../geode/connectors/jdbc/JdbcDistributedTest.java |   47 +-
 .../connectors/jdbc/JdbcLoaderIntegrationTest.java |    2 +-
 .../connectors/jdbc/NonSerializedEmployee.java     |   44 +
 .../org/apache/geode/connectors/jdbc/TestDate.java |    8 +-
 ...cMappingIntegrationTest.FieldMappings.cache.xml |   47 +
 ...eldMappingsColumnNamesWithUnderscores.cache.xml |   47 +
 ...appingIntegrationTest.NoFieldMappings.cache.xml |   44 +
 ...NoFieldMappingsWithNonSerializedClass.cache.xml |   44 +
 ...bcMappingIntegrationTest.WrongPdxName.cache.xml |   44 +
 .../cli/CreateDataSourceCommandDUnitTest.java      |    2 +-
 .../cli/CreateMappingCommandDUnitTest.java         |   12 +-
 ...reateMappingCommandForProxyRegionDUnitTest.java |    4 +-
 .../cli/DeregisterDriverCommandDUnitTest.java      |    4 +-
 .../cli/DestroyMappingCommandDunitTest.java        |    8 +-
 .../cli/JdbcClusterConfigDistributedTest.java      |    9 +-
 .../internal/cli/ListDriversCommandDUnitTest.java  |    6 +-
 .../internal/cli/ListMappingCommandDUnitTest.java  |    2 +-
 .../cli/RegisterDriverCommandDUnitTest.java        |    4 +-
 ...lyzeConnectorsSerializablesIntegrationTest.java |   37 +
 .../AnalyzeConnectorsSerializablesJUnitTest.java   |   34 -
 ...ctionedSerializablesServiceIntegrationTest.java |   40 +
 .../cli/JDBCConnectorFunctionsSecurityTest.java    |    2 +-
 .../jdbc/JdbcPooledDataSourceFactory.java          |    2 +-
 .../jdbc/internal/AbstractJdbcCallback.java        |    2 +-
 .../ConnectorsDistributedSystemService.java        |   43 -
 .../ConnectorsSanctionedSerializablesService.java  |   27 +
 .../jdbc/internal/JdbcConnectorService.java        |    6 +
 .../jdbc/internal/JdbcConnectorServiceImpl.java    |   62 +
 .../geode/connectors/jdbc/internal/SqlHandler.java |   22 +-
 .../jdbc/internal/SqlStatementFactory.java         |    2 +-
 .../connectors/jdbc/internal/SqlToPdxInstance.java |    4 +-
 .../connectors/jdbc/internal/TableMetaData.java    |   16 +-
 .../CreateMappingPreconditionCheckFunction.java    |   60 +-
 .../jdbc/internal/cli/DescribeMappingCommand.java  |    6 +-
 .../jdbc/internal/cli/DescribeMappingResult.java   |    4 +-
 .../internal/cli/DestroyDataSourceCommand.java     |    2 +-
 .../jdbc/internal/cli/MappingCommandUtils.java     |    8 +-
 .../jdbc/internal/configuration/FieldMapping.java  |   10 +-
 .../jdbc/internal/configuration/RegionMapping.java |    6 +-
 .../connectors/jdbc/internal/xml/ElementType.java  |    2 +-
 .../internal/xml/RegionMappingConfiguration.java   |  127 +
 ...e.distributed.internal.DistributedSystemService |   16 -
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../jdbc/JdbcConnectorExceptionTest.java           |    6 +-
 .../jdbc/JdbcPooledDataSourceFactoryTest.java      |    2 +-
 .../jdbc/internal/JdbcConnectorServiceTest.java    |   98 +
 .../connectors/jdbc/internal/SqlHandlerTest.java   |   12 +-
 .../jdbc/internal/SqlStatementFactoryTest.java     |    2 +-
 .../jdbc/internal/SqlToPdxInstanceCreatorTest.java |    6 +-
 .../jdbc/internal/SqlToPdxInstanceTest.java        |   16 +-
 .../jdbc/internal/TableMetaDataManagerTest.java    |    2 +-
 .../internal/cli/CreateDataSourceCommandTest.java  |    2 +-
 .../cli/CreateMappingCommandInterceptorTest.java   |   10 +-
 .../internal/cli/CreateMappingCommandTest.java     |   16 +-
 ...CreateMappingPreconditionCheckFunctionTest.java |    8 +-
 .../internal/cli/DeregisterDriverCommandTest.java  |    4 +-
 .../cli/DescribeDataSourceCommandTest.java         |    4 +-
 .../internal/cli/DescribeMappingCommandTest.java   |    2 +-
 .../internal/cli/DestroyDataSourceCommandTest.java |    2 +-
 .../internal/cli/ListDataSourceCommandTest.java    |    4 +-
 .../jdbc/internal/cli/ListDriversCommandTest.java  |    2 +-
 .../jdbc/internal/cli/ListMappingCommandTest.java  |    4 +-
 .../jdbc/internal/cli/MappingCommandUtilsTest.java |    2 +-
 .../internal/cli/RegisterDriverCommandTest.java    |    2 +-
 .../xml/RegionMappingConfigurationTest.java        |  325 ++
 geode-core/build.gradle                            |  577 ++--
 .../java/org/apache/geode/TestDataSerializer.java  |   20 +-
 .../api/AlertingServiceDistributedTest.java        |    4 +-
 ...rtingServiceWithoutListenerDistributedTest.java |    4 +-
 .../geode/cache/ClientServerTimeSyncDUnitTest.java |    4 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java    |    8 +-
 .../geode/cache/ConnectionPoolDUnitTest.java       |  112 +-
 .../CreateAndLocalDestroyInTXRegressionTest.java   |    4 +-
 .../cache/RegionExpirationDistributedTest.java     |    4 +-
 ...ValidateSerializableObjectsDistributedTest.java |  320 ++
 .../ClientServerRegisterInterestsDUnitTest.java    |    4 +-
 ...AllCacheListenerClientServerRegressionTest.java |    8 +-
 .../internal/AutoConnectionSourceDUnitTest.java    |    2 +-
 .../CacheServerSSLConnectionDUnitTest.java         |   50 +-
 .../internal/CustomSSLProviderDistributedTest.java |    6 +-
 .../SSLDualServerNoClientAuthDUnitTest.java        |    8 +-
 .../client/internal/SSLNoClientAuthDUnitTest.java  |   16 +-
 .../internal/provider/CustomKeyManagerFactory.java |   16 +-
 .../provider/CustomTrustManagerFactory.java        |   16 +-
 .../management/MemoryThresholdsDUnitTest.java      |  233 +-
 .../MemoryThresholdsOffHeapDUnitTest.java          |  208 +-
 .../cache/management/ResourceManagerDUnitTest.java |  275 +-
 .../partition/PartitionRegionHelperDUnitTest.java  |   34 +-
 .../cache/query/dunit/CompiledInDUnitTest.java     |    6 +-
 .../query/dunit/CorruptedIndexIntegrationTest.java |    4 +-
 .../cache/query/dunit/CqTimeTestListener.java      |   96 +-
 .../IndexUsageInJoinQueryDistributedTest.java      |    8 +-
 ...nequalityQueryWithRebalanceDistributedTest.java |   12 +-
 ...MultiServerPartitionedRegionQueryDUnitTest.java |   10 +-
 .../query/dunit/NonDistinctOrderByDUnitImpl.java   |   40 +-
 .../query/dunit/OrderByPartitionedDUnitTest.java   |   48 +-
 .../geode/cache/query/dunit/PDXQueryTestBase.java  |  116 +-
 .../cache/query/dunit/PdxLocalQueryDUnitTest.java  |   86 +-
 .../PdxLocalQueryVersionedClassDUnitTest.java      |    4 +-
 .../query/dunit/PdxMultiThreadQueryDUnitTest.java  |  368 +++
 .../geode/cache/query/dunit/PdxQueryDUnitTest.java |  499 +--
 .../cache/query/dunit/PdxStringQueryDUnitTest.java |  307 +-
 ...PersistentRegionCompactRangeIndexDUnitTest.java |   32 +-
 .../cache/query/dunit/PortfolioPdxVersion.java     |   34 +-
 .../cache/query/dunit/PositionPdxVersion.java      |   78 +-
 .../query/dunit/QueryAPITestPartitionResolver.java |    4 +-
 .../cache/query/dunit/QueryAuthorization.java      |    6 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java     |   13 +-
 .../cache/query/dunit/QueryIndexDUnitTest.java     |  350 +--
 .../query/dunit/QueryIndexUsingXMLDUnitTest.java   |   21 +-
 .../dunit/QueryUsingFunctionContextDUnitTest.java  |   90 +-
 .../cache/query/dunit/QueryUsingPoolDUnitTest.java |  104 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java    |   82 +-
 .../ResourceManagerWithQueryMonitorDUnitTest.java  |    6 +-
 .../query/dunit/SelectStarQueryDUnitTest.java      |   24 +-
 ...igurationServiceConstraintsDistributedTest.java |    8 +-
 .../AggregateFunctionsQueryDUnitTest.java          |    8 +-
 ...ncurrentIndexInitOnOverflowRegionDUnitTest.java |    6 +-
 ...exUpdateWithInplaceObjectModFalseDUnitTest.java |   42 +-
 .../ConcurrentIndexUpdateWithoutWLDUnitTest.java   |   56 +-
 .../internal/index/CopyOnReadIndexDUnitTest.java   |    4 +-
 .../index/IndexTrackingQueryObserverDUnitTest.java |    4 +-
 .../InitializeIndexEntryDestroyQueryDUnitTest.java |    8 +-
 .../index/MultiIndexCreationDUnitTest.java         |   13 +-
 .../index/PutAllWithIndexPerfDUnitTest.java        |    2 +-
 .../partitioned/PRBasicIndexCreationDUnitTest.java |    2 +-
 .../partitioned/PRColocatedEquiJoinDUnitTest.java  |   10 +-
 .../query/partitioned/PRQueryDUnitHelper.java      |   72 +-
 .../cache/query/partitioned/PRQueryDUnitTest.java  |    5 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java       |   10 +-
 .../cache/snapshot/ParallelSnapshotDUnitTest.java  |    2 +-
 .../geode/cache/snapshot/SnapshotDUnitTest.java    |   11 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java     |    2 +-
 .../apache/geode/cache30/CacheCloseDUnitTest.java  |    6 +-
 .../geode/cache30/CacheListenerTestCase.java       |   48 +-
 .../apache/geode/cache30/CacheLoaderTestCase.java  |   24 +-
 .../apache/geode/cache30/CacheMapTxnDUnitTest.java |   42 +-
 .../CacheRegionsReliablityStatsCheckDUnitTest.java |    2 +-
 .../geode/cache30/CacheStatisticsDUnitTest.java    |   45 +-
 .../CacheStatisticsPartitionedRegionDUnitTest.java |   32 +-
 .../apache/geode/cache30/CacheWriterTestCase.java  |   32 +-
 .../geode/cache30/CacheXMLPartitionResolver.java   |   18 +-
 .../apache/geode/cache30/CacheXml66DUnitTest.java  |  115 +-
 .../apache/geode/cache30/CacheXml80DUnitTest.java  |    2 +-
 .../geode/cache30/CacheXmlGeode10DUnitTest.java    |    4 +-
 .../apache/geode/cache30/CallbackArgDUnitTest.java |   29 +-
 .../geode/cache30/ClearMultiVmCallBkDUnitTest.java |   16 +-
 .../geode/cache30/ClearMultiVmDUnitTest.java       |   46 +-
 .../geode/cache30/ClientMembershipDUnitTest.java   |   68 +-
 .../cache30/ClientRegisterInterestDUnitTest.java   |   37 +-
 .../geode/cache30/ClientServerCCEDUnitTest.java    |   26 +-
 .../ClientServerCacheOperationDUnitTest.java       |  117 +-
 .../cache30/ConcurrentLeaveDuringGIIDUnitTest.java |   14 +-
 .../DiskDistributedNoAckRegionTestCase.java        |    6 +-
 .../geode/cache30/DiskRegionDistributedTest.java   |   12 +-
 .../apache/geode/cache30/DiskRegionTestImpl.java   |   32 +-
 .../geode/cache30/DistAckMapMethodsDUnitTest.java  |   94 +-
 .../cache30/DistributedAckRegionCCEDUnitTest.java  |   12 +-
 .../cache30/DistributedAckRegionDUnitTest.java     |    2 +-
 .../DistributedMulticastRegionDUnitTest.java       |   22 +-
 .../DistributedNoAckRegionCCEDUnitTest.java        |    4 +-
 .../cache30/DistributedNoAckRegionDUnitTest.java   |    2 +-
 .../geode/cache30/GlobalLockingDUnitTest.java      |   34 +-
 .../geode/cache30/GlobalRegionCCEDUnitTest.java    |    2 +-
 .../geode/cache30/GlobalRegionDUnitTest.java       |    8 +-
 .../cache30/LRUEvictionControllerDUnitTest.java    |   47 +-
 .../apache/geode/cache30/LocalRegionDUnitTest.java |   16 +-
 .../cache30/MemLRUEvictionControllerDUnitTest.java |   38 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java     |    3 +-
 .../cache30/PRBucketSynchronizationDUnitTest.java  |    5 +-
 .../geode/cache30/PartitionedRegionDUnitTest.java  |    4 +-
 ...rtitionedRegionMembershipListenerDUnitTest.java |   18 +-
 .../org/apache/geode/cache30/ProxyDUnitTest.java   |  158 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java     |   59 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java     |   18 +-
 .../geode/cache30/PutAllMultiVmDUnitTest.java      |   84 +-
 .../apache/geode/cache30/QueueMsgDUnitTest.java    |    4 +-
 .../geode/cache30/RRSynchronizationDUnitTest.java  |    7 +-
 .../apache/geode/cache30/ReconnectDUnitTest.java   |   21 +-
 .../cache30/ReconnectWithCacheXMLDUnitTest.java    |    5 +-
 .../cache30/ReconnectedCacheServerDUnitTest.java   |   14 +-
 .../geode/cache30/RegionAttributesTestCase.java    |    6 +-
 .../cache30/RegionMembershipListenerDUnitTest.java |  135 +-
 .../RegionReliabilityListenerDUnitTest.java        |    2 +-
 .../geode/cache30/RegionReliabilityTestCase.java   |  129 +-
 .../apache/geode/cache30/ReliabilityTestCase.java  |    9 +-
 ...tePRValuesAreNotDeserializedRegressionTest.java |    4 +-
 .../geode/cache30/RemoveAllMultiVmDUnitTest.java   |   76 +-
 .../geode/cache30/RequiredRolesDUnitTest.java      |  106 +-
 .../geode/cache30/SearchAndLoadDUnitTest.java      |   18 +-
 .../org/apache/geode/cache30/SlowRecDUnitTest.java |  122 +-
 .../geode/cache30/TXDistributedDUnitTest.java      |  147 +-
 .../org/apache/geode/cache30/TXOrderDUnitTest.java |   26 +-
 .../geode/cache30/TXRestrictionsDUnitTest.java     |    2 +-
 .../apache/geode/cache30/TestPdxSerializer.java    |    2 +-
 .../geode/cache30/TestTransactionListener.java     |   12 +-
 .../ValuesAreLazilyDeserializedRegressionTest.java |    4 +-
 .../distributed/DistributedLockBlackboardImpl.java |    2 +-
 .../DistributedLockServiceDUnitTest.java           |  209 +-
 .../distributed/DistributedMemberDUnitTest.java    |   24 +-
 .../distributed/DistributedSystemConnectPerf.java  |    4 +-
 .../distributed/DistributedSystemDUnitTest.java    |  104 +-
 .../distributed/FailDeserializationFunction.java   |   40 +
 .../geode/distributed/HostedLocatorsDUnitTest.java |   19 +-
 .../apache/geode/distributed/LocatorDUnitTest.java |   10 +-
 .../geode/distributed/LocatorLauncherTest.java     |   43 -
 .../apache/geode/distributed/RoleDUnitTest.java    |   19 +-
 .../distributed/ServerLauncherDUnitTestHelper.java |    2 +-
 .../internal/BadCacheLoaderDUnitTest.java          |   93 +
 .../ClusterDistributionManagerDUnitTest.java       |   50 +-
 ...lusterDistributionManagerForAdminDUnitTest.java |   20 +-
 .../geode/distributed/internal/DateMessage.java    |   14 +-
 .../internal/P2PMessagingConcurrencyDUnitTest.java |  370 +++
 .../internal/deadlock/DeadlockDetectorTest.java    |    2 +-
 .../deadlock/GemFireDeadlockDetectorDUnitTest.java |    4 +-
 .../locks/DLockServiceCharacterizationTests.java   |    2 +-
 .../streaming/StreamingOperationManyDUnitTest.java |   34 +-
 .../streaming/StreamingOperationOneDUnitTest.java  |   38 +-
 .../geode/disttx/CacheMapDistTXDUnitTest.java      |    8 +-
 .../apache/geode/disttx/DistTXDebugDUnitTest.java  |   68 +-
 .../disttx/DistributedTransactionDUnitTest.java    |   52 +-
 ...ackwardCompatibilitySerializationDUnitTest.java |   27 +-
 .../internal/ClassNotFoundExceptionDUnitTest.java  |   18 +-
 .../geode/internal/PdxDeleteFieldDUnitTest.java    |   24 +-
 .../apache/geode/internal/PdxRenameDUnitTest.java  |   23 +-
 .../internal/cache/ARMLockTestHookAdapter.java     |   16 +-
 ...onCreateBeforeInitializationRegressionTest.java |    8 +-
 ...okenSerializationConsistencyRegressionTest.java |    8 +-
 .../cache/BucketCreationCrashRegressionTest.java   |   22 +-
 .../internal/cache/CacheAdvisorDUnitTest.java      |   12 +-
 ...eanupFailedInitWithDiskFilesRegressionTest.java |   10 +-
 .../geode/internal/cache/ClearDAckDUnitTest.java   |   24 +-
 ...ingGiiOplogWithMissingCreateRegressionTest.java |    8 +-
 .../geode/internal/cache/ClearGlobalDUnitTest.java |    8 +-
 .../ClearRegionMessageAssertionRegressionTest.java |    8 +-
 .../internal/cache/ClearRvvLockingDUnitTest.java   |   79 +-
 .../internal/cache/ClearTXLockingDUnitTest.java    |    8 +-
 .../ClientCachingProxyRegionDistributedTest.java   |    4 +-
 ...entDeserializationCopyOnReadRegressionTest.java |   17 +-
 .../cache/ClientServerGetAllDUnitTest.java         |   30 +-
 ...entServerInvalidAndDestroyedEntryDUnitTest.java |   10 +-
 ...rverNotColocatedTransactionDistributedTest.java |    4 +-
 ...rverReadConflictTransactionDistributedTest.java |   54 +-
 ...erRepeatableReadTransactionDistributedTest.java |    4 +-
 .../cache/ClientServerTransactionCCEDUnitTest.java |    2 +-
 .../cache/ClientServerTransactionDUnitTest.java    |  733 ++---
 .../cache/CompactOfflineDiskStoreDUnitTest.java    |    5 +-
 .../internal/cache/ConcurrentMapOpsDUnitTest.java  |   25 +-
 .../internal/cache/DeltaFaultInDUnitTest.java      |   20 +-
 .../internal/cache/DeltaPropagationDUnitTest.java  |  110 +-
 .../cache/DeltaPropagationStatsDUnitTest.java      |   96 +-
 .../geode/internal/cache/DeltaSizingDUnitTest.java |   76 +-
 .../DestroyRegionDuringGIIDistributedTest.java     |    4 +-
 ...iskRecoveryWithVersioningGiiRegressionTest.java |    8 +-
 .../internal/cache/DiskRegByteArrayDUnitTest.java  |    6 +-
 .../internal/cache/DistributedCacheTestCase.java   |   10 +-
 .../EntriesDoNotExpireDuringGiiRegressionTest.java |    2 +-
 .../internal/cache/FixedPRSinglehopDUnitTest.java  |   89 +-
 .../geode/internal/cache/GIIDeltaDUnitTest.java    |   45 +-
 .../internal/cache/GIIFlowControlDUnitTest.java    |    7 +-
 .../GiiDiskAccessExceptionRegressionTest.java      |    4 +-
 .../cache/HAOverflowMemObjectSizerDUnitTest.java   |   38 +-
 ...zedDiskRegionWithIoExceptionRegressionTest.java |    4 +-
 .../cache/InterruptClientServerDUnitTest.java      |    2 +-
 .../geode/internal/cache/InterruptsDUnitTest.java  |    2 +-
 ...LatestLastAccessTimeMessageDistributedTest.java |   93 +
 .../geode/internal/cache/MapClearGIIDUnitTest.java |   36 +-
 .../cache/NetSearchMessagingDUnitTest.java         |    2 +-
 .../cache/P2PDeltaPropagationDUnitTest.java        |  120 +-
 .../PRAccessorWithOverflowRegressionTest.java      |    4 +-
 .../cache/PRCustomPartitioningDistributedTest.java |   32 +-
 .../PREntryIdleExpirationDistributedTest.java      |    2 +-
 .../cache/PREntrySetIteratorRegressionTest.java    |    2 +-
 .../internal/cache/PRQueryDistributedTest.java     |   68 +-
 .../PRQueryWithIndexAndPdxDistributedTest.java     |    4 +-
 .../cache/PRQueryWithIndexDistributedTest.java     |    4 +-
 ...RQueryWithPdxDuringRebalanceRegressionTest.java |   10 +-
 .../PRWithIndexAfterRebalanceRegressionTest.java   |    8 +-
 .../cache/ParallelDiskStoreRecoveryDUnitTest.java  |    5 +-
 .../internal/cache/PartitionListenerDUnitTest.java |   34 +-
 .../cache/PartitionedRegionAPIDUnitTest.java       |   22 +-
 ...dRegionBucketCreationDistributionDUnitTest.java |   10 +-
 .../PartitionedRegionCacheXMLExampleDUnitTest.java |    7 +-
 .../PartitionedRegionCloseDistributedTest.java     |   16 +-
 .../cache/PartitionedRegionCreationDUnitTest.java  |    8 +-
 .../PartitionedRegionDelayedRecoveryDUnitTest.java |   12 +-
 .../cache/PartitionedRegionDestroyDUnitTest.java   |   20 +-
 .../PartitionedRegionEntryCountDUnitTest.java      |    2 +-
 .../cache/PartitionedRegionEvictionDUnitTest.java  |  115 +-
 .../cache/PartitionedRegionHADUnitTest.java        |    6 +-
 ...itionedRegionHAFailureAndRecoveryDUnitTest.java |   18 +-
 .../PartitionedRegionInvalidateDUnitTest.java      |    4 +-
 .../PartitionedRegionLocalMaxMemoryDUnitTest.java  |    2 +-
 ...tionedRegionLocalMaxMemoryOffHeapDUnitTest.java |    2 +-
 .../cache/PartitionedRegionMultipleDUnitTest.java  |    8 +-
 .../PartitionedRegionOffHeapEvictionDUnitTest.java |    6 +-
 .../cache/PartitionedRegionSingleHopDUnitTest.java |   51 +-
 ...nedRegionSingleHopWithServerGroupDUnitTest.java |   11 +-
 .../cache/PartitionedRegionTestUtilsDUnitTest.java |    6 +-
 .../cache/PersistentRegionRecoveryDUnitTest.java   |   14 +-
 .../geode/internal/cache/PutAllDAckDUnitTest.java  |   14 +-
 .../internal/cache/PutAllGlobalDUnitTest.java      |   16 +-
 .../cache/RegionListenerDistributedTest.java       |    6 +-
 ...RegisterInterestWithEvictionRegressionTest.java |    6 +-
 .../internal/cache/RemoteTransactionDUnitTest.java | 2080 ++++++-------
 .../internal/cache/RemoveAllDAckDUnitTest.java     |   12 +-
 .../geode/internal/cache/RemoveDAckDUnitTest.java  |   16 +-
 .../internal/cache/RemoveGlobalDUnitTest.java      |   26 +-
 .../internal/cache/SingleHopStatsDUnitTest.java    |   22 +-
 .../geode/internal/cache/SizingFlagDUnitTest.java  |   33 +-
 .../internal/cache/SystemFailureDUnitTest.java     |   44 +-
 .../org/apache/geode/internal/cache/TestDelta.java |    4 +-
 .../cache/TestDeltaSerializableSizeableObject.java |   64 +
 .../geode/internal/cache/TestNonSizerObject.java   |    6 +-
 .../TransactionCommitOnFarSideDistributedTest.java |   18 +
 .../cache/TransactionsWithDeltaDUnitTest.java      |   32 +-
 .../cache/TransactionsWithGIIDistributedTest.java  |    6 +-
 .../cache/ValidateOfflineDiskStoreDUnitTest.java   |    5 +-
 .../cache/backup/BackupDistributedTest.java        |   28 +-
 .../backup/IncrementalBackupDistributedTest.java   |    4 +-
 .../PrepareAndFinishBackupDistributedTest.java     |    6 +-
 .../RebalanceOperationComplexDistributedTest.java  |  339 +++
 ...alanceOperationComplexPart2DistributedTest.java |  223 ++
 .../control/RebalanceOperationDistributedTest.java |   13 +-
 .../RestoreRedundancyOperationDUnitTest.java       |  115 +-
 .../cache/event/EventTrackerDUnitTest.java         |   10 +-
 .../eviction/EvictionObjectSizerDUnitTest.java     |   42 +-
 .../cache/eviction/EvictionStatsDUnitTest.java     |   37 +-
 .../ClientFunctionTimeoutRegressionTest.java       |    4 +-
 .../cache/execute/ColocationFailoverDUnitTest.java |  121 +-
 .../cache/execute/CustomResultCollector.java       |    4 +-
 ...istributedRegionFunctionExecutionDUnitTest.java |   18 +-
 ...ExceptionsIncludeLocalMemberRegressionTest.java |    6 +-
 ...ctionExecutionWithExceptionDistributedTest.java |    8 +-
 .../FunctionExecutionWithPrincipalDUnitTest.java   |    6 +-
 ...ionExecutionWithTransactionDistributedTest.java |    9 +-
 .../execute/FunctionOnRegionRetryDUnitTest.java    |    5 +-
 .../execute/FunctionOnServerRetryDUnitTest.java    |    4 +-
 .../execute/FunctionOnServersRetryDUnitTest.java   |    4 +-
 .../cache/execute/FunctionRetryTestBase.java       |   32 +-
 .../cache/execute/FunctionServiceBase.java         |   12 +-
 .../FunctionServiceMultipleOnMemberDUnitTest.java  |    2 +-
 .../cache/execute/LocalDataSetDUnitTest.java       |   68 +-
 .../execute/LocalDataSetIndexingDUnitTest.java     |   20 +-
 .../execute/LocalFunctionExecutionDUnitTest.java   |   26 +-
 .../execute/MemberFunctionExecutionDUnitTest.java  |  107 +-
 .../MultiRegionFunctionExecutionDUnitTest.java     |   40 +-
 .../cache/execute/MyTransactionFunction.java       |    2 +-
 .../NestedFunctionExecutionDistributedTest.java    |   10 +-
 .../OnGroupsFunctionExecutionDUnitTest.java        |   96 +-
 ...lientServerFunctionExecutionNoAckDUnitTest.java |   18 +-
 ...ientServerRegionFunctionExecutionDUnitTest.java |    2 +-
 ...erRegionFunctionExecutionFailoverDUnitTest.java |    4 +-
 ...egionFunctionExecutionNoSingleHopDUnitTest.java |    2 +-
 ...ctionExecutionSelectorNoSingleHopDUnitTest.java |    2 +-
 ...rRegionFunctionExecutionSingleHopDUnitTest.java |   51 +-
 .../cache/execute/PRColocationDUnitTest.java       |  592 ++--
 .../execute/PRFunctionExecutionDUnitTest.java      |   12 +-
 ...FunctionExecutionWithResultSenderDUnitTest.java |    6 +-
 .../cache/execute/PRSetOperationJTADUnitTest.java  |   44 +-
 .../cache/execute/PRSetOperationTXDUnitTest.java   |   20 +-
 .../cache/execute/PRTransactionDUnitTest.java      |  157 +-
 .../RepeatableReadTransactionDistributedTest.java  |   28 +-
 .../ExtensionClusterConfigurationDUnitTest.java    |    3 -
 .../mock/AlterMockRegionExtensionFunction.java     |    2 +-
 .../mock/CreateMockRegionExtensionFunction.java    |    2 +-
 .../mock/DestroyMockRegionExtensionFunction.java   |    2 +-
 .../cache/functions/LocalDataSetFunction.java      |    2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java     |   65 +-
 .../geode/internal/cache/ha/FailoverDUnitTest.java |   33 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java     |   22 +-
 .../geode/internal/cache/ha/HAClearDUnitTest.java  |   38 +-
 .../internal/cache/ha/HAConflationDUnitTest.java   |   20 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java    |   26 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java    |   91 +-
 .../geode/internal/cache/ha/HAExpiryDUnitTest.java |   58 +-
 .../geode/internal/cache/ha/HAGIIBugDUnitTest.java |   26 +-
 .../geode/internal/cache/ha/HAGIIDUnitTest.java    |   54 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java         |    5 +-
 .../geode/internal/cache/ha/HARegionDUnitTest.java |   75 +-
 .../internal/cache/ha/HARegionQueueDUnitTest.java  |  144 +-
 .../ha/HARegionQueueExpiryRegressionTest.java      |   13 +-
 .../cache/ha/HARegionQueueSizeRegressionTest.java  |    8 +-
 .../HARegionQueueThreadIdExpiryRegressionTest.java |   12 +-
 .../internal/cache/ha/HASlowReceiverDUnitTest.java |   36 +-
 .../cache/ha/OperationsPropagationDUnitTest.java   |   30 +-
 .../ha/PreferSerializedHARegionQueueTest.java      |   24 +-
 .../geode/internal/cache/ha/PutAllDUnitTest.java   |   62 +-
 .../geode/internal/cache/ha/StatsBugDUnitTest.java |   24 +-
 .../cache/locks/TXLockServiceDUnitTest.java        |   53 +-
 ...BucketCreationCrashCompletesRegressionTest.java |    4 +-
 .../BucketRebalanceStatRegressionTest.java         |    8 +-
 .../cache/partitioned/ElidedPutAllDUnitTest.java   |    4 +-
 .../partitioned/PartitionResolverDUnitTest.java    |    9 +-
 ...artitionedRegionAttributesMutatorDUnitTest.java |    4 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java    |    8 +-
 .../partitioned/PersistPRKRFIntegrationTest.java   |   12 +-
 ...tColocatedPartitionedRegionDistributedTest.java |   46 +-
 ...PersistentPartitionedRegionDistributedTest.java |    9 +-
 .../PersistentPartitionedRegionRegressionTest.java |    6 +-
 ...eueRemovalMessageProcessingDistributedTest.java |   10 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java    |   18 +-
 .../StreamingPartitionOperationManyDUnitTest.java  |   38 +-
 .../StreamingPartitionOperationOneDUnitTest.java   |   40 +-
 .../fixed/FixedPartitioningDUnitTest.java          |   22 +-
 ...oningWithColocationAndPersistenceDUnitTest.java |   52 +-
 .../fixed/QuarterPartitionResolver.java            |   30 +-
 .../fixed/SingleHopQuarterPartitionResolver.java   |   30 +-
 ...ntPartitionedRegionWithRedundancyDUnitTest.java |   14 +-
 .../PersistentRVVRecoveryDUnitTest.java            |    6 +-
 .../PersistentRecoveryOrderDUnitTest.java          |   43 +-
 .../cache/snapshot/GFSnapshotDUnitTest.java        |    4 +-
 .../DeltaPropagationFailureRegressionTest.java     |    4 +-
 .../cache/tier/sockets/AcceptorImplDUnitTest.java  |    4 +-
 ...dCompatibilityHigherVersionClientDUnitTest.java |   26 +-
 .../sockets/CacheServerTransactionsDUnitTest.java  |  145 +-
 .../tier/sockets/ClearPropagationDUnitTest.java    |   42 +-
 .../tier/sockets/ClientConflationDUnitTest.java    |   51 +-
 ...entDestroyRegionNotificationRegressionTest.java |    4 +-
 ...troyRegionUnregisterInterestRegressionTest.java |    4 +-
 .../sockets/ClientInterestNotifyDUnitTest.java     |   28 +-
 .../ClientProxyWithDeltaDistributedTest.java       |    6 +-
 .../sockets/ClientRegionGetRegressionTest.java     |    4 +-
 ...ientServerConnectDisconnectDistributedTest.java |   10 +-
 .../ClientServerForceInvalidateDUnitTest.java      |   35 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java    |    4 +-
 ...ientServerRemoteHostAddressDistributedTest.java |    6 +-
 .../ClientWithInterestFailoverDistributedTest.java |   18 +-
 .../cache/tier/sockets/ConflationDUnitTest.java    |   57 +-
 .../DataSerializerPropagationDUnitTest.java        |  150 +-
 .../cache/tier/sockets/DeltaEOFException.java      |   26 +-
 .../sockets/DestroyEntryPropagationDUnitTest.java  |   90 +-
 .../sockets/DurableClientBug39997DUnitTest.java    |    3 +-
 ...ientConnectDisconnectSocketDistributedTest.java |   16 +-
 .../sockets/DurableClientQueueSizeDUnitTest.java   |   45 +-
 .../sockets/DurableClientReconnectDUnitTest.java   |   48 +-
 .../tier/sockets/DurableClientStatsDUnitTest.java  |   80 +-
 .../tier/sockets/DurableRegistrationDUnitTest.java |  298 +-
 .../sockets/DurableResponseMatrixDUnitTest.java    |   16 +-
 .../tier/sockets/EventIDVerificationDUnitTest.java |   50 +-
 .../sockets/EventIDVerificationInP2PDUnitTest.java |   40 +-
 .../internal/cache/tier/sockets/FaultyDelta.java   |   52 +-
 .../GetConnectedServerCountRegressionTest.java     |    8 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java    |   16 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java     |  116 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java     |  135 +-
 .../cache/tier/sockets/HAInterestTestCase.java     |   61 +-
 .../HARegionQueueStatsCloseRegressionTest.java     |   10 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java     |  144 +-
 .../sockets/InstantiatorPropagationDUnitTest.java  |  296 +-
 .../cache/tier/sockets/InterestListDUnitTest.java  |  152 +-
 .../sockets/InterestListEndpointDUnitTest.java     |   80 +-
 .../sockets/InterestListFailoverDUnitTest.java     |   41 +-
 .../sockets/InterestListRecoveryDUnitTest.java     |   34 +-
 .../sockets/InterestRegrListenerDUnitTest.java     |  110 +-
 .../sockets/InterestResultPolicyDUnitTest.java     |   42 +-
 .../MessageTrackingTimeoutRegressionTest.java      |    6 +-
 .../tier/sockets/NewRegionAttributesDUnitTest.java |   40 +-
 .../cache/tier/sockets/PingOpDistributedTest.java  |   15 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java     |    4 +-
 .../tier/sockets/RedundancyLevelTestBase.java      |    5 +-
 .../cache/tier/sockets/RegionCloseDUnitTest.java   |   18 +-
 ...isterInterestBeforeRegionCreationDUnitTest.java |   28 +-
 .../sockets/RegisterInterestDistributedTest.java   |    2 +-
 .../sockets/RegisterInterestKeysDUnitTest.java     |   30 +-
 ...nterestOnServerWithoutRegionRegressionTest.java |    4 +-
 ...isterInterestServerMetaDataDistributedTest.java |   32 +-
 .../tier/sockets/ReliableMessagingDUnitTest.java   |   30 +-
 ...RootRegionsExcludesHARegionsRegressionTest.java |    6 +-
 .../tier/sockets/SlowDispatcherDUnitTest.java      |  168 ++
 .../tier/sockets/UnregisterInterestDUnitTest.java  |   24 +-
 .../tier/sockets/UpdatePropagationDUnitTest.java   |   34 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java     |   12 +-
 ...ifyUpdatesFromNonInterestEndPointDUnitTest.java |   40 +-
 .../cache/tx/SetOperationJTADistributedTest.java   |   34 +-
 .../cache/versions/TombstoneDUnitTest.java         |   10 +-
 ...yncEventQueueEntrySynchronizationDUnitTest.java |    6 +-
 ...ventListenerWithCacheLoaderDistributedTest.java |   10 +-
 ...syncEventListenerWithFilterDistributedTest.java |   20 +-
 .../asyncqueue/AsyncEventQueuePausedDUnitTest.java |   25 +-
 .../asyncqueue/AsyncEventQueueStatsDUnitTest.java  |   16 +-
 ...oncurrentAsyncEventListenerDistributedTest.java |   38 +-
 .../ParallelAsyncEventListenerDistributedTest.java |  174 +-
 ...AsyncEventListenerStopStartDistributedTest.java |   32 +-
 ...ListenersDifferentPrimariesDistributedTest.java |   16 +-
 .../SerialEventListenerDistributedTest.java        |   12 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java        |   30 +-
 .../wan/misc/CommonAsyncEventQueueDUnitTest.java   |   10 +-
 .../CompressionCacheListenerDUnitTest.java         |    4 +-
 .../CompressionRegionOperationsDUnitTest.java      |   14 +-
 .../compression/CompressionStatsDUnitTest.java     |    2 +-
 .../internal/jta/ClientServerJTADUnitTest.java     |    8 +-
 .../ClientServerJTAFailoverDistributedTest.java    |   12 +-
 .../geode/internal/jta/dunit/CommitThread.java     |    2 +-
 .../internal/jta/dunit/IdleTimeOutDUnitTest.java   |   12 +-
 .../internal/jta/dunit/LoginTimeOutDUnitTest.java  |   14 +-
 .../internal/jta/dunit/MaxPoolSizeDUnitTest.java   |   10 +-
 .../geode/internal/jta/dunit/RollbackThread.java   |    2 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java     |   24 +-
 .../jta/dunit/TxnManagerMultiThreadDUnitTest.java  |   20 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java    |   32 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java       |    4 +-
 .../statistics/StatisticsDistributedTest.java      |   98 +-
 .../LoggingWithReconnectDistributedTest.java       |   48 +-
 .../geode/management/CacheManagementDUnitTest.java |  280 +-
 .../management/ClientHealthStatsDUnitTest.java     |    3 +-
 .../apache/geode/management/CompositeStats.java    |   24 +-
 .../geode/management/CompositeTestMBean.java       |    4 +-
 .../management/CompositeTypeTestDUnitTest.java     |   12 +-
 .../geode/management/DLockManagementDUnitTest.java |   68 +-
 .../geode/management/DiskManagementDUnitTest.java  |   68 +-
 .../DistributedSystemMXBeanDistributedTest.java    |    2 +-
 ...butedSystemMXBeanWithAlertsDistributedTest.java |    4 +-
 ...stemMXBeanWithNotificationsDistributedTest.java |    2 +-
 .../geode/management/ManagementTestRule.java       |   13 +-
 .../management/MemberMXBeanDistributedTest.java    |   16 +-
 .../management/OffHeapManagementDUnitTest.java     |   21 +-
 .../management/PartitionedRegionStatsTest.java     |    2 +-
 .../management/RegionCreateDestroyDUnitTest.java   |   10 +-
 .../management/RegionManagementDUnitTest.java      |    2 +-
 ...niversalMembershipListenerAdapterDUnitTest.java |   22 +-
 .../stats/DistributedSystemStatsDUnitTest.java     |   10 +-
 .../ClusterConfigDeployJarDUnitTest.java           |   48 +-
 .../ClusterConfigLocatorRestartDUnitTest.java      |    2 +-
 ...rConfigServerRestartWithJarDeployDUnitTest.java |    2 +-
 ...urationPersistenceServiceUsingDirDUnitTest.java |    7 +-
 .../configuration/DeployJarWithSSLDUnitTest.java   |    4 +-
 .../ImportClusterConfigDistributedTest.java        |    8 +-
 .../ImportOldClusterConfigDUnitTest.java           |    2 +-
 .../internal/pulse/TestClientIdsDUnitTest.java     |   26 +-
 .../internal/pulse/TestFunctionsDUnitTest.java     |    2 +-
 .../internal/pulse/TestHeapDUnitTest.java          |    8 +-
 .../internal/pulse/TestLocatorsDUnitTest.java      |    6 +-
 .../security/MultiUserAuthenticationDUnitTest.java |   76 +-
 .../internal/util/ManagementUtilsDUnitTest.java    |    6 +-
 .../pdx/ClientsWithVersioningRetryDUnitTest.java   |    4 +-
 .../geode/pdx/DistributedSystemIdDUnitTest.java    |    4 +-
 .../geode/pdx/JSONPdxClientServerDUnitTest.java    |    3 +-
 .../geode/pdx/PdxAttributesDistributedTest.java    |   12 +-
 .../apache/geode/pdx/PdxClientServerDUnitTest.java |    2 +-
 .../apache/geode/pdx/PdxSerializableDUnitTest.java |   20 +-
 .../apache/geode/pdx/PdxTypeExportDUnitTest.java   |    3 +-
 .../geode/security/AuthExpirationDUnitTest.java    |  326 ++
 .../security/AuthExpirationFunctionDUnitTest.java  |  313 ++
 .../AuthExpirationMultiServerDUnitTest.java        |  384 +++
 .../AuthExpirationTransactionDUnitTest.java        |  347 +++
 .../security/ClientContainsKeyAuthDUnitTest.java   |    2 +-
 .../ClientDestroyInvalidateAuthDUnitTest.java      |    2 +-
 .../security/ClientDestroyRegionAuthDUnitTest.java |    6 +-
 .../geode/security/ClientGetAllAuthDUnitTest.java  |    2 +-
 .../security/ClientGetEntryAuthDUnitTest.java      |    2 +-
 .../geode/security/ClientGetPutAuthDUnitTest.java  |    8 +-
 .../security/ClientMultiUserAuthzDUnitTest.java    |   13 +-
 .../security/ClientRegionClearAuthDUnitTest.java   |    4 +-
 .../ClientRegisterInterestAuthDUnitTest.java       |    2 +-
 .../security/ClientRemoveAllAuthDUnitTest.java     |    2 +-
 .../ClientUnregisterInterestAuthDUnitTest.java     |    2 +-
 .../ClusterConfigWithEmbededLocatorDUnitTest.java  |    6 +-
 .../ClusterConfigWithoutSecurityDUnitTest.java     |   15 +-
 .../ClusterConfigurationSecurityDUnitTest.java     |    2 +-
 .../DeltaClientPostAuthorizationDUnitTest.java     |   24 +-
 .../security/DurableClientFailoverDUnitTest.java   |  121 +
 .../IntegratedSecurityPeerAuthDUnitTest.java       |    9 +-
 .../NoShowValue1PostProcessorDUnitTest.java        |    2 +-
 .../geode/security/P2PAuthenticationDUnitTest.java |    8 +-
 .../geode/security/PDXPostProcessorDUnitTest.java  |   53 +-
 ...AuthenticatorWithCachelessLocatorDUnitTest.java |    6 +-
 .../PeerSecurityWithEmbeddedLocatorDUnitTest.java  |    2 +-
 .../geode/security/PostProcessorDUnitTest.java     |    2 +-
 .../security/SecurityClusterConfigDUnitTest.java   |   14 +-
 .../SecurityWithoutClusterConfigDUnitTest.java     |    5 +-
 .../security/StartServerAuthorizationTest.java     |    2 +-
 .../query/PdxQuerySecurityDistributedTest.java     |    2 +-
 ...erySecurityForbiddenQueriesDistributedTest.java |    2 +-
 .../cache/RebalanceOperationComplex-client.xml     |   35 +
 .../cache/RebalanceOperationComplex-server.xml     |   48 +
 .../java/org/apache/geode/CopyJUnitTest.java       |  136 +-
 .../apache/geode/DiskInstantiatorsJUnitTest.java   |   54 +-
 .../apache/geode/JtaNoninvolvementJUnitTest.java   |   33 +-
 .../org/apache/geode/SetOperationTXJUnitTest.java  |   27 +-
 .../apache/geode/TXExpirationIntegrationTest.java  |    8 +-
 .../java/org/apache/geode/TXJUnitTest.java         | 3174 ++++++++++----------
 .../java/org/apache/geode/TXWriterJUnitTest.java   |  135 +-
 .../org/apache/geode/TXWriterOOMEJUnitTest.java    |   19 +-
 .../internal/BindDistributedSystemJUnitTest.java   |   12 +-
 .../internal/CacheHealthEvaluatorJUnitTest.java    |   10 +-
 .../internal/MemberHealthEvaluatorJUnitTest.java   |    4 +-
 .../DeprecatedAgentLauncherIntegrationTest.java    |    6 +-
 .../apache/geode/cache/CacheListenerJUnitTest.java |  150 +-
 .../cache/ConnectionPoolFactoryJUnitTest.java      |   22 +-
 .../org/apache/geode/cache/ProxyJUnitTest.java     |  131 +-
 .../cache/RegionExpirationIntegrationTest.java     |    2 +-
 .../apache/geode/cache/RegionFactoryJUnitTest.java |  186 +-
 .../RemoveAllCacheListenerPeerRegressionTest.java  |    8 +-
 .../geode/cache/ValueConstraintRegressionTest.java |    4 +-
 ...ncEventQueueEvictionAndExpirationJUnitTest.java |   11 +-
 .../cache/client/ClientRegionFactoryJUnitTest.java |   70 +-
 .../AutoConnectionSourceImplJUnitTest.java         |  118 +-
 .../internal/ConnectionPoolImplJUnitTest.java      |   18 +-
 .../client/internal/QueueManagerJUnitTest.java     |   28 +-
 .../ConnectionAccountingConcurrentTest.java        |   12 +-
 .../pooling/ConnectionManagerImplTest.java         |   16 +-
 .../cache/execute/CoreFunctionSecurityTest.java    |    2 +-
 .../execute/FunctionDynamicByArgsSecurityTest.java |    2 +-
 .../FunctionToFileTrackerIntegrationTest.java      |   62 +-
 .../mapInterface/ExceptionHandlingJUnitTest.java   |    4 +-
 .../cache/mapInterface/MapFunctionalJUnitTest.java |    8 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java    |   18 +-
 .../operations/PutOperationContextJUnitTest.java   |   14 +-
 .../cache/query/JoinQueriesIntegrationTest.java    |    6 +-
 .../cache/query/LocalQueryServiceJUnitTest.java    |   24 +-
 .../geode/cache/query/PdxStringQueryJUnitTest.java |   51 +-
 .../apache/geode/cache/query/QueryJUnitTest.java   |   23 +-
 .../geode/cache/query/QueryServiceJUnitTest.java   |    6 +-
 .../cache/query/QueryServiceRegressionTest.java    |   18 +-
 .../geode/cache/query/QueryTestUtilsJUnitTest.java |    2 +-
 .../QueryWithBucketParameterIntegrationTest.java   |    2 +-
 .../apache/geode/cache/query/RegionJUnitTest.java  |   39 +-
 .../geode/cache/query/TypedIteratorJUnitTest.java  |   12 +-
 .../functional/ComparisonOperatorsJUnitTest.java   |   42 +-
 .../DistinctAndNonDistinctQueryJUnitTest.java      |   30 +-
 ...tinctResultsWithDupValuesInRegionJUnitTest.java |    8 +-
 .../cache/query/functional/FunctionJUnitTest.java  |   48 +-
 .../query/functional/INOperatorJUnitTest.java      |   50 +-
 .../query/functional/IUM6Bug32345ReJUnitTest.java  |   16 +-
 .../geode/cache/query/functional/IUMJUnitTest.java |   15 +-
 .../functional/IUMRCompositeIteratorJUnitTest.java |   20 +-
 .../IUMRMultiIndexesMultiRegionJUnitTest.java      |   83 +-
 .../functional/IUMRShuffleIteratorsJUnitTest.java  |   30 +-
 .../functional/IUMRSingleRegionJUnitTest.java      |   58 +-
 ...IndependentOperandsInWhereClause2JUnitTest.java |    6 +-
 .../functional/IndexCreationDeadLockJUnitTest.java |   38 +-
 .../query/functional/IndexCreationJUnitTest.java   |   54 +-
 .../query/functional/IndexOnEntrySetJUnitTest.java |   39 +-
 .../query/functional/IndexOperatorJUnitTest.java   |   50 +-
 .../functional/IndexPrimaryKeyUsageJUnitTest.java  |   20 +-
 .../IndexUsageInNestedQueryJUnitTest.java          |    4 +-
 ...IndexUsageInNestedQueryWithParamsJUnitTest.java |    6 +-
 .../IndexUsageWithAliasAsProjAtrbtJUnitTest.java   |   10 +-
 .../IndexUseMultFrmSnglCondJUnitTest.java          |   14 +-
 .../IndexWithSngleFrmAndMultCondQryJUnitTest.java  |  204 +-
 .../functional/IteratorTypeDefEmpJUnitTest.java    |    6 +-
 .../query/functional/IteratorTypeDefJUnitTest.java |   24 +-
 .../IteratorTypeDefaultTypesJUnitTest.java         |  122 +-
 .../functional/IumMultConditionJUnitTest.java      |   16 +-
 .../query/functional/LikePredicateJUnitTest.java   |  127 +-
 .../query/functional/LimitClauseJUnitTest.java     |   68 +-
 .../functional/LogicalOperatorsJUnitTest.java      |   52 +-
 .../cache/query/functional/MiscJUnitTest.java      |  120 +-
 .../functional/MultiIndexCreationJUnitTest.java    |   18 +-
 .../functional/MultiRegionIndexUsageJUnitTest.java |   74 +-
 .../query/functional/MultipleRegionsJUnitTest.java |    4 +-
 .../functional/NegativeNumberQueriesJUnitTest.java |    2 +-
 .../query/functional/NestedQueryJUnitTest.java     |   20 +-
 .../NonDistinctOrderByPartitionedJUnitTest.java    |    8 +-
 .../NonDistinctOrderByReplicatedJUnitTest.java     |   52 +-
 .../query/functional/NumericQueryJUnitTest.java    |   24 +-
 .../functional/OrderByReplicatedJUnitTest.java     |   70 +-
 .../functional/ParameterBindingJUnitTest.java      |   20 +-
 .../query/functional/PdxOrderByJUnitTest.java      |    8 +-
 .../functional/QRegionInterfaceJUnitTest.java      |   18 +-
 .../QueryREUpdateInProgressJUnitTest.java          |    6 +-
 .../query/functional/QueryUndefinedJUnitTest.java  |    6 +-
 .../functional/ReservedKeywordsJUnitTest.java      |   10 +-
 .../ResultsDataSerializabilityJUnitTest.java       |    5 +-
 .../query/functional/SelectToDateJUnitTest.java    |   26 +-
 .../functional/StructMemberAccessJUnitTest.java    |   36 +-
 .../TestNewFunctionSSorRSIntegrationTest.java      |    4 +-
 .../CompiledGroupBySelectIntegrationTest.java      |    4 +-
 .../CompiledJunctionInternalsJUnitTest.java        | 1114 ++++---
 .../query/internal/CopyOnReadQueryJUnitTest.java   |   30 +-
 .../DefaultQuerySecurityIntegrationTest.java       |   14 +-
 .../internal/GroupJunctionIntegrationTest.java     |    4 +-
 .../query/internal/IndexManagerJUnitTest.java      |    6 +-
 .../query/internal/OrderByComparatorJUnitTest.java |   16 +-
 .../internal/ProjectionAttributeJUnitTest.java     |   17 +-
 .../QueryFromClauseCanonicalizationJUnitTest.java  |    8 +-
 .../query/internal/QueryObserverCallbacksTest.java |    2 +-
 .../internal/QueryServiceXmlIntegrationTest.java   |    6 +-
 .../cache/query/internal/QueryTraceJUnitTest.java  |   21 +-
 .../cache/query/internal/QueryUtilsJUnitTest.java  |   21 +-
 .../AggregateFunctionQueryBaseIntegrationTest.java |    4 +-
 .../internal/aggregate/AvgIntegrationTest.java     |    4 +-
 .../internal/aggregate/CountIntegrationTest.java   |    4 +-
 .../internal/aggregate/MaxIntegrationTest.java     |    4 +-
 .../internal/aggregate/MinIntegrationTest.java     |    4 +-
 .../internal/aggregate/SumIntegrationTest.java     |    4 +-
 .../index/AsynchIndexMaintenanceJUnitTest.java     |   49 +-
 .../internal/index/CompactRangeIndexJUnitTest.java |   50 +-
 .../CompactRangeIndexQueryIntegrationTest.java     |    2 +-
 .../index/DeclarativeIndexCreationJUnitTest.java   |    6 +-
 .../internal/index/EquiJoinIntegrationTest.java    |   10 +-
 .../index/HashIndexQueryIntegrationTest.java       |   51 +-
 .../index/IndexCreationInternalsJUnitTest.java     |   26 +-
 .../internal/index/IndexMaintainceJUnitTest.java   |  471 ---
 .../internal/index/IndexMaintenanceJUnitTest.java  |  339 ++-
 .../index/IndexManagerIntegrationTest.java         |   10 +-
 .../index/IndexTrackingQueryObserverJUnitTest.java |   10 +-
 .../query/internal/index/IndexUseJUnitTest.java    |  145 +-
 .../IndexedMergeEquiJoinScenariosJUnitTest.java    |   16 +-
 .../internal/index/MapIndexStoreJUnitTest.java     |   14 +-
 .../NewDeclarativeIndexCreationJUnitTest.java      |   42 +-
 .../internal/index/PartitionedIndexJUnitTest.java  |    4 +-
 .../index/PdxCopyOnReadQueryJUnitTest.java         |    2 +-
 .../QueryOnCompressedRegionWithIndexTest.java      |   48 +-
 .../internal/index/RangeIndexAPIJUnitTest.java     |  125 +-
 .../query/partitioned/PRColocatedEquiJoinTest.java |    2 +-
 .../query/partitioned/PRInvalidQueryJUnitTest.java |    2 +-
 .../partitioned/PRQueryCacheClosedJUnitTest.java   |    8 +-
 .../partitioned/PRQueryNumThreadsJUnitTest.java    |    4 +-
 .../partitioned/PRQueryRegionClosedJUnitTest.java  |   17 +-
 .../PRQueryRegionDestroyedJUnitTest.java           |  109 +-
 .../query/transaction/QueryAndJtaJUnitTest.java    |   14 +-
 .../cache/snapshot/CacheSnapshotJUnitTest.java     |    4 +-
 .../cache/snapshot/RegionSnapshotJUnitTest.java    |   12 +-
 .../AnalyzeCoreSerializablesIntegrationTest.java   |   37 +
 .../AnalyzeCoreSerializablesJUnitTest.java         |   28 -
 .../RestrictUseOfInetAddressJUnitTest.java         |    2 +-
 .../LauncherMemberMXBeanIntegrationTest.java       |    2 +-
 .../geode/distributed/LocatorIntegrationTest.java  |  180 +-
 ...catorLauncherJmxManagerLocalRegressionTest.java |   22 +-
 .../LocatorLauncherLocalIntegrationTest.java       |    2 +-
 .../LocatorLauncherRemoteIntegrationTest.java      |    2 +-
 .../LocatorLauncherRemoteIntegrationTestCase.java  |   12 +-
 .../ServerLauncherLocalIntegrationTest.java        |    2 +-
 .../ServerLauncherRemoteIntegrationTest.java       |    2 +-
 .../ServerLauncherRemoteIntegrationTestCase.java   |   12 +-
 .../DefaultPropertiesGeneratorIntegrationTest.java |   40 +-
 .../DistributionAdvisorIntegrationTest.java        |   11 +-
 .../InternalDistributedSystemJUnitTest.java        |   25 +-
 .../LocatorLoadSnapshotIntegrationTest.java        |    5 +-
 .../deadlock/DeadlockDetectorIntegrationTest.java  |    2 +-
 .../locks/DLockReentrantLockJUnitTest.java         |    2 +-
 .../internal/membership/MembershipJUnitTest.java   |   14 +-
 .../api/CoreOnlyUsesMembershipAPIArchUnitTest.java |    8 +-
 .../tcpserver/TCPClientSSLIntegrationTest.java     |   12 +-
 .../internal/tcpserver/TCPServerSSLJUnitTest.java  |    4 +-
 .../org/apache/geode/disttx/DistTXJUnitTest.java   |   14 +-
 .../apache/geode/disttx/DistTXWriterJUnitTest.java |    8 +-
 .../geode/disttx/DistTXWriterOOMEJUnitTest.java    |    8 +-
 .../org/apache/geode/disttx/PRDistTXJUnitTest.java |   14 +-
 .../AvailablePortHelperIntegrationTest.java        |   53 +-
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../apache/geode/internal/InlineKeyJUnitTest.java  |    4 +-
 .../geode/internal/PdxDeleteFieldJUnitTest.java    |   17 +-
 .../apache/geode/internal/PdxRenameJUnitTest.java  |   10 +-
 .../apache/geode/internal/SSLConfigJUnitTest.java  |    2 +-
 ...edThreadPoolExecutorWithKeepAliveJUnitTest.java |  157 +-
 .../CacheDistributionAdvisorConcurrentTest.java    |    4 +-
 .../cache/CacheLifecycleListenerJUnitTest.java     |   12 +-
 ...tMessagesRegionCreationAndDestroyJUnitTest.java |    4 +-
 .../ClusterConfigurationLoaderIntegrationTest.java |    2 +-
 .../cache/CompactOfflineDiskStoreJUnitTest.java    |    2 +-
 .../internal/cache/ComplexDiskRegionJUnitTest.java |    2 +-
 ...urrentFlushingAndRegionOperationsJUnitTest.java |    2 +-
 .../cache/ConcurrentMapLocalJUnitTest.java         |   18 +-
 .../cache/ConcurrentRegionOperationsJUnitTest.java |  145 +-
 ...currentRollingAndRegionOperationsJUnitTest.java |   54 +-
 .../geode/internal/cache/ConflationJUnitTest.java  |   40 +-
 .../geode/internal/cache/DiskIFJUnitTest.java      |    8 +-
 .../internal/cache/DiskInitFileJUnitTest.java      |   72 +
 .../cache/DiskLruRegRecoveryJUnitTest.java         |   10 +-
 .../geode/internal/cache/DiskOldAPIsJUnitTest.java |   12 +-
 .../DiskRandomOperationsAndRecoveryJUnitTest.java  |   75 +-
 .../internal/cache/DiskRegCacheXmlJUnitTest.java   |   37 +-
 .../cache/DiskRegCachexmlGeneratorJUnitTest.java   |    4 +-
 .../DiskRegOplogSwtchingAndRollerJUnitTest.java    |   76 +-
 .../internal/cache/DiskRegRecoveryJUnitTest.java   |  232 +-
 .../cache/DiskRegionAsyncRecoveryJUnitTest.java    |    8 +-
 ...iskRegionChangingRegionAttributesJUnitTest.java |    4 +-
 .../internal/cache/DiskRegionClearJUnitTest.java   |   17 +-
 ...ctorClearOplogAfterRecoveryIntegrationTest.java |  182 ++
 .../DiskRegionIllegalArguementsJUnitTest.java      |   26 +-
 .../cache/DiskStoreFactoryIntegrationTest.java     |    8 +-
 .../cache/DiskStoreImplIntegrationTest.java        |   17 +
 .../geode/internal/cache/FaultingInJUnitTest.java  |   24 +-
 .../LIFOEvictionAlgoEnabledRegionJUnitTest.java    |   68 +-
 ...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java |   52 +-
 .../internal/cache/MapInterface2JUnitTest.java     |   38 +-
 .../internal/cache/MapInterfaceJUnitTest.java      |   52 +-
 .../MultipleOplogsRollingFeatureJUnitTest.java     |   16 +-
 .../internal/cache/OfflineSnapshotJUnitTest.java   |   11 +-
 .../geode/internal/cache/OplogFlushTest.java       |    2 +-
 .../geode/internal/cache/OplogJUnitTest.java       |   36 +-
 .../geode/internal/cache/OplogRVVJUnitTest.java    |    2 +
 .../internal/cache/OverflowOplogFlushTest.java     |    2 +-
 .../internal/cache/PRDataStoreMemoryJUnitTest.java |   34 +-
 .../apache/geode/internal/cache/PRTXJUnitTest.java |   16 +-
 .../cache/PartitionedRegionCreationJUnitTest.java  |   36 +-
 .../cache/PartitionedRegionDataStoreJUnitTest.java |   22 +-
 ...itionedRegionQueryEvaluatorIntegrationTest.java |   21 +-
 ...rtitionedRegionSerializableObjectJUnitTest.java |   22 +-
 ...itionedRegionSingleNodeOperationsJUnitTest.java |  254 +-
 .../cache/PartitionedRegionStatsJUnitTest.java     |   14 +-
 .../PersistentPartitionedRegionJUnitTest.java      |    6 +-
 .../internal/cache/PoolManagerIntegrationTest.java |  195 ++
 .../cache/ReplaceWithOverflowJUnitTest.java        |    2 +-
 .../internal/cache/SimpleDiskRegionJUnitTest.java  |   34 +-
 .../cache/TXDetectReadConflictJUnitTest.java       |   18 +-
 .../internal/cache/TXManagerImplJUnitTest.java     |  162 +-
 .../internal/cache/TXReservationMgrJUnitTest.java  |   47 +-
 .../internal/cache/TombstoneCreationJUnitTest.java |    4 +-
 .../internal/cache/UpdateVersionJUnitTest.java     |   10 +-
 .../cache/backup/BackupIntegrationTest.java        |    2 +-
 .../cache/backup/FileSystemBackupWriterTest.java   |    4 +-
 .../backup/IncrementalBackupIntegrationTest.java   |    4 +-
 .../cache/control/MemoryMonitorJUnitTest.java      |   38 +-
 .../control/MemoryMonitorOffHeapJUnitTest.java     |   26 +-
 .../DiskRegOverflowAsyncGetInMemPerfJUnitTest.java |    8 +-
 .../DiskRegOverflowAsyncJUnitPerformanceTest.java  |   10 +-
 ...erflowSyncGetInMemPerfJUnitPerformanceTest.java |    8 +-
 .../DiskRegOverflowSyncJUnitPerformanceTest.java   |   12 +-
 ...skRegionOverflowAsyncRollingOpLogJUnitTest.java |    8 +-
 ...iskRegionOverflowSyncRollingOpLogJUnitTest.java |    4 +-
 .../DiskRegionPersistOnlySyncJUnitTest.java        |    6 +-
 .../DiskRegionRollOpLogJUnitPerformanceTest.java   |    8 +-
 .../MultiThreadedOplogPerJUnitPerformanceTest.java |   10 +-
 .../DistributedEventTrackerIntegrationTest.java    |    4 +-
 .../cache/eviction/EvictionIntegrationTest.java    |    3 +-
 .../ha/BlockingHARQAddOperationJUnitTest.java      |   12 +-
 .../cache/ha/BlockingHARegionJUnitTest.java        |  177 +-
 .../cache/ha/BlockingHARegionQueueJUnitTest.java   |    6 +-
 .../cache/ha/HARQAddOperationJUnitTest.java        |   97 +-
 .../geode/internal/cache/ha/HARegionJUnitTest.java |    2 +-
 .../cache/ha/HARegionQueueIntegrationTest.java     |   10 +-
 .../internal/cache/ha/HARegionQueueJUnitTest.java  |   16 +-
 .../cache/ha/HARegionQueueStartStopJUnitTest.java  |    6 +-
 .../DestroyEntryDuringCloseIntegrationTest.java    |    4 +-
 .../DefaultDiskDirsIntegrationTest.java            |    4 +-
 .../cache/tier/sockets/CacheClientProxyTest.java   |   83 +-
 .../CacheServerMaxConnectionsJUnitTest.java        |   26 +-
 .../ClientHealthMonitorIntegrationTest.java        |   30 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java     |   36 +-
 .../sockets/CqNameToOpHashMapIntegrationTest.java  |    2 +-
 .../sockets/FilterProfileIntegrationJUnitTest.java |   17 +-
 .../sockets/ServerConnectionIntegrationTest.java   |    2 +-
 .../RegionVersionVectorIntegrationTest.java        |    2 +-
 ...GatewaySenderEventProcessorIntegrationTest.java |    8 +-
 .../AsyncEventQueueValidationsJUnitTest.java       |   11 +-
 ...elGatewaySenderFlushedCoordinatorJUnitTest.java |   24 +-
 .../cache/xmlcache/CacheXmlParserJUnitTest.java    |    4 +-
 .../classloader/ClassPathLoaderDeployTest.java     |    4 +-
 .../ClassPathLoaderIntegrationTest.java            |   86 +-
 .../classloader/ClassPathLoaderJUnitTest.java      |    4 +-
 .../datasource/ConnectionPoolingJUnitTest.java     |   15 +-
 ...emFireTransactionDataSourceIntegrationTest.java |    4 +-
 ...hChildrenRollingFileHandlerIntegrationTest.java |   44 +-
 .../internal/jta/BlockingTimeOutJUnitTest.java     |    4 +-
 .../geode/internal/jta/DataSourceJTAJUnitTest.java |    1 -
 .../internal/jta/SetOperationJTAJUnitTest.java     |   33 +-
 .../internal/jta/TransactionTimeOutJUnitTest.java  |   12 +-
 ...TransactionTimeoutExceptionIntegrationTest.java |    6 +-
 .../internal/jta/functional/CacheJUnitTest.java    |  232 +-
 .../net/ClientSocketFactoryIntegrationTest.java    |    6 +-
 .../internal/net/SSLSocketIntegrationTest.java     |   64 +-
 .../internal/net/SocketCloserIntegrationTest.java  |   26 +-
 .../internal/net/SocketCreatorFailHandshake.java   |    4 +-
 .../geode/internal/offheap/InlineKeyJUnitTest.java |    4 +-
 .../MemoryAllocatorFillPatternIntegrationTest.java |   42 +-
 .../internal/offheap/OffHeapIndexJUnitTest.java    |   12 +-
 .../geode/internal/offheap/OffHeapRegionBase.java  |   77 +-
 .../offheap/OffHeapValidationJUnitTest.java        |   49 +-
 .../FileProcessControllerIntegrationTest.java      |    2 +-
 ...SecurityServiceFactoryShiroIntegrationTest.java |    4 +-
 ...cherGlobalSerialFilterBlankIntegrationTest.java |   55 +
 ...herGlobalSerialFilterExistsIntegrationTest.java |   55 +
 ...rLauncherGlobalSerialFilterIntegrationTest.java |   52 +
 ...alSerialFilterPropertyBlankIntegrationTest.java |   54 +
 ...alSerialFilterPropertyEmptyIntegrationTest.java |   54 +
 ...atorLauncherJmxSerialFilterIntegrationTest.java |   84 +
 ...mxSerialFilterPropertyBlankIntegrationTest.java |   88 +
 ...mxSerialFilterPropertyEmptyIntegrationTest.java |   88 +
 ...xSerialFilterPropertyExistsIntegrationTest.java |   90 +
 .../filter/LocatorLauncherWithJmxManager.java      |   82 +
 .../filter/SerialFilterAssertions.java             |   58 +
 ...cherGlobalSerialFilterBlankIntegrationTest.java |   55 +
 ...herGlobalSerialFilterExistsIntegrationTest.java |   55 +
 ...rLauncherGlobalSerialFilterIntegrationTest.java |   51 +
 ...alSerialFilterPropertyBlankIntegrationTest.java |   53 +
 ...alSerialFilterPropertyEmptyIntegrationTest.java |   53 +
 ...rverLauncherJmxSerialFilterIntegrationTest.java |   87 +
 ...mxSerialFilterPropertyBlankIntegrationTest.java |   88 +
 ...mxSerialFilterPropertyEmptyIntegrationTest.java |   88 +
 ...xSerialFilterPropertyExistsIntegrationTest.java |   90 +
 .../filter/ServerLauncherWithJmxManager.java       |   77 +
 ...DistributedSystemStatisticsIntegrationTest.java |  125 +-
 ...ributedSystemStatisticsTypeIntegrationTest.java |   12 +-
 .../statistics/FileSizeLimitIntegrationTest.java   |   67 +-
 .../GemFireStatSamplerIntegrationTest.java         |    1 -
 .../internal/statistics/LinuxSystemStatsTest.java  |    8 +-
 .../SimpleStatSamplerIntegrationTest.java          |   50 +-
 .../StatArchiveHandlerIntegrationTest.java         |  104 +-
 ...rchiveWithConsecutiveResourceInstGenerator.java |   49 +-
 ...veWithConsecutiveResourceInstGeneratorTest.java |    8 +-
 ...WithConsecutiveResourceInstIntegrationTest.java |   19 +-
 .../StatArchiveWriterReaderIntegrationTest.java    |  220 +-
 .../statistics/StatSamplerIntegrationTest.java     |   26 +-
 .../StatTypesAreRolledOverRegressionTest.java      |   52 +-
 .../internal/stats50/AtomicStatsJUnitTest.java     |    2 +-
 .../internal/util/ProductVersionUtilTest.java      |   87 +
 .../ConcurrentHashMapIteratorJUnitTest.java        |    8 +-
 .../concurrent/CopyOnWriteHashMapJUnitTest.java    |    8 +-
 .../concurrent/cm/ConcurrentHashMapJUnitTest.java  |   50 +-
 .../concurrent/cm/CountedMapLoopsJUnitTest.java    |    2 +-
 .../util/concurrent/cm/IntMapCheckJUnitTest.java   |   31 +-
 .../util/concurrent/cm/MapCheckJUnitTest.java      |   29 +-
 .../util/concurrent/cm/MapLoopsJUnitTest.java      |    2 +-
 .../util/concurrent/cm/RLJBarJUnitTest.java        |    8 +-
 .../redaction/ArgumentRedactorIntegrationTest.java |   52 +
 .../bean/stats/AsyncEventQueueStatsJUnitTest.java  |    2 +-
 .../management/bean/stats/DiskStatsJUnitTest.java  |    2 +-
 .../stats/DistributedSystemStatsJUnitTest.java     |   16 +-
 .../bean/stats/GatewayMBeanBridgeJUnitTest.java    |    2 +-
 ...erConfiguresJmxSerialFilterIntegrationTest.java |  204 --
 .../internal/ManagementAgentIntegrationTest.java   |  150 +
 ...erConfiguresJmxSerialFilterIntegrationTest.java |  201 --
 .../internal/beans/ManagementAdapterTest.java      |    4 +-
 .../internal/configuration/ZipUtilsJUnitTest.java  |   14 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java         |   22 +-
 .../internal/deployment/FunctionScannerTest.java   |    2 +-
 .../internal/security/CliCommandsSecurityTest.java |    2 +-
 .../security/DeployCommandsSecurityTest.java       |    2 +-
 .../security/GatewayReceiverMBeanSecurityTest.java |    2 +-
 .../security/GatewaySenderMBeanSecurityTest.java   |    2 +-
 .../internal/security/JmxCredentialTypeTest.java   |    2 +-
 .../LockServiceMBeanAuthorizationJUnitTest.java    |    2 +-
 ...urityServiceWithCustomRealmIntegrationTest.java |    8 +-
 ...SecurityServiceWithShiroIniIntegrationTest.java |   72 +-
 .../SecurityWithExpirationIntegrationTest.java     |   79 +
 .../ReadOpFileAccessControllerJUnitTest.java       |   17 +-
 ...SSLSocketParameterExtensionIntegrationTest.java |   44 +-
 .../geode/pdx/AutoSerializableJUnitTest.java       |  110 +-
 .../org/apache/geode/pdx/ByteSourceJUnitTest.java  |   64 +-
 .../geode/pdx/JSONFormatterBasicJUnitTest.java     |    4 +-
 .../apache/geode/pdx/JSONFormatterJUnitTest.java   |    4 +-
 .../geode/pdx/PdxInstanceFactoryJUnitTest.java     |  143 +-
 .../apache/geode/pdx/PdxSerializableJUnitTest.java |  345 ++-
 .../org/apache/geode/pdx/PdxStringJUnitTest.java   |   10 +-
 .../geode/pdx/internal/MultipleCacheJUnitTest.java |    2 +-
 .../CacheFactoryWithSecurityObjectTest.java        |   52 +-
 .../geode/security/ExampleSecurityManagerTest.java |   34 +-
 .../test/process/ProcessWrapperJUnitTest.java      |   16 +-
 ....apache.geode.internal.version.ComponentVersion |   16 +
 ...ache.geode.internal.version.DistributionVersion |   16 +
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    3 +
 .../codeAnalysis/sanctionedDataSerializables.txt   |  131 +-
 .../geode/internal/logging/dir1/systemlog.txt      |    2 +-
 .../geode/internal/logging/dir2/systemlog.txt      |    2 +-
 geode-core/src/integrationTest/resources/shiro.ini |   40 +
 .../geode/internal/ra/GFConnectionFactoryImpl.java |    4 +-
 .../apache/geode/internal/ra/GFConnectionImpl.java |    8 +-
 .../geode/internal/ra/spi/JCALocalTransaction.java |   70 +-
 .../internal/ra/spi/JCAManagedConnection.java      |   84 +-
 .../ra/spi/JCAManagedConnectionFactory.java        |   22 +-
 .../ra/spi/JCAManagedConnectionMetaData.java       |    6 +-
 .../EvictionWithPartiallyMarkedListsBenchmark.java |    2 +-
 .../rebalance/RebalanceModelBuilder.java           |   14 +-
 .../ConcurrentHashMapObjectBenchmark.java          |  375 +++
 .../util/concurrent/MpmcFifoQueueBenchmark.java    |  275 ++
 .../util/concurrent/MpmcLifoQueueBenchmark.java    |  300 ++
 .../internal/util/concurrent/MpmcMapBenchmark.java |  196 ++
 .../util/concurrent/MpmcMapLongBenchmark.java      |  179 ++
 .../util/concurrent/SpmcFifoQueueBenchmark.java    |  338 +++
 .../src/main/java/org/apache/geode/CopyHelper.java |   12 +-
 .../main/java/org/apache/geode/DataSerializer.java |    6 +-
 .../org/apache/geode/GemFireCheckedException.java  |    8 +-
 .../java/org/apache/geode/GemFireException.java    |    4 +-
 .../main/java/org/apache/geode/Instantiator.java   |   16 +-
 .../java/org/apache/geode/admin/AdminConfig.java   |    8 +-
 .../java/org/apache/geode/admin/AlertLevel.java    |   23 +-
 .../java/org/apache/geode/admin/GemFireHealth.java |   12 +-
 .../apache/geode/admin/GemFireMemberStatus.java    |  213 +-
 .../geode/admin/RegionSubRegionSnapshot.java       |   41 +-
 .../org/apache/geode/admin/SystemMemberType.java   |   17 +-
 .../admin/internal/AbstractHealthEvaluator.java    |   16 +-
 .../admin/internal/AdminDistributedSystemImpl.java |  467 ++-
 .../geode/admin/internal/BackupStatusImpl.java     |    2 +-
 .../admin/internal/CacheHealthConfigImpl.java      |    8 +-
 .../geode/admin/internal/CacheHealthEvaluator.java |   60 +-
 .../admin/internal/CacheServerConfigImpl.java      |   35 +-
 .../geode/admin/internal/CacheServerImpl.java      |   50 +-
 .../admin/internal/ConfigurationParameterImpl.java |   56 +-
 .../internal/DistributedSystemConfigImpl.java      |  279 +-
 .../DistributedSystemHealthConfigImpl.java         |    2 +-
 .../internal/DistributedSystemHealthEvaluator.java |   24 +-
 .../internal/DistributedSystemHealthMonitor.java   |   59 +-
 .../internal/DistributionLocatorConfigImpl.java    |   36 +-
 .../admin/internal/DistributionLocatorImpl.java    |   91 +-
 .../internal/EnabledManagedEntityController.java   |   13 +-
 .../admin/internal/GemFireHealthConfigImpl.java    |   10 +-
 .../admin/internal/GemFireHealthEvaluator.java     |   53 +-
 .../geode/admin/internal/GemFireHealthImpl.java    |  180 +-
 .../apache/geode/admin/internal/LogCollator.java   |   15 +-
 .../admin/internal/ManagedEntityConfigImpl.java    |   76 +-
 .../admin/internal/ManagedEntityConfigXml.java     |    8 +-
 .../internal/ManagedEntityConfigXmlGenerator.java  |   32 +-
 .../internal/ManagedEntityConfigXmlParser.java     |   26 +-
 .../admin/internal/ManagedSystemMemberImpl.java    |   68 +-
 .../admin/internal/MemberHealthConfigImpl.java     |   12 +-
 .../admin/internal/MemberHealthEvaluator.java      |   24 +-
 .../apache/geode/admin/internal/StatisticImpl.java |   10 +-
 .../admin/internal/StatisticResourceImpl.java      |   44 +-
 .../internal/SystemMemberBridgeServerImpl.java     |   72 +-
 .../admin/internal/SystemMemberCacheEventImpl.java |    6 +-
 .../internal/SystemMemberCacheEventProcessor.java  |   34 +-
 .../admin/internal/SystemMemberCacheImpl.java      |   89 +-
 .../geode/admin/internal/SystemMemberImpl.java     |   84 +-
 .../internal/SystemMemberRegionEventImpl.java      |    4 +-
 .../admin/internal/SystemMemberRegionImpl.java     |  136 +-
 .../admin/internal/SystemMembershipEventImpl.java  |    8 +-
 .../internal/AdminDistributedSystemJmxImpl.java    |  187 +-
 .../geode/admin/jmx/internal/AgentConfigImpl.java  |  285 +-
 .../apache/geode/admin/jmx/internal/AgentImpl.java |  294 +-
 .../geode/admin/jmx/internal/AgentLauncher.java    |   63 +-
 .../admin/jmx/internal/CacheServerJmxImpl.java     |   85 +-
 .../admin/jmx/internal/ConfigAttributeInfo.java    |   22 +-
 .../internal/ConfigurationParameterJmxImpl.java    |   14 +-
 .../DistributedSystemHealthConfigJmxImpl.java      |   22 +-
 .../jmx/internal/DistributionLocatorJmxImpl.java   |   38 +-
 .../admin/jmx/internal/DynamicManagedBean.java     |   50 +-
 .../jmx/internal/GemFireHealthConfigJmxImpl.java   |   36 +-
 .../admin/jmx/internal/GemFireHealthJmxImpl.java   |   18 +-
 .../admin/jmx/internal/GenerateMBeanHTML.java      |   38 +-
 .../geode/admin/jmx/internal/MBeanUtils.java       |   77 +-
 .../geode/admin/jmx/internal/MX4JModelMBean.java   |   53 +-
 .../jmx/internal/MX4JServerSocketFactory.java      |    8 +-
 .../geode/admin/jmx/internal/MailManager.java      |   62 +-
 .../admin/jmx/internal/ManagedResourceType.java    |   30 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java     |  141 +-
 .../admin/jmx/internal/RMIRegistryService.java     |    4 +-
 .../jmx/internal/RefreshNotificationType.java      |   18 +-
 .../admin/jmx/internal/StatAlertNotification.java  |   40 +-
 .../admin/jmx/internal/StatisticAttributeInfo.java |   22 +-
 .../jmx/internal/StatisticResourceJmxImpl.java     |   62 +-
 .../internal/SystemMemberBridgeServerJmxImpl.java  |   22 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java     |   52 +-
 .../geode/admin/jmx/internal/SystemMemberJmx.java  |    8 +-
 .../admin/jmx/internal/SystemMemberJmxImpl.java    |   57 +-
 .../jmx/internal/SystemMemberRegionJmxImpl.java    |   26 +-
 .../org/apache/geode/cache/AttributesFactory.java  |  473 ++-
 .../java/org/apache/geode/cache/CacheCallback.java |    2 +-
 .../org/apache/geode/cache/CacheException.java     |    4 +-
 .../apache/geode/cache/CacheExistsException.java   |    2 +-
 .../apache/geode/cache/CacheRuntimeException.java  |    4 +-
 .../geode/cache/CacheTransactionManager.java       |    4 +-
 .../geode/cache/CommitDistributionException.java   |    2 +-
 .../java/org/apache/geode/cache/DataPolicy.java    |   78 +-
 .../java/org/apache/geode/cache/Declarable.java    |    4 +-
 .../apache/geode/cache/DiskAccessException.java    |    4 +-
 .../org/apache/geode/cache/DiskStoreFactory.java   |    2 +-
 .../geode/cache/DiskWriteAttributesFactory.java    |   42 +-
 .../apache/geode/cache/DynamicRegionFactory.java   |  122 +-
 .../apache/geode/cache/EntryExistsException.java   |    2 +-
 .../org/apache/geode/cache/EvictionAlgorithm.java  |    2 +-
 .../org/apache/geode/cache/EvictionAttributes.java |   26 +-
 .../org/apache/geode/cache/ExpirationAction.java   |    4 +-
 .../apache/geode/cache/ExpirationAttributes.java   |   40 +-
 .../org/apache/geode/cache/InterestPolicy.java     |    2 +-
 .../apache/geode/cache/InterestResultPolicy.java   |    4 +-
 .../java/org/apache/geode/cache/LossAction.java    |    8 +-
 .../org/apache/geode/cache/LowMemoryException.java |    6 +-
 .../apache/geode/cache/MembershipAttributes.java   |   68 +-
 .../java/org/apache/geode/cache/MirrorType.java    |    4 +-
 .../java/org/apache/geode/cache/Operation.java     |   58 +-
 .../geode/cache/PartitionAttributesFactory.java    |   34 +-
 .../main/java/org/apache/geode/cache/Region.java   |    2 +-
 .../apache/geode/cache/RegionAccessException.java  |   15 +-
 .../geode/cache/RegionDistributionException.java   |   15 +-
 .../apache/geode/cache/RegionExistsException.java  |    8 +-
 .../java/org/apache/geode/cache/RegionFactory.java |   96 +-
 .../apache/geode/cache/RegionRoleException.java    |    4 +-
 .../org/apache/geode/cache/ResumptionAction.java   |    8 +-
 .../main/java/org/apache/geode/cache/Scope.java    |   12 +-
 .../apache/geode/cache/SubscriptionAttributes.java |   24 +-
 .../asyncqueue/internal/AsyncEventQueueImpl.java   |   14 +-
 .../internal/ParallelAsyncEventQueueImpl.java      |   49 +-
 .../internal/SerialAsyncEventQueueImpl.java        |   60 +-
 .../geode/cache/client/internal/AbstractOp.java    |   70 +-
 .../geode/cache/client/internal/AddPDXEnumOp.java  |    6 +-
 .../geode/cache/client/internal/AddPDXTypeOp.java  |    4 +-
 .../cache/client/internal/AuthenticateUserOp.java  |  169 +-
 .../client/internal/AutoConnectionSourceImpl.java  |   62 +-
 .../client/internal/CacheServerLoadMessage.java    |   10 +-
 .../geode/cache/client/internal/ClearOp.java       |    4 +-
 .../client/internal/ClientMetadataService.java     |  143 +-
 .../client/internal/ClientPartitionAdvisor.java    |   79 +-
 .../client/internal/ClientRegionFactoryImpl.java   |   60 +-
 .../client/internal/ClientSideHandshakeImpl.java   |    9 +-
 .../cache/client/internal/CloseConnectionOp.java   |    4 +-
 .../geode/cache/client/internal/CommitOp.java      |   10 +-
 .../client/internal/ConnectionFactoryImpl.java     |   50 +-
 .../cache/client/internal/ConnectionStats.java     |  652 ++--
 .../geode/cache/client/internal/ContainsKeyOp.java |   12 +-
 .../geode/cache/client/internal/DestroyOp.java     |   22 +-
 .../cache/client/internal/DestroyRegionOp.java     |    4 +-
 .../geode/cache/client/internal/Endpoint.java      |   12 +-
 .../cache/client/internal/EndpointManagerImpl.java |   35 +-
 .../client/internal/ExecuteFunctionNoAckOp.java    |   18 +-
 .../cache/client/internal/ExecuteFunctionOp.java   |   23 +-
 .../internal/ExecuteRegionFunctionNoAckOp.java     |   11 +-
 .../client/internal/ExecuteRegionFunctionOp.java   |    5 +-
 .../internal/ExecuteRegionFunctionSingleHopOp.java |   11 +-
 .../internal/ExplicitConnectionSourceImpl.java     |    4 +-
 .../geode/cache/client/internal/GetAllOp.java      |   49 +-
 .../client/internal/GetClientPRMetaDataOp.java     |    5 +-
 .../internal/GetClientPartitionAttributesOp.java   |    6 +-
 .../geode/cache/client/internal/GetEntryOp.java    |    8 +-
 .../cache/client/internal/GetEventValueOp.java     |    4 +-
 .../client/internal/GetFunctionAttributeOp.java    |    4 +-
 .../apache/geode/cache/client/internal/GetOp.java  |   24 +-
 .../cache/client/internal/GetPDXEnumByIdOp.java    |    4 +-
 .../geode/cache/client/internal/GetPDXEnumsOp.java |    6 +-
 .../cache/client/internal/GetPDXIdForEnumOp.java   |    8 +-
 .../cache/client/internal/GetPDXIdForTypeOp.java   |    8 +-
 .../cache/client/internal/GetPDXTypeByIdOp.java    |    4 +-
 .../geode/cache/client/internal/GetPDXTypesOp.java |    6 +-
 .../geode/cache/client/internal/InvalidateOp.java  |   14 +-
 .../geode/cache/client/internal/KeySetOp.java      |    6 +-
 .../cache/client/internal/LiveServerPinger.java    |    2 +-
 .../geode/cache/client/internal/MakePrimaryOp.java |    4 +-
 .../cache/client/internal/OpExecutorImpl.java      |  394 +--
 .../apache/geode/cache/client/internal/PingOp.java |    4 +-
 .../geode/cache/client/internal/PoolImpl.java      |   16 +-
 .../geode/cache/client/internal/PrimaryAckOp.java  |    9 +-
 .../geode/cache/client/internal/ProxyCache.java    |   56 +-
 .../cache/client/internal/ProxyCacheCloseOp.java   |    4 +-
 .../geode/cache/client/internal/ProxyRegion.java   |  110 +-
 .../geode/cache/client/internal/PutAllOp.java      |   97 +-
 .../apache/geode/cache/client/internal/PutOp.java  |   24 +-
 .../geode/cache/client/internal/QueryOp.java       |   37 +-
 .../cache/client/internal/QueueConnectionImpl.java |   26 +-
 .../cache/client/internal/QueueManagerImpl.java    |   80 +-
 .../cache/client/internal/QueueStateImpl.java      |   79 +-
 .../cache/client/internal/ReadyForEventsOp.java    |    4 +-
 .../client/internal/RegisterDataSerializersOp.java |   17 +-
 .../client/internal/RegisterInstantiatorsOp.java   |    7 +-
 .../client/internal/RegisterInterestListOp.java    |   44 +-
 .../cache/client/internal/RegisterInterestOp.java  |   61 +-
 .../client/internal/RegisterInterestTracker.java   |   89 +-
 .../geode/cache/client/internal/RemoveAllOp.java   |   91 +-
 .../geode/cache/client/internal/RollbackOp.java    |    8 +-
 .../cache/client/internal/ServerDenyList.java      |    2 +-
 .../geode/cache/client/internal/ServerProxy.java   |    6 +-
 .../client/internal/ServerRegionDataAccess.java    |    8 +-
 .../cache/client/internal/ServerRegionProxy.java   |  113 +-
 .../internal/SingleHopOperationCallable.java       |   13 +-
 .../apache/geode/cache/client/internal/SizeOp.java |    4 +-
 .../geode/cache/client/internal/TXFailoverOp.java  |    6 +-
 .../cache/client/internal/TXSynchronizationOp.java |   18 +-
 .../client/internal/UnregisterInterestListOp.java  |    9 +-
 .../client/internal/UnregisterInterestOp.java      |   12 +-
 .../cache/client/internal/UserAttributes.java      |   24 +-
 .../internal/locator/ClientConnectionRequest.java  |    4 +-
 .../internal/locator/ClientConnectionResponse.java |    8 +-
 .../internal/locator/ClientReplacementRequest.java |    8 +-
 .../internal/locator/GetAllServersResponse.java    |   10 +-
 .../internal/locator/LocatorListResponse.java      |   18 +-
 .../internal/locator/LocatorStatusResponse.java    |   79 +-
 .../internal/locator/QueueConnectionRequest.java   |   10 +-
 .../internal/locator/QueueConnectionResponse.java  |    8 +-
 .../pooling/AvailableConnectionManager.java        |    4 +-
 .../internal/pooling/ConnectionAccounting.java     |    4 +-
 .../internal/pooling/ConnectionManagerImpl.java    |   15 +-
 .../client/internal/pooling/PooledConnection.java  |   72 +-
 .../cache/client/proxy/SniProxySocketFactory.java  |    4 +-
 .../geode/cache/configuration/CacheConfig.java     |  212 +-
 .../configuration/CacheTransactionManagerType.java |    6 +-
 .../geode/cache/configuration/ClassNameType.java   |    2 +-
 .../geode/cache/configuration/DeclarableType.java  |    4 +-
 .../geode/cache/configuration/DiskDirType.java     |    4 +-
 .../geode/cache/configuration/DiskDirsType.java    |    2 +-
 .../geode/cache/configuration/DiskStoreType.java   |   20 +-
 .../configuration/DynamicRegionFactoryType.java    |    8 +-
 .../cache/configuration/FunctionServiceType.java   |    4 +-
 .../cache/configuration/GatewayReceiverConfig.java |   18 +-
 .../cache/configuration/JndiBindingsType.java      |   56 +-
 .../geode/cache/configuration/ObjectType.java      |    2 +-
 .../geode/cache/configuration/ParameterType.java   |    6 +-
 .../apache/geode/cache/configuration/PdxType.java  |   10 +-
 .../configuration/RegionAttributesDataPolicy.java  |    4 +-
 .../cache/configuration/RegionAttributesType.java  |  164 +-
 .../geode/cache/configuration/RegionConfig.java    |   40 +-
 .../cache/configuration/ResourceManagerType.java   |    8 +-
 .../SerializationRegistrationType.java             |   14 +-
 .../geode/cache/configuration/ServerType.java      |   38 +-
 .../geode/cache/execute/FunctionException.java     |    6 +-
 .../execute/FunctionInvocationTargetException.java |    2 +-
 .../internal/execute/FunctionToFileTracker.java    |   20 +-
 .../operations/ExecuteCQOperationContext.java      |    4 +-
 .../ExecuteFunctionOperationContext.java           |   30 +-
 .../cache/operations/InterestOperationContext.java |    6 +-
 .../geode/cache/operations/InterestType.java       |   14 +-
 .../cache/operations/KeyOperationContext.java      |   16 +-
 .../cache/operations/KeySetOperationContext.java   |    6 +-
 .../cache/operations/KeyValueOperationContext.java |    8 +-
 .../cache/operations/PutAllOperationContext.java   |    8 +-
 .../cache/operations/PutOperationContext.java      |    8 +-
 .../cache/operations/QueryOperationContext.java    |   17 +-
 .../operations/RegionCreateOperationContext.java   |    4 +-
 .../cache/operations/RegionOperationContext.java   |    8 +-
 .../RegisterInterestOperationContext.java          |    4 +-
 .../operations/RemoveAllOperationContext.java      |   10 +-
 .../internal/GetOperationContextImpl.java          |    8 +-
 .../cache/operations/internal/UpdateOnlyMap.java   |   29 +-
 .../cache/partition/PartitionRegionHelper.java     |    6 +-
 .../persistence/PartitionOfflineException.java     |    4 +-
 .../geode/cache/query/CqAttributesFactory.java     |    8 +-
 .../org/apache/geode/cache/query/IndexType.java    |    2 +-
 .../cache/query/MultiIndexCreationException.java   |    6 +-
 .../query/internal/AbstractCompiledValue.java      |   29 +-
 .../internal/AbstractGroupOrRangeJunction.java     |   99 +-
 .../cache/query/internal/AllGroupJunction.java     |   22 +-
 .../cache/query/internal/AttributeDescriptor.java  |    2 +-
 .../org/apache/geode/cache/query/internal/Bag.java |  249 +-
 .../query/internal/CompiledAggregateFunction.java  |   33 +-
 .../cache/query/internal/CompiledArithmetic.java   |    7 +-
 .../cache/query/internal/CompiledBindArgument.java |   13 +-
 .../cache/query/internal/CompiledComparison.java   |   76 +-
 .../cache/query/internal/CompiledConstruction.java |   20 +-
 .../cache/query/internal/CompiledFunction.java     |   31 +-
 .../query/internal/CompiledGroupBySelect.java      |  144 +-
 .../geode/cache/query/internal/CompiledID.java     |    8 +-
 .../geode/cache/query/internal/CompiledIn.java     |  149 +-
 .../query/internal/CompiledIndexOperation.java     |   37 +-
 .../cache/query/internal/CompiledIteratorDef.java  |   34 +-
 .../cache/query/internal/CompiledJunction.java     |  149 +-
 .../geode/cache/query/internal/CompiledLike.java   |   38 +-
 .../cache/query/internal/CompiledLiteral.java      |    4 +-
 .../cache/query/internal/CompiledNegation.java     |   13 +-
 .../cache/query/internal/CompiledOperation.java    |   70 +-
 .../geode/cache/query/internal/CompiledPath.java   |   18 +-
 .../geode/cache/query/internal/CompiledRegion.java |   14 +-
 .../geode/cache/query/internal/CompiledSelect.java |  336 +--
 .../query/internal/CompiledSortCriterion.java      |   42 +-
 .../cache/query/internal/CompiledUnaryMinus.java   |   21 +-
 .../cache/query/internal/CompiledUndefined.java    |   29 +-
 .../geode/cache/query/internal/CompiledValue.java  |    6 +-
 .../query/internal/CompositeGroupJunction.java     |  135 +-
 .../apache/geode/cache/query/internal/CqEntry.java |   16 +-
 .../cache/query/internal/CqQueryVsdStats.java      |   56 +-
 .../geode/cache/query/internal/CqStateImpl.java    |   12 +-
 .../internal/CumulativeNonDistinctResults.java     |   91 +-
 .../geode/cache/query/internal/DefaultQuery.java   |  124 +-
 .../cache/query/internal/DefaultQueryService.java  |   68 +-
 .../geode/cache/query/internal/DerivedInfo.java    |   39 +-
 .../cache/query/internal/ExecutionContext.java     |   10 +-
 .../apache/geode/cache/query/internal/Filter.java  |    3 +-
 .../geode/cache/query/internal/Functions.java      |   20 +-
 .../geode/cache/query/internal/GroupJunction.java  |    6 +-
 .../query/internal/IndexConditioningHelper.java    |   50 +-
 .../internal/IndexCutDownExpansionHelper.java      |    3 +-
 .../geode/cache/query/internal/IndexInfo.java      |   12 +-
 .../query/internal/IndexTrackingQueryObserver.java |   46 +-
 .../geode/cache/query/internal/Indexable.java      |    3 +-
 .../cache/query/internal/LinkedResultSet.java      |   19 +-
 .../cache/query/internal/LinkedStructSet.java      |   26 +-
 .../geode/cache/query/internal/MethodDispatch.java |   34 +-
 .../cache/query/internal/NWayMergeResults.java     |  171 +-
 .../cache/query/internal/ObjectIntHashMap.java     |   39 +-
 .../cache/query/internal/OrderByComparator.java    |    6 +-
 .../query/internal/OrderByComparatorMapped.java    |   18 +-
 .../cache/query/internal/PRQueryTraceInfo.java     |    5 +-
 .../geode/cache/query/internal/PathUtils.java      |   18 +-
 .../cache/query/internal/ProxyQueryService.java    |   48 +-
 .../geode/cache/query/internal/QCompiler.java      |  314 +-
 .../apache/geode/cache/query/internal/QRegion.java |  159 +-
 .../apache/geode/cache/query/internal/QScope.java  |    2 +-
 .../internal/QueryConfigurationServiceImpl.java    |   14 +-
 .../query/internal/QueryExecutionContext.java      |   18 +-
 .../cache/query/internal/QueryObserverAdapter.java |    6 +-
 .../geode/cache/query/internal/QueryUtils.java     |   34 +-
 .../geode/cache/query/internal/RangeJunction.java  |  121 +-
 .../geode/cache/query/internal/ResultsBag.java     |   72 +-
 .../ResultsCollectionCopyOnReadWrapper.java        |    7 +-
 .../ResultsCollectionPdxDeserializerWrapper.java   |   13 +-
 .../query/internal/ResultsCollectionWrapper.java   |  188 +-
 .../geode/cache/query/internal/ResultsSet.java     |   15 +-
 .../cache/query/internal/RuntimeIterator.java      |    4 +-
 .../cache/query/internal/SortedResultSet.java      |   19 +-
 .../cache/query/internal/SortedResultsBag.java     |   76 +-
 .../cache/query/internal/SortedStructBag.java      |   42 +-
 .../cache/query/internal/SortedStructSet.java      |   52 +-
 .../geode/cache/query/internal/StructBag.java      |   65 +-
 .../geode/cache/query/internal/StructImpl.java     |   53 +-
 .../geode/cache/query/internal/StructSet.java      |   97 +-
 .../internal/aggregate/AbstractAggregator.java     |    6 +-
 .../query/internal/aggregate/AvgDistinct.java      |    2 +-
 .../internal/aggregate/AvgDistinctPRQueryNode.java |    2 +-
 .../query/internal/aggregate/AvgPRQueryNode.java   |    2 +-
 .../cache/query/internal/aggregate/Count.java      |    2 +-
 .../query/internal/aggregate/CountDistinct.java    |    2 +-
 .../aggregate/CountDistinctPRQueryNode.java        |    4 +-
 .../query/internal/aggregate/CountPRQueryNode.java |    2 +-
 .../internal/aggregate/DistinctAggregator.java     |    6 +-
 .../query/internal/aggregate/SumDistinct.java      |    2 +-
 .../internal/aggregate/SumDistinctPRQueryNode.java |    4 +-
 .../cache/query/internal/cq/CqAttributesImpl.java  |   32 +-
 .../geode/cache/query/internal/cq/CqService.java   |   14 +-
 .../cache/query/internal/cq/MissingCqService.java  |   38 +-
 .../cache/query/internal/index/AbstractIndex.java  |  417 ++-
 .../query/internal/index/AbstractMapIndex.java     |  105 +-
 .../query/internal/index/CompactMapRangeIndex.java |   96 +-
 .../query/internal/index/CompactRangeIndex.java    |  287 +-
 .../cache/query/internal/index/DummyQRegion.java   |   24 +-
 .../index/FunctionalIndexCreationHelper.java       |  201 +-
 .../cache/query/internal/index/HashIndex.java      |  297 +-
 .../cache/query/internal/index/HashIndexSet.java   |   50 +-
 .../query/internal/index/IndexCreationData.java    |   48 +-
 .../query/internal/index/IndexCreationHelper.java  |   12 +-
 .../cache/query/internal/index/IndexData.java      |    6 +-
 .../cache/query/internal/index/IndexElemArray.java |   14 +-
 .../cache/query/internal/index/IndexManager.java   |  246 +-
 .../cache/query/internal/index/IndexProtocol.java  |    3 +-
 .../cache/query/internal/index/IndexStats.java     |   32 +-
 .../cache/query/internal/index/IndexUtils.java     |    3 +-
 .../cache/query/internal/index/MapIndexStore.java  |    6 +-
 .../cache/query/internal/index/MapRangeIndex.java  |   89 +-
 .../query/internal/index/MemoryIndexStore.java     |  115 +-
 .../query/internal/index/PartitionedIndex.java     |  134 +-
 .../query/internal/index/PrimaryKeyIndex.java      |   42 +-
 .../index/PrimaryKeyIndexCreationHelper.java       |   28 +-
 .../cache/query/internal/index/RangeIndex.java     |  407 ++-
 .../query/internal/parse/ASTAggregateFunc.java     |    6 +-
 .../query/internal/parse/ASTConversionExpr.java    |    2 +-
 .../geode/cache/query/internal/parse/ASTDummy.java |    2 +-
 .../cache/query/internal/parse/ASTGroupBy.java     |    2 +-
 .../geode/cache/query/internal/parse/ASTHint.java  |    2 +-
 .../query/internal/parse/ASTHintIdentifier.java    |    2 +-
 .../cache/query/internal/parse/ASTImport.java      |    2 +-
 .../geode/cache/query/internal/parse/ASTLimit.java |    2 +-
 .../cache/query/internal/parse/ASTLiteral.java     |    4 +-
 .../query/internal/parse/ASTMethodInvocation.java  |    2 +-
 .../cache/query/internal/parse/ASTOrderBy.java     |    2 +-
 .../cache/query/internal/parse/ASTSelect.java      |    2 +-
 .../query/internal/parse/ASTSortCriterion.java     |    2 +-
 .../geode/cache/query/internal/parse/ASTType.java  |   10 +-
 .../geode/cache/query/internal/parse/ASTUnary.java |    2 +-
 .../cache/query/internal/parse/UtilParser.java     |    8 +-
 .../query/internal/types/CollectionTypeImpl.java   |   12 +-
 .../cache/query/internal/types/MapTypeImpl.java    |   14 +-
 .../query/internal/types/NumericComparator.java    |    4 +-
 .../cache/query/internal/types/ObjectTypeImpl.java |   16 +-
 .../cache/query/internal/types/StructTypeImpl.java |   20 +-
 .../cache/query/internal/types/TypeUtils.java      |   25 +-
 .../cache/query/internal/utils/LimitIterator.java  |   10 +-
 .../geode/cache/query/internal/utils/PDXUtils.java |    6 +-
 .../cache/query/internal/xml/ElementType.java      |    2 +-
 .../xml/QueryMethodAuthorizerCreation.java         |    2 +-
 .../configuration/QueryConfigService.java          |   10 +-
 .../security/JavaBeanAccessorMethodAuthorizer.java |    2 +-
 .../query/security/RegExMethodAuthorizer.java      |    6 +-
 .../query/security/RestrictedMethodAuthorizer.java |   10 +-
 .../security/UnrestrictedMethodAuthorizer.java     |    2 +-
 .../org/apache/geode/cache/server/ServerLoad.java  |    9 +-
 .../server/internal/ConnectionCountProbe.java      |    2 +-
 .../geode/cache/server/internal/LoadMonitor.java   |   22 +-
 .../apache/geode/cache/wan/EventSequenceID.java    |   33 +-
 .../org/apache/geode/cache/wan/GatewaySender.java  |   89 +-
 .../apache/geode/compression/SnappyCompressor.java |    4 +-
 .../geode/datasource/PooledDataSourceFactory.java  |    2 +-
 .../apache/geode/distributed/AbstractLauncher.java |   19 +-
 .../geode/distributed/ConfigurationProperties.java |   96 +-
 .../geode/distributed/DistributedLockService.java  |    3 +-
 .../geode/distributed/DistributedMember.java       |    1 +
 .../geode/distributed/DurableClientAttributes.java |   43 +-
 .../java/org/apache/geode/distributed/Locator.java |   12 +-
 .../apache/geode/distributed/LocatorLauncher.java  |  167 +-
 .../apache/geode/distributed/ServerLauncher.java   |   23 +-
 .../internal/AbstractDistributionConfig.java       |   38 +-
 .../internal/ClusterDistributionManager.java       |   53 +-
 .../distributed/internal/ClusterElderManager.java  |   18 +-
 .../internal/CollectingReplyProcessor.java         |    5 +-
 .../geode/distributed/internal/ConflationKey.java  |   14 +-
 .../apache/geode/distributed/internal/DMStats.java |    3 +-
 .../apache/geode/distributed/internal/DSClock.java |   56 +-
 .../internal/DefaultPropertiesGenerator.java       |    2 +-
 .../internal/DistributedSystemService.java         |   26 -
 .../distributed/internal/DistributionConfig.java   |   84 +-
 .../internal/DistributionConfigImpl.java           |   90 +-
 .../internal/DistributionConfigSnapshot.java       |    6 +-
 .../distributed/internal/DistributionImpl.java     |   45 +-
 .../distributed/internal/DistributionManager.java  |    6 +-
 .../distributed/internal/DistributionMessage.java  |  103 +-
 .../distributed/internal/DistributionStats.java    |  237 +-
 .../distributed/internal/FlowControlParams.java    |    6 +-
 .../distributed/internal/HealthMonitorImpl.java    |   52 +-
 .../internal/HighPriorityAckedMessage.java         |   50 +-
 .../InternalConfigurationPersistenceService.java   |   44 +-
 .../internal/InternalDistributedSystem.java        |   44 +-
 .../distributed/internal/InternalLocator.java      |    4 +-
 .../distributed/internal/LocatorLoadSnapshot.java  |    2 +-
 .../geode/distributed/internal/LocatorStats.java   |   84 +-
 .../internal/LonerDistributionManager.java         |   62 +-
 .../internal/OverflowQueueWithDMStats.java         |   18 +-
 .../distributed/internal/ProcessorKeeper21.java    |   26 +-
 .../internal/ReliableReplyProcessor21.java         |   36 +-
 .../geode/distributed/internal/ReplyException.java |    6 +-
 .../geode/distributed/internal/ReplyMessage.java   |   96 +-
 .../distributed/internal/ReplyProcessor21.java     |  168 +-
 .../geode/distributed/internal/ReplySender.java    |   11 +-
 .../geode/distributed/internal/SecurityConfig.java |    4 +-
 .../distributed/internal/SerialAckedMessage.java   |   21 +-
 .../geode/distributed/internal/ServerLocation.java |   15 +-
 .../internal/ServerLocationAndMemberId.java        |    8 +-
 .../geode/distributed/internal/ServerLocator.java  |   72 +-
 .../distributed/internal/ShutdownMessage.java      |    8 +-
 .../distributed/internal/SizeableRunnable.java     |    4 +-
 .../geode/distributed/internal/StartupMessage.java |  128 +-
 .../distributed/internal/StartupMessageData.java   |   46 +-
 .../internal/StartupMessageReplyProcessor.java     |   18 +-
 .../distributed/internal/StartupOperation.java     |   17 +-
 .../internal/StartupResponseMessage.java           |   88 +-
 .../StartupResponseWithVersionMessage.java         |   24 +-
 .../ThrottlingMemLinkedQueueWithDMStats.java       |   12 +-
 .../internal/WaitForViewInstallation.java          |   14 +-
 .../distributed/internal/WanLocatorDiscoverer.java |    2 +-
 .../internal/deadlock/DLockDependencyMonitor.java  |   16 +-
 .../internal/deadlock/DeadlockDetector.java        |    8 +-
 .../distributed/internal/deadlock/Dependency.java  |   10 +-
 .../internal/deadlock/DependencyGraph.java         |   16 +-
 .../deadlock/DependencyMonitorManager.java         |    6 +-
 .../internal/deadlock/GemFireDeadlockDetector.java |    2 +-
 .../internal/deadlock/LocalLockInfo.java           |   14 +-
 .../distributed/internal/deadlock/LocalThread.java |   20 +-
 .../deadlock/MessageDependencyMonitor.java         |   17 +-
 .../distributed/internal/direct/DirectChannel.java |   60 +-
 .../distributed/internal/locks/DLockGrantor.java   |  711 +++--
 .../locks/DLockLessorDepartureHandler.java         |    2 +-
 .../internal/locks/DLockQueryProcessor.java        |  111 +-
 .../locks/DLockRecoverGrantorProcessor.java        |   93 +-
 .../internal/locks/DLockReleaseProcessor.java      |   84 +-
 .../internal/locks/DLockRemoteToken.java           |   34 +-
 .../internal/locks/DLockRequestProcessor.java      |  457 ++-
 .../distributed/internal/locks/DLockService.java   |  655 ++--
 .../distributed/internal/locks/DLockStats.java     |   62 +-
 .../distributed/internal/locks/DLockToken.java     |  108 +-
 .../internal/locks/DeposeGrantorProcessor.java     |   42 +-
 .../internal/locks/DistributedMemberLock.java      |   62 +-
 .../internal/locks/ElderInitProcessor.java         |   69 +-
 .../distributed/internal/locks/ElderState.java     |   44 +-
 .../distributed/internal/locks/GrantorInfo.java    |   16 +-
 .../internal/locks/GrantorRequestProcessor.java    |  106 +-
 .../distributed/internal/locks/LockGrantorId.java  |   61 +-
 .../locks/NonGrantorDestroyedProcessor.java        |   38 +-
 .../distributed/internal/locks/RemoteThread.java   |   28 +-
 .../membership/InternalDistributedMember.java      |   30 +-
 .../internal/membership/InternalRole.java          |   14 +-
 .../internal/membership/adapter/ServiceConfig.java |    6 +-
 .../membership/adapter/auth/GMSAuthenticator.java  |    6 +-
 .../internal/streaming/StreamingOperation.java     |  116 +-
 ...eAnnotationBasedMethodInvocationAuthorizer.java |    3 +-
 .../examples/security/ExampleSecurityManager.java  |   14 +-
 .../main/java/org/apache/geode/i18n/StringId.java  |   12 +-
 .../org/apache/geode/internal/AbstractConfig.java  |   15 +-
 .../java/org/apache/geode/internal/Assert.java     |   12 +-
 .../geode/internal/ByteBufferOutputStream.java     |   18 +-
 .../org/apache/geode/internal/ConfigSource.java    |   34 +-
 .../apache/geode/internal/CopyOnWriteHashSet.java  |   16 +-
 .../CoreSanctionedSerializablesService.java        |   27 +
 .../org/apache/geode/internal/DSFIDFactory.java    |  886 +++---
 .../DistributedSerializableObjectConfig.java       |   51 +
 .../apache/geode/internal/DistributionLocator.java |    2 +-
 .../geode/internal/EmptyInputStreamFilter.java     |   24 -
 .../java/org/apache/geode/internal/ExitCode.java   |    2 +-
 .../org/apache/geode/internal/GemFireVersion.java  |    7 +
 .../org/apache/geode/internal/GeodeVersion.java    |   40 +
 .../geode/internal/HeapDataOutputStream.java       |   82 +-
 .../org/apache/geode/internal/HistogramStats.java  |   34 +-
 .../apache/geode/internal/InputStreamFilter.java   |   24 -
 .../geode/internal/InternalDataSerializer.java     |  239 +-
 .../geode/internal/InternalInstantiator.java       |   10 +-
 .../org/apache/geode/internal/JvmSizeUtils.java    |   61 +-
 .../org/apache/geode/internal/ManagerInfo.java     |   53 +-
 .../java/org/apache/geode/internal/NanoTimer.java  |   33 +-
 .../geode/internal/NullDataOutputStream.java       |   32 +-
 .../apache/geode/internal/ObjIdConcurrentMap.java  |   61 +-
 .../java/org/apache/geode/internal/ObjIdMap.java   |   46 +-
 .../internal/ObjectInputStreamFilterWrapper.java   |  252 --
 .../apache/geode/internal/OneTaskOnlyExecutor.java |   10 +-
 .../apache/geode/internal/ProcessOutputReader.java |   20 +-
 .../org/apache/geode/internal/SystemAdmin.java     |  248 +-
 .../apache/geode/internal/SystemDescription.java   |   54 +
 .../org/apache/geode/internal/SystemTimer.java     |   10 +-
 .../apache/geode/internal/UniqueIdGenerator.java   |   35 +-
 .../apache/geode/internal/VersionDescription.java  |   32 +-
 .../geode/internal/VersionedObjectInput.java       |   48 +-
 .../geode/internal/VersionedObjectOutput.java      |   36 +-
 .../geode/internal/admin/CacheCollector.java       |   14 +-
 .../internal/admin/ClientMembershipMessage.java    |   20 +-
 .../geode/internal/admin/ClientStatsManager.java   |    6 +-
 .../internal/admin/CompoundEntrySnapshot.java      |   34 +-
 .../internal/admin/CompoundRegionSnapshot.java     |   76 +-
 .../geode/internal/admin/GfManagerAgentConfig.java |   24 +-
 .../apache/geode/internal/admin/ListenerIdMap.java |   40 +-
 .../org/apache/geode/internal/admin/StatAlert.java |    2 +-
 .../geode/internal/admin/StatAlertsManager.java    |   21 +-
 .../admin/remote/AddHealthListenerRequest.java     |    8 +-
 .../admin/remote/AddHealthListenerResponse.java    |   10 +-
 .../admin/remote/AddStatListenerRequest.java       |   14 +-
 .../admin/remote/AddStatListenerResponse.java      |    8 +-
 .../admin/remote/AdminFailureResponse.java         |    8 +-
 .../geode/internal/admin/remote/AdminRegion.java   |    6 +-
 .../internal/admin/remote/AdminReplyProcessor.java |   20 +-
 .../geode/internal/admin/remote/AdminRequest.java  |   32 +-
 .../geode/internal/admin/remote/AdminResponse.java |    6 +-
 .../geode/internal/admin/remote/AdminWaiters.java  |   23 +-
 .../admin/remote/AlertsNotificationMessage.java    |    8 +-
 .../admin/remote/AppCacheSnapshotMessage.java      |    6 +-
 .../internal/admin/remote/BridgeServerRequest.java |   30 +-
 .../admin/remote/BridgeServerResponse.java         |   12 +-
 .../internal/admin/remote/CacheConfigRequest.java  |   18 +-
 .../internal/admin/remote/CacheConfigResponse.java |   14 +-
 .../internal/admin/remote/CacheInfoRequest.java    |    4 +-
 .../internal/admin/remote/CacheInfoResponse.java   |    8 +-
 .../admin/remote/CancelStatListenerRequest.java    |    8 +-
 .../admin/remote/CancelStatListenerResponse.java   |    2 +-
 .../internal/admin/remote/CancellationMessage.java |    4 +-
 .../admin/remote/CancellationRegistry.java         |    4 +-
 .../internal/admin/remote/CliLegacyMessage.java    |    8 +-
 .../internal/admin/remote/ClientHealthStats.java   |   84 +-
 .../internal/admin/remote/CompactRequest.java      |    8 +-
 .../internal/admin/remote/CompactResponse.java     |    4 +-
 .../internal/admin/remote/DestroyEntryMessage.java |   12 +-
 .../admin/remote/DestroyRegionMessage.java         |    8 +-
 .../admin/remote/DistributionLocatorId.java        |  120 +-
 .../geode/internal/admin/remote/DummyEntry.java    |   12 +-
 .../admin/remote/DurableClientInfoRequest.java     |   12 +-
 .../admin/remote/DurableClientInfoResponse.java    |    8 +-
 .../internal/admin/remote/EntryValueNodeImpl.java  |   53 +-
 .../admin/remote/FetchDistLockInfoRequest.java     |    4 +-
 .../admin/remote/FetchDistLockInfoResponse.java    |   17 +-
 .../admin/remote/FetchHealthDiagnosisRequest.java  |   18 +-
 .../admin/remote/FetchHealthDiagnosisResponse.java |   10 +-
 .../internal/admin/remote/FetchHostRequest.java    |    4 +-
 .../internal/admin/remote/FetchHostResponse.java   |   38 +-
 .../remote/FetchResourceAttributesRequest.java     |    4 +-
 .../remote/FetchResourceAttributesResponse.java    |    2 +-
 .../internal/admin/remote/FetchStatsRequest.java   |    8 +-
 .../internal/admin/remote/FetchStatsResponse.java  |   12 +-
 .../internal/admin/remote/FetchSysCfgRequest.java  |    4 +-
 .../internal/admin/remote/FetchSysCfgResponse.java |    8 +-
 .../admin/remote/FlushAppCacheSnapshotMessage.java |    2 +-
 .../admin/remote/HealthListenerMessage.java        |   14 +-
 .../admin/remote/InspectionClasspathManager.java   |    4 +-
 .../internal/admin/remote/LicenseInfoRequest.java  |    4 +-
 .../internal/admin/remote/LicenseInfoResponse.java |    6 +-
 .../admin/remote/MissingPersistentIDsResponse.java |    6 +-
 .../admin/remote/ObjectDetailsRequest.java         |   12 +-
 .../admin/remote/ObjectDetailsResponse.java        |   25 +-
 .../internal/admin/remote/ObjectNamesRequest.java  |    4 +-
 .../internal/admin/remote/ObjectNamesResponse.java |    8 +-
 .../remote/PrepareRevokePersistentIDRequest.java   |   23 +-
 .../admin/remote/RefreshMemberSnapshotRequest.java |    6 +-
 .../remote/RefreshMemberSnapshotResponse.java      |   10 +-
 .../internal/admin/remote/RegionAdminMessage.java  |   10 +-
 .../internal/admin/remote/RegionAdminRequest.java  |   10 +-
 .../admin/remote/RegionAttributesRequest.java      |    2 +-
 .../admin/remote/RegionAttributesResponse.java     |    8 +-
 .../geode/internal/admin/remote/RegionRequest.java |   26 +-
 .../internal/admin/remote/RegionResponse.java      |   22 +-
 .../internal/admin/remote/RegionSizeRequest.java   |    6 +-
 .../internal/admin/remote/RegionSizeResponse.java  |   14 +-
 .../admin/remote/RegionStatisticsRequest.java      |    2 +-
 .../admin/remote/RegionStatisticsResponse.java     |    8 +-
 .../admin/remote/RegionSubRegionSizeRequest.java   |    6 +-
 .../admin/remote/RegionSubRegionsSizeResponse.java |   24 +-
 .../geode/internal/admin/remote/RemoteAlert.java   |   14 +-
 .../internal/admin/remote/RemoteApplicationVM.java |    2 +-
 .../internal/admin/remote/RemoteBridgeServer.java  |  120 +-
 .../internal/admin/remote/RemoteCacheInfo.java     |  112 +-
 .../admin/remote/RemoteCacheStatistics.java        |   10 +-
 .../internal/admin/remote/RemoteDLockInfo.java     |   30 +-
 .../internal/admin/remote/RemoteEntrySnapshot.java |   34 +-
 .../internal/admin/remote/RemoteGemFireVM.java     |  133 +-
 .../admin/remote/RemoteGfManagerAgent.java         |    6 +-
 .../internal/admin/remote/RemoteObjectName.java    |   12 +-
 .../admin/remote/RemoteRegionAttributes.java       |  334 +-
 .../admin/remote/RemoteRegionSnapshot.java         |   50 +-
 .../geode/internal/admin/remote/RemoteStat.java    |   56 +-
 .../internal/admin/remote/RemoteStatResource.java  |   42 +-
 .../admin/remote/RemoteTransportConfig.java        |  105 +-
 .../admin/remote/RemoveHealthListenerRequest.java  |    8 +-
 .../admin/remote/RemoveHealthListenerResponse.java |    2 +-
 .../admin/remote/ResetHealthStatusRequest.java     |    8 +-
 .../admin/remote/ResetHealthStatusResponse.java    |    2 +-
 .../admin/remote/RevokePersistentIDRequest.java    |   13 +-
 .../admin/remote/RevokePersistentIDResponse.java   |    2 +-
 .../internal/admin/remote/RootRegionRequest.java   |    2 +-
 .../internal/admin/remote/RootRegionResponse.java  |   20 +-
 .../remote/ShutdownAllGatewayHubsRequest.java      |    6 +-
 .../internal/admin/remote/ShutdownAllRequest.java  |   12 +-
 .../internal/admin/remote/ShutdownAllResponse.java |    8 +-
 .../admin/remote/SnapshotResultMessage.java        |   12 +-
 .../remote/StatAlertsManagerAssignMessage.java     |    6 +-
 .../internal/admin/remote/StatListenerMessage.java |   26 +-
 .../internal/admin/remote/StoreSysCfgRequest.java  |    8 +-
 .../internal/admin/remote/StoreSysCfgResponse.java |    8 +-
 .../internal/admin/remote/SubRegionRequest.java    |    2 +-
 .../internal/admin/remote/SubRegionResponse.java   |   16 +-
 .../internal/admin/remote/TailLogRequest.java      |    4 +-
 .../internal/admin/remote/TailLogResponse.java     |    2 +-
 .../admin/remote/UpdateAlertDefinitionMessage.java |    8 +-
 .../internal/admin/remote/VersionInfoRequest.java  |    4 +-
 .../internal/admin/remote/VersionInfoResponse.java |    8 +-
 .../admin/remote/VersionMismatchAlert.java         |   16 +-
 .../admin/statalerts/BaseDecoratorImpl.java        |   16 +-
 .../admin/statalerts/DummyStatisticInfoImpl.java   |   29 +-
 .../admin/statalerts/FunctionDecoratorImpl.java    |    8 +-
 .../internal/admin/statalerts/FunctionHelper.java  |    8 +-
 .../statalerts/GaugeThresholdDecoratorImpl.java    |   13 +-
 .../admin/statalerts/MultiAttrDefinitionImpl.java  |   42 +-
 .../statalerts/NumberThresholdDecoratorImpl.java   |   14 +-
 .../admin/statalerts/SingleAttrDefinitionImpl.java |   33 +-
 .../admin/statalerts/StatisticInfoImpl.java        |   23 +-
 .../internal/cache/AbstractBucketRegionQueue.java  |   55 +-
 .../geode/internal/cache/AbstractCacheServer.java  |   71 +-
 .../geode/internal/cache/AbstractDiskRegion.java   |  456 +--
 .../geode/internal/cache/AbstractRegion.java       |    2 +-
 .../geode/internal/cache/AbstractRegionMap.java    |   58 +-
 .../internal/cache/AbstractUpdateOperation.java    |   66 +-
 .../apache/geode/internal/cache/AcceptHelper.java  |    2 +-
 .../cache/AddCacheServerProfileMessage.java        |   12 +-
 .../geode/internal/cache/AfterCompletion.java      |    2 +-
 .../apache/geode/internal/cache/BucketAdvisor.java |    9 +-
 .../apache/geode/internal/cache/BucketDump.java    |   20 +-
 .../internal/cache/BucketRedundancyTracker.java    |    2 +-
 .../apache/geode/internal/cache/BucketRegion.java  |   66 +-
 .../geode/internal/cache/BucketRegionQueue.java    |  184 +-
 .../geode/internal/cache/BucketServerLocation.java |   16 +-
 .../internal/cache/BucketServerLocation66.java     |   44 +-
 .../internal/cache/BytesAndBitsForCompactor.java   |   18 +-
 .../geode/internal/cache/CacheClientStatus.java    |   28 +-
 .../apache/geode/internal/cache/CacheConfig.java   |   62 +-
 .../internal/cache/CacheDistributionAdvisor.java   |   34 +-
 .../apache/geode/internal/cache/CacheObserver.java |   34 +-
 .../geode/internal/cache/CacheObserverAdapter.java |   93 +-
 .../geode/internal/cache/CacheServerAdvisor.java   |   20 +-
 .../geode/internal/cache/CacheServerImpl.java      |   87 +-
 .../geode/internal/cache/CacheStatisticsImpl.java  |   18 +-
 .../cache/CachedDeserializableFactory.java         |    6 +-
 .../internal/cache/ClientRegionEventImpl.java      |    6 +-
 .../cache/ClientSubscriptionConfigImpl.java        |   34 +-
 .../geode/internal/cache/CloseCacheMessage.java    |    8 +-
 .../internal/cache/ClusterConfigurationLoader.java |    4 +-
 .../geode/internal/cache/ColocationHelper.java     |   60 +-
 .../geode/internal/cache/CommitReplyException.java |   12 +-
 .../internal/cache/CountingDataInputStream.java    |   72 +-
 .../internal/cache/CreateRegionProcessor.java      |  208 +-
 .../internal/cache/CustomEntryExpiryTask.java      |    8 +-
 .../geode/internal/cache/DestroyOperation.java     |   56 +-
 .../cache/DestroyPartitionedRegionMessage.java     |   62 +-
 .../internal/cache/DestroyRegionOperation.java     |  133 +-
 .../geode/internal/cache/DirectoryHolder.java      |   40 +-
 .../geode/internal/cache/DiskDirectoryStats.java   |   10 +-
 .../org/apache/geode/internal/cache/DiskId.java    |   92 +-
 .../apache/geode/internal/cache/DiskInitFile.java  |  813 +++--
 .../apache/geode/internal/cache/DiskRegion.java    |  155 +-
 .../geode/internal/cache/DiskRegionStats.java      |   60 +-
 .../geode/internal/cache/DiskStoreAttributes.java  |   60 +-
 .../geode/internal/cache/DiskStoreFactoryImpl.java |   72 +-
 .../apache/geode/internal/cache/DiskStoreImpl.java |  690 ++---
 .../geode/internal/cache/DiskStoreMonitor.java     |    4 +-
 .../geode/internal/cache/DiskStoreStats.java       |  118 +-
 .../internal/cache/DiskWriteAttributesImpl.java    |   78 +-
 .../geode/internal/cache/DistPeerTXStateStub.java  |   62 +-
 .../internal/cache/DistTXAdjunctCommitMessage.java |    4 +-
 .../geode/internal/cache/DistTXCommitMessage.java  |   76 +-
 .../internal/cache/DistTXPrecommitMessage.java     |   85 +-
 .../internal/cache/DistTXRollbackMessage.java      |   70 +-
 .../apache/geode/internal/cache/DistTXState.java   |  226 +-
 .../internal/cache/DistTXStateOnCoordinator.java   |   38 +-
 .../cache/DistTXStateProxyImplOnCoordinator.java   |   98 +-
 .../cache/DistTXStateProxyImplOnDatanode.java      |   36 +-
 .../internal/cache/DistributedCacheOperation.java  |  387 ++-
 .../internal/cache/DistributedClearOperation.java  |  101 +-
 .../internal/cache/DistributedPingMessage.java     |    2 +-
 .../internal/cache/DistributedPutAllOperation.java |  301 +-
 .../geode/internal/cache/DistributedRegion.java    |   29 +-
 .../DistributedRegionFunctionStreamingMessage.java |  117 +-
 .../cache/DistributedRemoveAllOperation.java       |  279 +-
 .../cache/DistributedTombstoneOperation.java       |   56 +-
 .../internal/cache/DynamicRegionAttributes.java    |    8 +-
 .../apache/geode/internal/cache/EntriesSet.java    |   84 +-
 .../geode/internal/cache/EntryEventImpl.java       |  524 ++--
 .../internal/cache/EntryEventSerialization.java    |    2 +-
 .../geode/internal/cache/EntryExpiryTask.java      |   17 +-
 .../geode/internal/cache/EntryOperationImpl.java   |   14 +-
 .../apache/geode/internal/cache/EntrySnapshot.java |   54 +-
 .../geode/internal/cache/EnumListenerEvent.java    |   24 +-
 .../org/apache/geode/internal/cache/EventID.java   |  207 +-
 .../geode/internal/cache/EventStateHelper.java     |   15 +-
 .../internal/cache/EvictionAttributesImpl.java     |   42 +-
 .../cache/EvictionAttributesMutatorImpl.java       |    4 +-
 .../geode/internal/cache/ExpirationScheduler.java  |    8 +-
 ...xpireDisconnectedClientTransactionsMessage.java |    8 +-
 .../geode/internal/cache/ExpiryRegionEntry.java    |   10 +-
 .../apache/geode/internal/cache/ExpiryTask.java    |   62 +-
 .../geode/internal/cache/ExportDiskRegion.java     |    6 +-
 .../apache/geode/internal/cache/FilterProfile.java |  503 ++--
 .../geode/internal/cache/FilterRoutingInfo.java    |  286 +-
 .../internal/cache/FindDurableQueueProcessor.java  |   38 +-
 .../geode/internal/cache/FindRemoteTXMessage.java  |   44 +-
 .../internal/cache/FindVersionTagOperation.java    |   38 +-
 .../cache/FixedPartitionAttributesImpl.java        |   43 +-
 .../internal/cache/ForceReattemptException.java    |   10 +-
 .../cache/ForceableLinkedBlockingQueue.java        |    6 +-
 .../cache/FunctionStreamingReplyMessage.java       |   36 +-
 .../internal/cache/FutureCachedDeserializable.java |    2 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |   10 +-
 .../apache/geode/internal/cache/GridAdvisor.java   |  120 +-
 .../org/apache/geode/internal/cache/HARegion.java  |  103 +-
 .../geode/internal/cache/IdentityArrayList.java    |   65 +-
 .../cache/InMemoryPersistentMemberView.java        |   10 +-
 .../internal/cache/IncomingGatewayStatus.java      |   26 +-
 .../internal/cache/InitialImageFlowControl.java    |    4 +-
 .../internal/cache/InitialImageOperation.java      | 1248 ++++----
 .../apache/geode/internal/cache/InterestEvent.java |    2 +-
 .../cache/InterestRegistrationEventImpl.java       |   65 +-
 .../internal/cache/InternalRegionArguments.java    |   86 +-
 .../geode/internal/cache/InvalidateOperation.java  |   40 +-
 .../cache/InvalidatePartitionedRegionMessage.java  |   10 +-
 .../internal/cache/InvalidateRegionOperation.java  |   17 +-
 .../internal/cache/JtaAfterCompletionMessage.java  |   10 +-
 .../org/apache/geode/internal/cache/KeyInfo.java   |   20 +-
 .../cache/LatestLastAccessTimeMessage.java         |   68 +-
 .../cache/LatestLastAccessTimeOperation.java       |    6 +-
 .../cache/LatestLastAccessTimeReplyProcessor.java  |    6 +-
 .../geode/internal/cache/LoaderHelperImpl.java     |   12 +-
 .../apache/geode/internal/cache/LocalDataSet.java  |  141 +-
 .../apache/geode/internal/cache/LocalRegion.java   |  104 +-
 .../cache/MemberFunctionStreamingMessage.java      |  132 +-
 .../cache/NetSearchExpirationCalculator.java       |    4 +-
 .../java/org/apache/geode/internal/cache/Node.java |   54 +-
 .../geode/internal/cache/NonLocalRegionEntry.java  |  102 +-
 .../cache/NonLocalRegionEntryWithStats.java        |   24 +-
 .../apache/geode/internal/cache/NonTXEntry.java    |    6 +-
 .../org/apache/geode/internal/cache/Oplog.java     | 1980 ++++++------
 .../geode/internal/cache/OrderedTombstoneMap.java  |    4 +-
 .../apache/geode/internal/cache/OverflowOplog.java |  332 +-
 .../geode/internal/cache/OverflowOplogSet.java     |   84 +-
 .../internal/cache/PRContainsValueFunction.java    |    5 +-
 .../internal/cache/PRHARedundancyProvider.java     |   10 +
 .../geode/internal/cache/PRQueryProcessor.java     |   69 +-
 .../internal/cache/PRSystemPropertyGetter.java     |    2 +-
 .../internal/cache/PartitionAttributesImpl.java    |  291 +-
 .../internal/cache/PartitionRegionConfig.java      |  163 +-
 .../cache/PartitionRegionConfigValidator.java      |   91 +-
 .../geode/internal/cache/PartitionedRegion.java    | 1537 +++++-----
 .../internal/cache/PartitionedRegionDataStore.java |  606 ++--
 .../internal/cache/PartitionedRegionHelper.java    |   27 +-
 .../cache/PartitionedRegionQueryEvaluator.java     |  190 +-
 .../cache/PartitionedRegionRedundancyTracker.java  |    4 +-
 .../internal/cache/PartitionedRegionStats.java     |  256 +-
 .../internal/cache/PartitionedRegionStatus.java    |   10 +-
 .../geode/internal/cache/PeerTXStateStub.java      |   49 +-
 .../geode/internal/cache/PersistentOplogSet.java   |    5 +-
 .../internal/cache/PlaceHolderDiskRegion.java      |   12 +-
 .../geode/internal/cache/PoolManagerImpl.java      |   16 +-
 .../org/apache/geode/internal/cache/PoolStats.java |   88 +-
 .../cache/PreferBytesCachedDeserializable.java     |   22 +-
 .../geode/internal/cache/ProxyBucketRegion.java    |  171 +-
 .../geode/internal/cache/ProxyRegionMap.java       |   64 +-
 .../cache/PutAllPartialResultException.java        |   54 +-
 .../geode/internal/cache/QueuedOperation.java      |   38 +-
 .../geode/internal/cache/RegionEventImpl.java      |   70 +-
 .../geode/internal/cache/RegionExpiryTask.java     |    2 +-
 .../geode/internal/cache/RegionIdleExpiryTask.java |    4 +-
 .../geode/internal/cache/RegionListener.java       |    8 +-
 .../apache/geode/internal/cache/RegionStatus.java  |   10 +-
 .../geode/internal/cache/RegionTTLExpiryTask.java  |    4 +-
 .../internal/cache/RemoteOperationException.java   |    4 +-
 .../cache/RemoveCacheServerProfileMessage.java     |   12 +-
 .../apache/geode/internal/cache/RoleEventImpl.java |   12 +-
 .../cache/SearchLoadAndWriteProcessor.java         |  882 +++---
 .../geode/internal/cache/SenderIdMonitor.java      |    4 +-
 .../geode/internal/cache/ServerPingMessage.java    |   12 +-
 .../geode/internal/cache/StateFlushOperation.java  |   64 +-
 .../cache/StoreAllCachedDeserializable.java        |   34 +-
 .../geode/internal/cache/TXBucketRegionState.java  |    4 +-
 .../geode/internal/cache/TXCommitMessage.java      | 1012 +++----
 .../org/apache/geode/internal/cache/TXEntry.java   |   54 +-
 .../apache/geode/internal/cache/TXEntryState.java  |  254 +-
 .../geode/internal/cache/TXEntryUserAttrState.java |   16 +-
 .../org/apache/geode/internal/cache/TXEvent.java   |   19 +-
 .../geode/internal/cache/TXFarSideCMTracker.java   |   74 +-
 .../java/org/apache/geode/internal/cache/TXId.java |   24 +-
 .../cache/TXLastEventInTransactionUtils.java       |   21 +-
 .../apache/geode/internal/cache/TXLockRequest.java |   62 +-
 .../apache/geode/internal/cache/TXManagerImpl.java |  299 +-
 .../org/apache/geode/internal/cache/TXMessage.java |   40 +-
 .../internal/cache/TXRegionLockRequestImpl.java    |   66 +-
 .../apache/geode/internal/cache/TXRegionState.java |  226 +-
 .../internal/cache/TXRemoteCommitMessage.java      |   18 +-
 .../geode/internal/cache/TXReservationMgr.java     |   24 +-
 .../apache/geode/internal/cache/TXRmtEvent.java    |   34 +-
 .../org/apache/geode/internal/cache/TXState.java   |  385 ++-
 .../geode/internal/cache/TXStateInterface.java     |    2 +-
 .../geode/internal/cache/TXStateProxyImpl.java     |  174 +-
 .../apache/geode/internal/cache/TXStateStub.java   |   22 +-
 .../internal/cache/TimestampedEntryEventImpl.java  |   16 +-
 .../geode/internal/cache/TombstoneService.java     |  133 +-
 .../internal/cache/TxCallbackEventFactoryImpl.java |    8 +-
 .../geode/internal/cache/UnsharedImageState.java   |    2 +-
 .../internal/cache/UpdateAttributesProcessor.java  |  120 +-
 .../cache/UpdateEntryVersionOperation.java         |   40 +-
 .../geode/internal/cache/UpdateOperation.java      |  192 +-
 .../cache/UserSpecifiedDiskStoreAttributes.java    |   20 +-
 .../cache/UserSpecifiedRegionAttributes.java       |  120 +-
 .../internal/cache/VMCachedDeserializable.java     |   40 +-
 .../geode/internal/cache/VMLRURegionMap.java       |   40 +-
 .../geode/internal/cache/ValidatingDiskRegion.java |   28 +-
 .../geode/internal/cache/ValueByteWrapper.java     |    8 +-
 .../internal/cache/WrappedCallbackArgument.java    |   12 +-
 .../cache/WrappedRegionMembershipListener.java     |   62 +-
 .../cache/backup/BackupDataStoreResult.java        |    6 +-
 .../geode/internal/cache/backup/BackupService.java |    2 +-
 .../CompressedCachedDeserializable.java            |   20 +-
 .../geode/internal/cache/control/FilterByPath.java |    4 +-
 .../internal/cache/control/HeapMemoryMonitor.java  |  200 +-
 .../geode/internal/cache/control/MemoryEvent.java  |   24 +-
 .../internal/cache/control/MemoryThresholds.java   |   75 +-
 .../cache/control/OffHeapMemoryMonitor.java        |  166 +-
 .../control/PartitionRebalanceDetailsImpl.java     |   63 +-
 .../cache/control/RebalanceOperationImpl.java      |   73 +-
 .../cache/control/RebalanceResultsImpl.java        |   26 +-
 .../internal/cache/control/ResourceAdvisor.java    |   80 +-
 .../cache/control/ResourceManagerStats.java        |  182 +-
 .../SerializableRegionRedundancyStatusImpl.java    |   16 +-
 .../cache/entries/AbstractDiskRegionEntry.java     |    2 +-
 .../entries/AbstractOplogDiskRegionEntry.java      |    4 +-
 .../cache/entries/AbstractRegionEntry.java         |   28 +-
 .../geode/internal/cache/entries/DiskEntry.java    |  168 +-
 .../VMStatsDiskLRURegionEntryHeapIntKey.java       |   34 +-
 .../VMStatsDiskLRURegionEntryHeapLongKey.java      |   34 +-
 .../VMStatsDiskLRURegionEntryHeapObjectKey.java    |   32 +-
 .../VMStatsDiskLRURegionEntryHeapStringKey1.java   |   40 +-
 .../VMStatsDiskLRURegionEntryHeapStringKey2.java   |   46 +-
 .../VMStatsDiskLRURegionEntryHeapUUIDKey.java      |   40 +-
 .../VMStatsDiskLRURegionEntryOffHeapIntKey.java    |   32 +-
 .../VMStatsDiskLRURegionEntryOffHeapLongKey.java   |   32 +-
 .../VMStatsDiskLRURegionEntryOffHeapObjectKey.java |   30 +-
 ...VMStatsDiskLRURegionEntryOffHeapStringKey1.java |   38 +-
 ...VMStatsDiskLRURegionEntryOffHeapStringKey2.java |   44 +-
 .../VMStatsDiskLRURegionEntryOffHeapUUIDKey.java   |   38 +-
 .../entries/VMStatsDiskRegionEntryHeapIntKey.java  |   26 +-
 .../entries/VMStatsDiskRegionEntryHeapLongKey.java |   26 +-
 .../VMStatsDiskRegionEntryHeapObjectKey.java       |   24 +-
 .../VMStatsDiskRegionEntryHeapStringKey1.java      |   32 +-
 .../VMStatsDiskRegionEntryHeapStringKey2.java      |   38 +-
 .../entries/VMStatsDiskRegionEntryHeapUUIDKey.java |   32 +-
 .../VMStatsDiskRegionEntryOffHeapIntKey.java       |   24 +-
 .../VMStatsDiskRegionEntryOffHeapLongKey.java      |   24 +-
 .../VMStatsDiskRegionEntryOffHeapObjectKey.java    |   22 +-
 .../VMStatsDiskRegionEntryOffHeapStringKey1.java   |   30 +-
 .../VMStatsDiskRegionEntryOffHeapStringKey2.java   |   36 +-
 .../VMStatsDiskRegionEntryOffHeapUUIDKey.java      |   30 +-
 .../entries/VMStatsLRURegionEntryHeapIntKey.java   |   26 +-
 .../entries/VMStatsLRURegionEntryHeapLongKey.java  |   26 +-
 .../VMStatsLRURegionEntryHeapObjectKey.java        |   24 +-
 .../VMStatsLRURegionEntryHeapStringKey1.java       |   32 +-
 .../VMStatsLRURegionEntryHeapStringKey2.java       |   38 +-
 .../entries/VMStatsLRURegionEntryHeapUUIDKey.java  |   32 +-
 .../VMStatsLRURegionEntryOffHeapIntKey.java        |   24 +-
 .../VMStatsLRURegionEntryOffHeapLongKey.java       |   24 +-
 .../VMStatsLRURegionEntryOffHeapObjectKey.java     |   22 +-
 .../VMStatsLRURegionEntryOffHeapStringKey1.java    |   30 +-
 .../VMStatsLRURegionEntryOffHeapStringKey2.java    |   36 +-
 .../VMStatsLRURegionEntryOffHeapUUIDKey.java       |   30 +-
 .../entries/VMStatsRegionEntryHeapIntKey.java      |   20 +-
 .../entries/VMStatsRegionEntryHeapLongKey.java     |   20 +-
 .../entries/VMStatsRegionEntryHeapObjectKey.java   |   18 +-
 .../entries/VMStatsRegionEntryHeapStringKey1.java  |   26 +-
 .../entries/VMStatsRegionEntryHeapStringKey2.java  |   32 +-
 .../entries/VMStatsRegionEntryHeapUUIDKey.java     |   26 +-
 .../entries/VMStatsRegionEntryOffHeapIntKey.java   |   18 +-
 .../entries/VMStatsRegionEntryOffHeapLongKey.java  |   18 +-
 .../VMStatsRegionEntryOffHeapObjectKey.java        |   16 +-
 .../VMStatsRegionEntryOffHeapStringKey1.java       |   24 +-
 .../VMStatsRegionEntryOffHeapStringKey2.java       |   30 +-
 .../entries/VMStatsRegionEntryOffHeapUUIDKey.java  |   24 +-
 .../VMThinDiskLRURegionEntryHeapIntKey.java        |   24 +-
 .../VMThinDiskLRURegionEntryHeapLongKey.java       |   24 +-
 .../VMThinDiskLRURegionEntryHeapObjectKey.java     |   22 +-
 .../VMThinDiskLRURegionEntryHeapStringKey1.java    |   30 +-
 .../VMThinDiskLRURegionEntryHeapStringKey2.java    |   36 +-
 .../VMThinDiskLRURegionEntryHeapUUIDKey.java       |   30 +-
 .../VMThinDiskLRURegionEntryOffHeapIntKey.java     |   22 +-
 .../VMThinDiskLRURegionEntryOffHeapLongKey.java    |   22 +-
 .../VMThinDiskLRURegionEntryOffHeapObjectKey.java  |   20 +-
 .../VMThinDiskLRURegionEntryOffHeapStringKey1.java |   28 +-
 .../VMThinDiskLRURegionEntryOffHeapStringKey2.java |   34 +-
 .../VMThinDiskLRURegionEntryOffHeapUUIDKey.java    |   28 +-
 .../entries/VMThinDiskRegionEntryHeapIntKey.java   |   16 +-
 .../entries/VMThinDiskRegionEntryHeapLongKey.java  |   16 +-
 .../VMThinDiskRegionEntryHeapObjectKey.java        |   14 +-
 .../VMThinDiskRegionEntryHeapStringKey1.java       |   22 +-
 .../VMThinDiskRegionEntryHeapStringKey2.java       |   28 +-
 .../entries/VMThinDiskRegionEntryHeapUUIDKey.java  |   22 +-
 .../VMThinDiskRegionEntryOffHeapIntKey.java        |   14 +-
 .../VMThinDiskRegionEntryOffHeapLongKey.java       |   14 +-
 .../VMThinDiskRegionEntryOffHeapObjectKey.java     |   12 +-
 .../VMThinDiskRegionEntryOffHeapStringKey1.java    |   20 +-
 .../VMThinDiskRegionEntryOffHeapStringKey2.java    |   26 +-
 .../VMThinDiskRegionEntryOffHeapUUIDKey.java       |   20 +-
 .../entries/VMThinLRURegionEntryHeapIntKey.java    |   16 +-
 .../entries/VMThinLRURegionEntryHeapLongKey.java   |   16 +-
 .../entries/VMThinLRURegionEntryHeapObjectKey.java |   14 +-
 .../VMThinLRURegionEntryHeapStringKey1.java        |   22 +-
 .../VMThinLRURegionEntryHeapStringKey2.java        |   28 +-
 .../entries/VMThinLRURegionEntryHeapUUIDKey.java   |   22 +-
 .../entries/VMThinLRURegionEntryOffHeapIntKey.java |   14 +-
 .../VMThinLRURegionEntryOffHeapLongKey.java        |   14 +-
 .../VMThinLRURegionEntryOffHeapObjectKey.java      |   12 +-
 .../VMThinLRURegionEntryOffHeapStringKey1.java     |   20 +-
 .../VMThinLRURegionEntryOffHeapStringKey2.java     |   26 +-
 .../VMThinLRURegionEntryOffHeapUUIDKey.java        |   20 +-
 .../cache/entries/VMThinRegionEntryHeapIntKey.java |   10 +-
 .../entries/VMThinRegionEntryHeapLongKey.java      |   10 +-
 .../entries/VMThinRegionEntryHeapObjectKey.java    |    8 +-
 .../entries/VMThinRegionEntryHeapStringKey1.java   |   16 +-
 .../entries/VMThinRegionEntryHeapStringKey2.java   |   22 +-
 .../entries/VMThinRegionEntryHeapUUIDKey.java      |   16 +-
 .../entries/VMThinRegionEntryOffHeapIntKey.java    |    8 +-
 .../entries/VMThinRegionEntryOffHeapLongKey.java   |    8 +-
 .../entries/VMThinRegionEntryOffHeapObjectKey.java |    6 +-
 .../VMThinRegionEntryOffHeapStringKey1.java        |   14 +-
 .../VMThinRegionEntryOffHeapStringKey2.java        |   20 +-
 .../entries/VMThinRegionEntryOffHeapUUIDKey.java   |   14 +-
 ...VersionedStatsDiskLRURegionEntryHeapIntKey.java |   60 +-
 ...ersionedStatsDiskLRURegionEntryHeapLongKey.java |   60 +-
 ...sionedStatsDiskLRURegionEntryHeapObjectKey.java |   58 +-
 ...ionedStatsDiskLRURegionEntryHeapStringKey1.java |   66 +-
 ...ionedStatsDiskLRURegionEntryHeapStringKey2.java |   72 +-
 ...ersionedStatsDiskLRURegionEntryHeapUUIDKey.java |   66 +-
 ...sionedStatsDiskLRURegionEntryOffHeapIntKey.java |   58 +-
 ...ionedStatsDiskLRURegionEntryOffHeapLongKey.java |   58 +-
 ...nedStatsDiskLRURegionEntryOffHeapObjectKey.java |   56 +-
 ...edStatsDiskLRURegionEntryOffHeapStringKey1.java |   64 +-
 ...edStatsDiskLRURegionEntryOffHeapStringKey2.java |   70 +-
 ...ionedStatsDiskLRURegionEntryOffHeapUUIDKey.java |   64 +-
 .../VersionedStatsDiskRegionEntryHeapIntKey.java   |   52 +-
 .../VersionedStatsDiskRegionEntryHeapLongKey.java  |   52 +-
 ...VersionedStatsDiskRegionEntryHeapObjectKey.java |   50 +-
 ...ersionedStatsDiskRegionEntryHeapStringKey1.java |   58 +-
 ...ersionedStatsDiskRegionEntryHeapStringKey2.java |   64 +-
 .../VersionedStatsDiskRegionEntryHeapUUIDKey.java  |   58 +-
 ...VersionedStatsDiskRegionEntryOffHeapIntKey.java |   50 +-
 ...ersionedStatsDiskRegionEntryOffHeapLongKey.java |   50 +-
 ...sionedStatsDiskRegionEntryOffHeapObjectKey.java |   48 +-
 ...ionedStatsDiskRegionEntryOffHeapStringKey1.java |   56 +-
 ...ionedStatsDiskRegionEntryOffHeapStringKey2.java |   62 +-
 ...ersionedStatsDiskRegionEntryOffHeapUUIDKey.java |   56 +-
 .../VersionedStatsLRURegionEntryHeapIntKey.java    |   52 +-
 .../VersionedStatsLRURegionEntryHeapLongKey.java   |   52 +-
 .../VersionedStatsLRURegionEntryHeapObjectKey.java |   50 +-
 ...VersionedStatsLRURegionEntryHeapStringKey1.java |   58 +-
 ...VersionedStatsLRURegionEntryHeapStringKey2.java |   64 +-
 .../VersionedStatsLRURegionEntryHeapUUIDKey.java   |   58 +-
 .../VersionedStatsLRURegionEntryOffHeapIntKey.java |   50 +-
 ...VersionedStatsLRURegionEntryOffHeapLongKey.java |   50 +-
 ...rsionedStatsLRURegionEntryOffHeapObjectKey.java |   48 +-
 ...sionedStatsLRURegionEntryOffHeapStringKey1.java |   56 +-
 ...sionedStatsLRURegionEntryOffHeapStringKey2.java |   62 +-
 ...VersionedStatsLRURegionEntryOffHeapUUIDKey.java |   56 +-
 .../VersionedStatsRegionEntryHeapIntKey.java       |   46 +-
 .../VersionedStatsRegionEntryHeapLongKey.java      |   46 +-
 .../VersionedStatsRegionEntryHeapObjectKey.java    |   44 +-
 .../VersionedStatsRegionEntryHeapStringKey1.java   |   52 +-
 .../VersionedStatsRegionEntryHeapStringKey2.java   |   58 +-
 .../VersionedStatsRegionEntryHeapUUIDKey.java      |   52 +-
 .../VersionedStatsRegionEntryOffHeapIntKey.java    |   44 +-
 .../VersionedStatsRegionEntryOffHeapLongKey.java   |   44 +-
 .../VersionedStatsRegionEntryOffHeapObjectKey.java |   42 +-
 ...VersionedStatsRegionEntryOffHeapStringKey1.java |   50 +-
 ...VersionedStatsRegionEntryOffHeapStringKey2.java |   56 +-
 .../VersionedStatsRegionEntryOffHeapUUIDKey.java   |   50 +-
 .../VersionedThinDiskLRURegionEntryHeapIntKey.java |   50 +-
 ...VersionedThinDiskLRURegionEntryHeapLongKey.java |   50 +-
 ...rsionedThinDiskLRURegionEntryHeapObjectKey.java |   48 +-
 ...sionedThinDiskLRURegionEntryHeapStringKey1.java |   56 +-
 ...sionedThinDiskLRURegionEntryHeapStringKey2.java |   62 +-
 ...VersionedThinDiskLRURegionEntryHeapUUIDKey.java |   56 +-
 ...rsionedThinDiskLRURegionEntryOffHeapIntKey.java |   48 +-
 ...sionedThinDiskLRURegionEntryOffHeapLongKey.java |   48 +-
 ...onedThinDiskLRURegionEntryOffHeapObjectKey.java |   46 +-
 ...nedThinDiskLRURegionEntryOffHeapStringKey1.java |   54 +-
 ...nedThinDiskLRURegionEntryOffHeapStringKey2.java |   60 +-
 ...sionedThinDiskLRURegionEntryOffHeapUUIDKey.java |   54 +-
 .../VersionedThinDiskRegionEntryHeapIntKey.java    |   42 +-
 .../VersionedThinDiskRegionEntryHeapLongKey.java   |   42 +-
 .../VersionedThinDiskRegionEntryHeapObjectKey.java |   40 +-
 ...VersionedThinDiskRegionEntryHeapStringKey1.java |   48 +-
 ...VersionedThinDiskRegionEntryHeapStringKey2.java |   54 +-
 .../VersionedThinDiskRegionEntryHeapUUIDKey.java   |   48 +-
 .../VersionedThinDiskRegionEntryOffHeapIntKey.java |   40 +-
 ...VersionedThinDiskRegionEntryOffHeapLongKey.java |   40 +-
 ...rsionedThinDiskRegionEntryOffHeapObjectKey.java |   38 +-
 ...sionedThinDiskRegionEntryOffHeapStringKey1.java |   46 +-
 ...sionedThinDiskRegionEntryOffHeapStringKey2.java |   52 +-
 ...VersionedThinDiskRegionEntryOffHeapUUIDKey.java |   46 +-
 .../VersionedThinLRURegionEntryHeapIntKey.java     |   42 +-
 .../VersionedThinLRURegionEntryHeapLongKey.java    |   42 +-
 .../VersionedThinLRURegionEntryHeapObjectKey.java  |   40 +-
 .../VersionedThinLRURegionEntryHeapStringKey1.java |   48 +-
 .../VersionedThinLRURegionEntryHeapStringKey2.java |   54 +-
 .../VersionedThinLRURegionEntryHeapUUIDKey.java    |   48 +-
 .../VersionedThinLRURegionEntryOffHeapIntKey.java  |   40 +-
 .../VersionedThinLRURegionEntryOffHeapLongKey.java |   40 +-
 ...ersionedThinLRURegionEntryOffHeapObjectKey.java |   38 +-
 ...rsionedThinLRURegionEntryOffHeapStringKey1.java |   46 +-
 ...rsionedThinLRURegionEntryOffHeapStringKey2.java |   52 +-
 .../VersionedThinLRURegionEntryOffHeapUUIDKey.java |   46 +-
 .../VersionedThinRegionEntryHeapIntKey.java        |   36 +-
 .../VersionedThinRegionEntryHeapLongKey.java       |   36 +-
 .../VersionedThinRegionEntryHeapObjectKey.java     |   34 +-
 .../VersionedThinRegionEntryHeapStringKey1.java    |   42 +-
 .../VersionedThinRegionEntryHeapStringKey2.java    |   48 +-
 .../VersionedThinRegionEntryHeapUUIDKey.java       |   42 +-
 .../VersionedThinRegionEntryOffHeapIntKey.java     |   34 +-
 .../VersionedThinRegionEntryOffHeapLongKey.java    |   34 +-
 .../VersionedThinRegionEntryOffHeapObjectKey.java  |   32 +-
 .../VersionedThinRegionEntryOffHeapStringKey1.java |   40 +-
 .../VersionedThinRegionEntryOffHeapStringKey2.java |   46 +-
 .../VersionedThinRegionEntryOffHeapUUIDKey.java    |   40 +-
 .../internal/cache/event/BulkOperationHolder.java  |    6 +-
 .../cache/event/DistributedEventTracker.java       |   20 +-
 .../cache/event/EventSequenceNumberHolder.java     |   10 +-
 .../cache/eviction/AbstractEvictionController.java |    8 +-
 .../cache/eviction/AbstractEvictionList.java       |    2 +-
 .../internal/cache/eviction/CountLRUEviction.java  |    2 +-
 .../cache/eviction/CountLRUStatistics.java         |   20 +-
 .../cache/eviction/EvictionCountersImpl.java       |   44 +-
 .../cache/eviction/EvictionListBuilder.java        |   13 +-
 .../geode/internal/cache/eviction/HeapEvictor.java |   24 +-
 .../internal/cache/eviction/HeapLRUController.java |    3 +-
 .../internal/cache/eviction/HeapLRUStatistics.java |   18 +-
 .../cache/eviction/LRUListWithAsyncSorting.java    |    9 +-
 .../cache/eviction/LRUListWithSyncSorting.java     |    7 +-
 .../cache/eviction/MemoryLRUController.java        |   12 +-
 .../cache/eviction/MemoryLRUStatistics.java        |   20 +-
 .../internal/cache/eviction/RegionEvictorTask.java |   20 +-
 .../internal/cache/eviction/SizeLRUController.java |    6 +-
 .../internal/cache/execute/AbstractExecution.java  |    2 +-
 .../cache/execute/CachedResultCollector.java       |    4 +-
 .../cache/execute/DefaultResultCollector.java      |   10 +-
 .../execute/DistributedRegionFunctionExecutor.java |   92 +-
 .../DistributedRegionFunctionResultSender.java     |   96 +-
 .../DistributedRegionFunctionResultWaiter.java     |    8 +-
 .../cache/execute/FunctionContextImpl.java         |   30 +-
 .../cache/execute/FunctionExecutionNodePruner.java |   26 +-
 .../cache/execute/FunctionRemoteContext.java       |   60 +-
 .../execute/FunctionStreamingResultCollector.java  |  182 +-
 .../InternalFunctionInvocationTargetException.java |   10 +-
 .../cache/execute/LocalResultCollectorImpl.java    |   92 +-
 .../cache/execute/MemberFunctionResultSender.java  |   92 +-
 .../cache/execute/MemberFunctionResultWaiter.java  |    2 +-
 .../cache/execute/MemberMappedArgument.java        |   10 +-
 .../cache/execute/MultiRegionFunctionExecutor.java |   86 +-
 .../execute/MultiRegionFunctionResultWaiter.java   |    6 +-
 .../execute/PartitionedRegionFunctionExecutor.java |  195 +-
 .../PartitionedRegionFunctionResultSender.java     |  102 +-
 .../PartitionedRegionFunctionResultWaiter.java     |   20 +-
 .../cache/execute/RegionFunctionContextImpl.java   |   46 +-
 .../cache/execute/ResultCollectorHolder.java       |    2 +-
 .../cache/execute/ServerFunctionExecutor.java      |   14 +-
 .../execute/ServerRegionFunctionExecutor.java      |    4 +-
 .../ServerToClientFunctionResultSender.java        |  102 +-
 .../ServerToClientFunctionResultSender65.java      |   88 +-
 .../cache/execute/StreamingFunctionOperation.java  |   18 +-
 .../execute/metrics/FunctionServiceStats.java      |   58 +-
 .../cache/extension/SimpleExtensionPoint.java      |    2 +-
 .../geode/internal/cache/ha/HAContainerMap.java    |    8 +-
 .../geode/internal/cache/ha/HAContainerRegion.java |   14 +-
 .../geode/internal/cache/ha/HARegionQueue.java     | 1065 ++++---
 .../internal/cache/ha/HARegionQueueAttributes.java |    6 +-
 .../internal/cache/ha/HARegionQueueStats.java      |   52 +-
 .../internal/cache/ha/QueueRemovalMessage.java     |    4 +-
 .../cache/ha/QueueSynchronizationProcessor.java    |    2 +-
 .../geode/internal/cache/ha/ThreadIdentifier.java  |   29 +-
 .../cache/locks/TXLessorDepartureHandler.java      |    4 +-
 .../geode/internal/cache/locks/TXLockBatch.java    |   37 +-
 .../geode/internal/cache/locks/TXLockIdImpl.java   |   34 +-
 .../internal/cache/locks/TXLockServiceImpl.java    |   81 +-
 .../locks/TXLockUpdateParticipantsMessage.java     |   36 +-
 .../cache/locks/TXOriginatorRecoveryProcessor.java |   32 +-
 .../locks/TXRecoverGrantorMessageProcessor.java    |   11 +-
 .../internal/cache/map/AbstractRegionMapPut.java   |    2 +-
 .../internal/cache/map/RegionMapCommitPut.java     |   17 +-
 .../geode/internal/cache/map/RegionMapPut.java     |   38 +-
 .../AllBucketProfilesUpdateMessage.java            |   24 +-
 .../partitioned/BecomePrimaryBucketMessage.java    |   34 +-
 .../cache/partitioned/BucketCountLoadProbe.java    |    2 +-
 .../partitioned/BucketProfileUpdateMessage.java    |   36 +-
 .../cache/partitioned/BucketSizeMessage.java       |   32 +-
 .../cache/partitioned/ColocatedRegionDetails.java  |   19 +-
 .../cache/partitioned/ContainsKeyValueMessage.java |   46 +-
 .../cache/partitioned/CreateBucketMessage.java     |   28 +-
 .../partitioned/DeposePrimaryBucketMessage.java    |   16 +-
 .../internal/cache/partitioned/DestroyMessage.java |  181 +-
 .../internal/cache/partitioned/DumpB2NRegion.java  |   66 +-
 .../cache/partitioned/DumpBucketsMessage.java      |   16 +-
 .../partitioned/EndBucketCreationMessage.java      |    8 +-
 .../cache/partitioned/FetchBulkEntriesMessage.java |  112 +-
 .../cache/partitioned/FetchEntriesMessage.java     |   77 +-
 .../cache/partitioned/FetchEntryMessage.java       |   30 +-
 .../cache/partitioned/FetchKeysMessage.java        |  124 +-
 .../partitioned/FetchPartitionDetailsMessage.java  |  100 +-
 .../internal/cache/partitioned/FlushMessage.java   |   28 +-
 .../internal/cache/partitioned/GetMessage.java     |  102 +-
 .../cache/partitioned/IdentityRequestMessage.java  |   48 +-
 .../cache/partitioned/IdentityUpdateMessage.java   |   18 +-
 .../cache/partitioned/IndexCreationMsg.java        |   74 +-
 .../cache/partitioned/InterestEventMessage.java    |   20 +-
 .../cache/partitioned/InvalidateMessage.java       |   58 +-
 .../internal/cache/partitioned/LockObject.java     |    4 +-
 .../partitioned/ManageBackupBucketMessage.java     |   68 +-
 .../cache/partitioned/ManageBucketMessage.java     |   48 +-
 .../cache/partitioned/MoveBucketMessage.java       |   34 +-
 .../partitioned/OfflineMemberDetailsImpl.java      |    6 +-
 .../PRFunctionStreamingResultCollector.java        |  155 +-
 .../geode/internal/cache/partitioned/PRLoad.java   |   32 +-
 .../partitioned/PRLocallyDestroyedException.java   |    2 +-
 .../cache/partitioned/PRSanityCheckMessage.java    |   10 +-
 .../cache/partitioned/PRTombstoneMessage.java      |   22 +-
 .../partitioned/PRUpdateEntryVersionMessage.java   |   50 +-
 .../cache/partitioned/PartitionMemberInfoImpl.java |   52 +-
 .../cache/partitioned/PartitionMessage.java        |  118 +-
 .../PartitionMessageWithDirectReply.java           |   20 +-
 .../cache/partitioned/PartitionRegionInfoImpl.java |   46 +-
 .../PartitionedRegionFunctionStreamingMessage.java |   22 +-
 .../partitioned/PartitionedRegionRebalanceOp.java  |   27 +-
 .../partitioned/PersistentBucketRecoverer.java     |   13 +-
 .../cache/partitioned/PrimaryRequestMessage.java   |   20 +-
 .../cache/partitioned/PutAllPRMessage.java         |  148 +-
 .../internal/cache/partitioned/PutMessage.java     |  408 ++-
 .../internal/cache/partitioned/QueryMessage.java   |   88 +-
 .../internal/cache/partitioned/RegionAdvisor.java  |    2 +-
 .../cache/partitioned/RemoveAllPRMessage.java      |  148 +-
 .../cache/partitioned/RemoveBucketMessage.java     |   32 +-
 .../cache/partitioned/RemoveIndexesMessage.java    |   52 +-
 .../internal/cache/partitioned/SizeMessage.java    |   46 +-
 .../cache/partitioned/SizedBasedLoadProbe.java     |    4 +-
 .../partitioned/StreamingPartitionOperation.java   |   97 +-
 .../partitioned/rebalance/BucketOperatorImpl.java  |    2 +-
 .../rebalance/BucketOperatorWrapper.java           |   14 +-
 .../partitioned/rebalance/CompositeDirector.java   |   48 +-
 .../rebalance/ExplicitMoveDirector.java            |    4 +-
 .../cache/partitioned/rebalance/FPRDirector.java   |   16 +-
 .../partitioned/rebalance/MovePrimariesFPR.java    |    3 +-
 .../rebalance/ParallelBucketOperator.java          |   51 +-
 .../rebalance/PercentageMoveDirector.java          |    2 +-
 .../rebalance/SatisfyRedundancyFPR.java            |    2 +-
 .../cache/partitioned/rebalance/model/Bucket.java  |   40 +-
 .../partitioned/rebalance/model/BucketRollup.java  |    8 +-
 .../cache/partitioned/rebalance/model/Member.java  |   89 +-
 .../partitioned/rebalance/model/MemberRollup.java  |    6 +-
 .../cache/partitioned/rebalance/model/Move.java    |    6 +-
 .../model/PartitionedRegionLoadModel.java          |  309 +-
 .../partitioned/rebalance/model/RefusalReason.java |   15 +-
 .../internal/cache/persistence/BytesAndBits.java   |    8 +-
 .../cache/persistence/CanonicalIdHolder.java       |   15 +-
 .../CreatePersistentRegionProcessor.java           |    2 +-
 .../cache/persistence/DefaultDiskDirs.java         |    2 +-
 .../cache/persistence/DiskInitFileInterpreter.java |    5 +-
 .../cache/persistence/DiskInitFileParser.java      |   31 +-
 .../internal/cache/persistence/DiskRegionView.java |    2 +-
 .../cache/persistence/DiskStoreFilter.java         |    7 +-
 .../internal/cache/persistence/DiskStoreID.java    |   13 +-
 .../cache/persistence/MembershipFlushRequest.java  |    2 +-
 .../cache/persistence/MembershipViewRequest.java   |   14 +-
 .../cache/persistence/PRPersistentConfig.java      |    5 +-
 .../cache/persistence/PersistentMemberID.java      |   41 +-
 .../cache/persistence/PersistentMemberManager.java |   18 +-
 .../cache/persistence/PersistentMemberPattern.java |    5 +-
 .../cache/persistence/PersistentMemberState.java   |    2 +-
 .../persistence/PersistentMembershipView.java      |    6 +-
 .../persistence/PersistentStateQueryMessage.java   |    4 +-
 .../persistence/PersistentStateQueryResults.java   |   10 +-
 .../PrepareNewPersistentMemberMessage.java         |    2 +-
 .../persistence/RemovePersistentMemberMessage.java |    4 +-
 .../UninterruptibleRandomAccessFile.java           |  117 +-
 .../query/mock/CachedDeserializableComparator.java |    2 +-
 .../cache/persistence/query/mock/IndexMapImpl.java |   10 +-
 .../cache/persistence/query/mock/ItrAdapter.java   |    2 +-
 .../cache/persistence/query/mock/Pair.java         |   10 +-
 .../persistence/query/mock/PairComparator.java     |    4 +-
 .../persistence/query/mock/ResultListImpl.java     |    2 +-
 .../query/mock/SortedResultBagImpl.java            |    6 +-
 .../query/mock/SortedResultMapImpl.java            |    6 +-
 .../query/mock/SortedResultSetImpl.java            |    2 +-
 .../org/apache/geode/internal/cache/properties.md  |    2 +-
 .../internal/cache/snapshot/ClientExporter.java    |    8 +-
 .../internal/cache/snapshot/ExportedRegistry.java  |    8 +-
 .../internal/cache/snapshot/FlowController.java    |    2 +-
 .../geode/internal/cache/snapshot/GFSnapshot.java  |    2 +-
 .../cache/snapshot/RegionSnapshotServiceImpl.java  |   10 +-
 .../cache/snapshot/SnapshotOptionsImpl.java        |   10 +-
 .../internal/cache/snapshot/SnapshotPacket.java    |    2 +-
 .../internal/cache/snapshot/WindowedExporter.java  |   10 +-
 .../geode/internal/cache/tier/BatchException.java  |    6 +-
 .../internal/cache/tier/CachedRegionHelper.java    |   12 +-
 .../apache/geode/internal/cache/tier/Command.java  |    7 +-
 .../internal/cache/tier/CommunicationMode.java     |    8 +-
 .../geode/internal/cache/tier/Encryptor.java       |    3 +
 .../geode/internal/cache/tier/InterestType.java    |   28 +-
 .../cache/tier/InternalClientMembership.java       |   69 +-
 .../geode/internal/cache/tier/MessageType.java     |    7 +-
 .../internal/cache/tier/ServerSideHandshake.java   |    1 +
 .../internal/cache/tier/sockets/AcceptorImpl.java  |    6 +-
 .../geode/internal/cache/tier/sockets/AuthIds.java |    4 +-
 .../internal/cache/tier/sockets/BaseCommand.java   |  345 ++-
 .../cache/tier/sockets/BaseCommandQuery.java       |    8 +-
 .../cache/tier/sockets/CacheClientNotifier.java    |  193 +-
 .../tier/sockets/CacheClientNotifierStats.java     |   48 +-
 .../cache/tier/sockets/CacheClientProxy.java       |  698 ++---
 .../cache/tier/sockets/CacheClientProxyStats.java  |  122 +-
 .../cache/tier/sockets/CacheClientUpdater.java     |  249 +-
 .../cache/tier/sockets/CacheServerHelper.java      |    6 +-
 .../cache/tier/sockets/CacheServerStats.java       |  418 +--
 .../tier/sockets/ClientDenylistProcessor.java      |   30 +-
 .../cache/tier/sockets/ClientHealthMonitor.java    |   18 +-
 .../cache/tier/sockets/ClientInterestList.java     |   90 +-
 .../tier/sockets/ClientInterestMessageImpl.java    |   14 +-
 .../tier/sockets/ClientProxyMembershipID.java      |  278 +-
 .../tier/sockets/ClientReAuthenticateMessage.java  |  106 +
 .../tier/sockets/ClientRegistrationMetadata.java   |    2 +-
 .../cache/tier/sockets/ClientTombstoneMessage.java |   50 +-
 .../tier/sockets/ClientUpdateMessageImpl.java      |   23 +-
 .../cache/tier/sockets/ClientUserAuths.java        |  239 +-
 .../cache/tier/sockets/CommandInitializer.java     |    7 +-
 .../internal/cache/tier/sockets/EncryptorImpl.java |   40 +-
 .../cache/tier/sockets/HAEventWrapper.java         |   88 +-
 .../internal/cache/tier/sockets/Handshake.java     |   89 +-
 .../geode/internal/cache/tier/sockets/Message.java |  404 +--
 .../cache/tier/sockets/MessageDispatcher.java      |  290 +-
 .../cache/tier/sockets/ObjectPartList.java         |  117 +-
 .../cache/tier/sockets/ObjectPartList651.java      |  153 -
 .../tier/sockets/OldClientSupportService.java      |    1 -
 .../geode/internal/cache/tier/sockets/Part.java    |  168 +-
 .../tier/sockets/RandomSubjectIdGenerator.java     |   80 +
 .../sockets/RemoveClientFromDenylistMessage.java   |    8 +-
 .../tier/sockets/SerializedObjectPartList.java     |  127 -
 .../cache/tier/sockets/ServerConnection.java       |  339 ++-
 .../tier/sockets/ServerConnectionCollection.java   |    2 +-
 .../sockets/ServerInterestRegistrationMessage.java |   24 +-
 .../cache/tier/sockets/ServerQueueStatus.java      |   28 +-
 .../cache/tier/sockets/ServerResponseMatrix.java   |    4 +-
 .../tier/sockets/ServerSideHandshakeFactory.java   |    2 +-
 .../tier/sockets/ServerSideHandshakeImpl.java      |    8 +-
 .../cache/tier/sockets/SubjectIdGenerator.java     |   45 +
 .../cache/tier/sockets/UserAuthAttributes.java     |   18 +-
 .../cache/tier/sockets/VersionedObjectList.java    |  250 +-
 .../cache/tier/sockets/command/AddPdxEnum.java     |    6 +-
 .../cache/tier/sockets/command/AddPdxType.java     |    6 +-
 .../cache/tier/sockets/command/ClearRegion.java    |   12 +-
 .../cache/tier/sockets/command/ClientReady.java    |    7 +-
 .../tier/sockets/command/CloseConnection.java      |    9 +-
 .../cache/tier/sockets/command/CommitCommand.java  |    7 +-
 .../cache/tier/sockets/command/ContainsKey66.java  |    7 +-
 .../cache/tier/sockets/command/CreateRegion.java   |    7 +-
 .../cache/tier/sockets/command/Default.java        |    9 +-
 .../cache/tier/sockets/command/Destroy70.java      |   12 +-
 .../cache/tier/sockets/command/DestroyRegion.java  |   12 +-
 .../tier/sockets/command/ExecuteFunction70.java    |   11 +-
 .../sockets/command/ExecuteRegionFunction66.java   |   16 +-
 .../command/ExecuteRegionFunctionSingleHop.java    |   19 +-
 .../sockets/command/GatewayReceiverCommand.java    |  131 +-
 .../internal/cache/tier/sockets/command/Get70.java |   10 +-
 .../cache/tier/sockets/command/GetAll70.java       |   76 +-
 .../tier/sockets/command/GetAllWithCallback.java   |   21 +-
 .../command/GetClientPRMetadataCommand66.java      |   11 +-
 .../GetClientPartitionAttributesCommand66.java     |   12 +-
 .../tier/sockets/command/GetFunctionAttribute.java |    7 +-
 .../cache/tier/sockets/command/GetPDXEnumById.java |    7 +-
 .../tier/sockets/command/GetPDXIdForEnum.java      |    7 +-
 .../tier/sockets/command/GetPDXIdForType.java      |    7 +-
 .../cache/tier/sockets/command/GetPDXTypeById.java |    7 +-
 .../cache/tier/sockets/command/GetPdxEnums70.java  |    7 +-
 .../cache/tier/sockets/command/GetPdxTypes70.java  |    7 +-
 .../cache/tier/sockets/command/Invalid.java        |    9 +-
 .../cache/tier/sockets/command/Invalidate70.java   |   12 +-
 .../cache/tier/sockets/command/KeySet.java         |   12 +-
 .../cache/tier/sockets/command/MakePrimary.java    |    7 +-
 .../cache/tier/sockets/command/PeriodicAck.java    |    7 +-
 .../internal/cache/tier/sockets/command/Ping.java  |   10 +-
 .../internal/cache/tier/sockets/command/Put70.java |   13 +-
 .../cache/tier/sockets/command/PutAll80.java       |   15 +-
 .../tier/sockets/command/PutUserCredentials.java   |   76 +-
 .../internal/cache/tier/sockets/command/Query.java |    8 +-
 .../cache/tier/sockets/command/Query651.java       |    8 +-
 .../sockets/command/RegisterDataSerializers.java   |   11 +-
 .../sockets/command/RegisterInstantiators.java     |   11 +-
 .../tier/sockets/command/RegisterInterest61.java   |  111 +-
 .../sockets/command/RegisterInterestList66.java    |   41 +-
 .../cache/tier/sockets/command/RemoveAll.java      |   15 +-
 .../cache/tier/sockets/command/RemoveUserAuth.java |    9 +-
 .../tier/sockets/command/RequestEventValue.java    |   11 +-
 .../tier/sockets/command/RollbackCommand.java      |    7 +-
 .../internal/cache/tier/sockets/command/Size.java  |    8 +-
 .../tier/sockets/command/TXFailoverCommand.java    |    7 +-
 .../sockets/command/TXSynchronizationCommand.java  |    7 +-
 .../tier/sockets/command/UnregisterInterest.java   |   34 +-
 .../sockets/command/UnregisterInterestList.java    |    7 +-
 .../sockets/command/UpdateClientNotification.java  |    7 +-
 .../cache/tx/AbstractPeerTXRegionStub.java         |    4 +-
 .../internal/cache/tx/ClientTXRegionStub.java      |    8 +-
 .../geode/internal/cache/tx/ClientTXStateStub.java |   70 +-
 .../geode/internal/cache/tx/DistTxEntryEvent.java  |   99 +-
 .../geode/internal/cache/tx/DistTxKeyInfo.java     |    2 +-
 .../internal/cache/tx/DistributedTXRegionStub.java |    4 +-
 .../internal/cache/tx/PartitionedTXRegionStub.java |   40 +-
 .../internal/cache/tx/RemoteClearMessage.java      |   10 +-
 .../cache/tx/RemoteContainsKeyValueMessage.java    |   42 +-
 .../internal/cache/tx/RemoteDestroyMessage.java    |  175 +-
 .../internal/cache/tx/RemoteFetchEntryMessage.java |   39 +-
 .../internal/cache/tx/RemoteFetchKeysMessage.java  |   40 +-
 .../cache/tx/RemoteFetchVersionMessage.java        |   14 +-
 .../geode/internal/cache/tx/RemoteGetMessage.java  |   60 +-
 .../internal/cache/tx/RemoteInvalidateMessage.java |   48 +-
 .../internal/cache/tx/RemoteOperationMessage.java  |   86 +-
 .../tx/RemoteOperationMessageWithDirectReply.java  |    2 +-
 .../internal/cache/tx/RemotePutAllMessage.java     |  142 +-
 .../geode/internal/cache/tx/RemotePutMessage.java  |  287 +-
 .../internal/cache/tx/RemoteRemoveAllMessage.java  |  140 +-
 .../geode/internal/cache/tx/RemoteSizeMessage.java |   21 +-
 .../internal/cache/tx/TransactionalOperation.java  |   33 +-
 .../cache/versions/BitSetExceptionIterator.java    |    4 +-
 .../cache/versions/CompactVersionHolder.java       |   34 +-
 .../internal/cache/versions/DiskVersionTag.java    |    2 +-
 .../internal/cache/versions/RVVException.java      |   10 +-
 .../internal/cache/versions/RVVExceptionB.java     |  112 +-
 .../internal/cache/versions/RVVExceptionT.java     |   96 +-
 .../cache/versions/RegionVersionHolder.java        |  210 +-
 .../cache/versions/RegionVersionVector.java        |  365 ++-
 .../geode/internal/cache/versions/VersionTag.java  |  132 +-
 .../internal/cache/wan/AbstractGatewaySender.java  |  585 ++--
 .../wan/AbstractGatewaySenderEventProcessor.java   |  497 ++-
 .../geode/internal/cache/wan/BatchException70.java |   16 +-
 .../internal/cache/wan/GatewayReceiverStats.java   |  124 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  265 +-
 .../cache/wan/GatewaySenderAttributes.java         |   78 +-
 .../wan/GatewaySenderEventCallbackArgument.java    |   32 +-
 .../wan/GatewaySenderEventCallbackDispatcher.java  |   35 +-
 .../cache/wan/GatewaySenderEventDispatcher.java    |    9 +
 .../internal/cache/wan/GatewaySenderEventImpl.java |  552 ++--
 ...aySenderQueueEntrySynchronizationOperation.java |   65 +-
 .../internal/cache/wan/GatewaySenderStats.java     |  152 +-
 .../cache/wan/InternalGatewayQueueEvent.java       |   38 -
 .../cache/wan/InternalGatewaySenderFactory.java    |    8 +
 .../cache/wan/TransportFilterServerSocket.java     |    6 +-
 .../internal/cache/wan/TransportFilterSocket.java  |   10 +-
 .../cache/wan/TransportFilterSocketFactory.java    |    2 +-
 ...currentParallelGatewaySenderEventProcessor.java |   89 +-
 .../ConcurrentParallelGatewaySenderQueue.java      |   44 +-
 .../ParallelGatewaySenderEventProcessor.java       |   76 +-
 .../wan/parallel/ParallelGatewaySenderQueue.java   |  449 +--
 .../wan/parallel/ParallelQueueRemovalMessage.java  |   26 +-
 ...tilParallelGatewaySenderFlushedCoordinator.java |   32 +-
 .../cache/wan/serial/BatchDestroyOperation.java    |   44 +-
 ...oncurrentSerialGatewaySenderEventProcessor.java |  106 +-
 .../serial/SerialGatewaySenderEventProcessor.java  |  292 +-
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  431 ++-
 .../wan/serial/SerialSecondaryGatewayListener.java |   27 +-
 .../internal/cache/xmlcache/AbstractXmlParser.java |    2 +-
 .../cache/xmlcache/AsyncEventQueueCreation.java    |   92 +-
 .../internal/cache/xmlcache/BindingCreation.java   |    6 +-
 .../internal/cache/xmlcache/CacheCreation.java     |    3 +-
 .../cache/xmlcache/CacheServerCreation.java        |   54 +-
 .../xmlcache/CacheTransactionManagerCreation.java  |   24 +-
 .../internal/cache/xmlcache/CacheXmlGenerator.java |    2 +-
 .../internal/cache/xmlcache/CacheXmlParser.java    |  272 +-
 .../cache/xmlcache/CacheXmlPropertyResolver.java   |    4 +-
 .../xmlcache/CacheXmlPropertyResolverHelper.java   |   20 +-
 .../internal/cache/xmlcache/CacheXmlVersion.java   |    2 +-
 .../cache/xmlcache/ClientCacheCreation.java        |   16 +-
 .../cache/xmlcache/ClientHaQueueCreation.java      |   24 +-
 .../xmlcache/DiskStoreAttributesCreation.java      |  103 +-
 .../cache/xmlcache/FunctionServiceCreation.java    |    8 +-
 .../cache/xmlcache/GatewayReceiverCreation.java    |   46 +-
 .../internal/cache/xmlcache/IndexCreationData.java |   14 +-
 .../cache/xmlcache/RegionAttributesCreation.java   |  419 ++-
 .../internal/cache/xmlcache/RegionCreation.java    |  120 +-
 .../cache/xmlcache/ResourceManagerCreation.java    |   48 +-
 .../cache/xmlcache/SerializerCreation.java         |    8 +-
 .../internal/cache/xmlcache/XmlGeneratorUtils.java |    5 +-
 .../internal/classloader/ClassPathLoader.java      |    4 +-
 .../internal/classloader/ClasspathService.java     |    2 +-
 .../DeployJarChildFirstClassLoader.java            |    7 +-
 .../concurrent/CompactConcurrentHashSet2.java      |   98 +-
 .../org/apache/geode/internal/concurrent/LI.java   |    5 +-
 .../apache/geode/internal/config/JAXBService.java  |    6 +-
 .../internal/datasource/AbstractDataSource.java    |    2 +-
 .../internal/datasource/AbstractPoolCache.java     |   84 +-
 .../datasource/ClientConnectionFactoryWrapper.java |   14 +-
 .../geode/internal/datasource/ConfigProperty.java  |    6 +-
 .../datasource/ConfiguredDataSourceProperties.java |    6 +-
 .../datasource/ConnectionPoolCacheImpl.java        |    2 +-
 .../datasource/ConnectionProviderException.java    |    2 +-
 .../internal/datasource/DataSourceFactory.java     |   36 +-
 .../datasource/FacetsJCAConnectionManagerImpl.java |    8 +-
 .../datasource/GemFireBasicDataSource.java         |    2 +-
 .../datasource/GemFireTransactionDataSource.java   |   11 +-
 .../internal/datasource/ManagedPoolCacheImpl.java  |    6 +-
 .../internal/deployment/JarDeploymentService.java  |   16 +-
 .../i18n/AbstractStringIdResourceBundle.java       |   13 +-
 .../geode/internal/io/CompositeOutputStream.java   |   45 +-
 .../geode/internal/io/CompositePrintStream.java    |   12 +-
 .../io/MainWithChildrenRollingFileHandler.java     |   31 +-
 .../apache/geode/internal/jndi/ContextImpl.java    |   22 +-
 .../internal/jndi/InitialContextFactoryImpl.java   |    6 +-
 .../apache/geode/internal/jndi/JNDIInvoker.java    |   19 +-
 .../geode/internal/jta/GlobalTransaction.java      |   73 +-
 .../apache/geode/internal/jta/TransactionImpl.java |    9 +-
 .../geode/internal/jta/TransactionManagerImpl.java |   36 +-
 .../org/apache/geode/internal/jta/XidImpl.java     |    8 +-
 .../org/apache/geode/internal/lang/ClassUtils.java |  143 -
 .../apache/geode/internal/lang/StringUtils.java    |   12 +-
 .../geode/internal/lang/SystemPropertyHelper.java  |   89 +-
 .../apache/geode/internal/lang/SystemUtils.java    |   10 +-
 .../org/apache/geode/internal/logging/Banner.java  |   11 +-
 .../internal/logging/CoreLoggingExecutors.java     |    2 +-
 .../geode/internal/logging/InternalLogWriter.java  |    2 +-
 .../geode/internal/logging/LogFileParser.java      |   16 +-
 .../geode/internal/logging/LogWriterImpl.java      |    8 +-
 .../geode/internal/logging/MergeLogFiles.java      |    2 +-
 .../geode/internal/logging/SecurityLogWriter.java  |    4 +-
 .../internal/logging/SecurityManagerLogWriter.java |    4 +-
 .../internal/modules/util/RegionConfiguration.java |   62 +-
 .../internal/monitoring/ThreadsMonitoring.java     |   16 +-
 .../internal/monitoring/ThreadsMonitoringImpl.java |   16 +-
 .../monitoring/ThreadsMonitoringProcess.java       |    4 +-
 .../monitoring/executor/AbstractExecutor.java      |   18 +-
 .../org/apache/geode/internal/net/BufferPool.java  |    6 +-
 .../geode/internal/net/ByteBufferVendor.java       |    9 +
 .../apache/geode/internal/net/NioSslEngine.java    |    7 +-
 .../org/apache/geode/internal/net/SSLConfig.java   |   55 +-
 .../apache/geode/internal/net/SocketCloser.java    |   18 +-
 .../apache/geode/internal/net/SocketCreator.java   |   39 +-
 .../geode/internal/net/SocketCreatorFactory.java   |    2 +-
 .../net/filewatch/ExtendedAliasKeyManager.java     |   20 +-
 .../FileWatchingX509ExtendedKeyManager.java        |   24 +-
 .../FileWatchingX509ExtendedTrustManager.java      |   24 +-
 .../internal/net/filewatch/PollingFileWatcher.java |    4 +-
 .../internal/offheap/AbstractStoredObject.java     |    4 +-
 .../internal/offheap/AddressableMemoryManager.java |    6 +-
 .../apache/geode/internal/offheap/Fragment.java    |   10 +-
 .../geode/internal/offheap/FreeListManager.java    |  193 +-
 .../geode/internal/offheap/LifecycleListener.java  |   12 +-
 .../internal/offheap/MemoryAllocatorImpl.java      |  119 +-
 .../geode/internal/offheap/MemoryBlockNode.java    |   40 +-
 .../internal/offheap/MemoryInspectorImpl.java      |   16 +-
 .../geode/internal/offheap/OffHeapStorage.java     |   62 +-
 .../internal/offheap/OffHeapStoredObject.java      |   60 +-
 .../offheap/OffHeapStoredObjectAddressStack.java   |   28 +-
 .../internal/offheap/OffHeapStoredObjectSlice.java |   10 +-
 .../offheap/OffHeapStoredObjectWithHeapForm.java   |    2 +-
 .../geode/internal/offheap/RefCountChangeInfo.java |   40 +-
 .../apache/geode/internal/offheap/SlabImpl.java    |   18 +-
 .../geode/internal/offheap/TinyStoredObject.java   |   12 +-
 .../offheap/annotations/OffHeapIdentifier.java     |    2 +-
 .../internal/process/ControlFileWatchdog.java      |   15 +-
 .../internal/process/FileProcessController.java    |    2 +-
 .../internal/process/LocalProcessLauncher.java     |    2 +-
 .../org/apache/geode/internal/process/PidFile.java |    4 +-
 .../internal/process/ProcessControllerFactory.java |    2 +-
 .../internal/process/ProcessStreamReader.java      |   10 +-
 .../apache/geode/internal/process/ProcessType.java |   16 +-
 .../geode/internal/process/ProcessUtils.java       |    2 +-
 .../signal/AbstractSignalNotificationHandler.java  |    2 +-
 .../geode/internal/process/signal/SignalEvent.java |    8 +-
 .../geode/internal/security/AuthorizeRequest.java  |  321 +-
 .../internal/security/AuthorizeRequestPP.java      |   94 +-
 .../security/IntegratedSecurityService.java        |   48 +-
 .../internal/security/LegacySecurityService.java   |   12 +-
 .../security/shiro/JMXShiroAuthenticator.java      |    2 +-
 .../security/shiro/SecurityManagerProvider.java    |    6 +-
 .../internal/security/shiro/ShiroPrincipal.java    |    2 +-
 .../geode/internal/sequencelog/EntryLogger.java    |    6 +-
 .../geode/internal/sequencelog/GraphType.java      |    2 +-
 .../internal/sequencelog/SequenceLoggerImpl.java   |    6 +-
 .../geode/internal/sequencelog/Transition.java     |    2 +-
 .../sequencelog/io/GemfireLogConverter.java        |    4 +-
 .../geode/internal/sequencelog/io/GraphReader.java |    2 +-
 .../internal/sequencelog/io/InputStreamReader.java |    6 +-
 .../sequencelog/io/OutputStreamAppender.java       |   19 +-
 .../geode/internal/sequencelog/model/Edge.java     |    9 +-
 .../geode/internal/sequencelog/model/Graph.java    |   14 +-
 .../geode/internal/sequencelog/model/GraphID.java  |   10 +-
 .../geode/internal/sequencelog/model/GraphSet.java |   22 +-
 .../geode/internal/sequencelog/model/Vertex.java   |   17 +-
 .../internal/shared/NativeErrorException.java      |    2 +-
 .../geode/internal/shared/StringPrintWriter.java   |   61 +-
 .../internal/size/CachingSingleObjectSizer.java    |   10 +-
 .../geode/internal/size/ObjectGraphSizer.java      |   22 +-
 .../geode/internal/size/ObjectTraverser.java       |   17 +-
 .../geode/internal/size/ReflectionObjectSizer.java |   29 +-
 .../internal/size/ReflectionSingleObjectSizer.java |   23 +-
 .../internal/size/SizeClassOnceObjectSizer.java    |    6 +-
 .../geode/internal/size/WellKnownClassSizer.java   |    8 +-
 .../statistics/AbstractStatisticsFactory.java      |   45 +-
 .../geode/internal/statistics/ArchiveSplitter.java |  124 +-
 .../geode/internal/statistics/CallbackSampler.java |    4 +-
 .../geode/internal/statistics/CounterMonitor.java  |    6 +-
 .../internal/statistics/DummyStatisticsImpl.java   |   12 +-
 .../geode/internal/statistics/GaugeMonitor.java    |    4 +-
 .../internal/statistics/GemFireStatSampler.java    |    2 +-
 .../geode/internal/statistics/HostStatSampler.java |   82 +-
 .../statistics/IgnoreResourceException.java        |    4 +-
 .../statistics/LocalStatisticsFactory.java         |   20 +-
 .../internal/statistics/LocalStatisticsImpl.java   |   46 +-
 .../statistics/MapBasedStatisticsNotification.java |   20 +-
 .../internal/statistics/ResourceInstance.java      |   40 +-
 .../geode/internal/statistics/ResourceType.java    |   22 +-
 .../geode/internal/statistics/SampleCollector.java |  178 +-
 .../internal/statistics/SimpleStatSampler.java     |   20 +-
 .../internal/statistics/SimpleStatisticId.java     |    4 +-
 .../internal/statistics/StatArchiveDescriptor.java |   46 +-
 .../internal/statistics/StatArchiveHandler.java    |  139 +-
 .../internal/statistics/StatArchiveReader.java     |  556 ++--
 .../internal/statistics/StatArchiveWriter.java     |  354 ++-
 .../internal/statistics/StatMonitorHandler.java    |   90 +-
 .../internal/statistics/StatSamplerStats.java      |   50 +-
 .../statistics/StatisticDescriptorImpl.java        |   60 +-
 .../statistics/StatisticNotFoundException.java     |    4 +-
 .../statistics/StatisticsClockFactory.java         |    6 +-
 .../internal/statistics/StatisticsMonitor.java     |   34 +-
 .../statistics/StatisticsTypeFactoryImpl.java      |    6 +-
 .../internal/statistics/StatisticsTypeImpl.java    |   28 +-
 .../internal/statistics/StatisticsTypeXml.java     |    8 +-
 .../internal/statistics/StripedStatisticsImpl.java |    8 +-
 .../apache/geode/internal/statistics/VMStats.java  |   12 +-
 .../geode/internal/statistics/ValueMonitor.java    |    9 +-
 .../statistics/platform/LinuxProcFsStatistics.java |    1 -
 .../internal/statistics/platform/ProcessStats.java |    4 +-
 .../apache/geode/internal/stats50/VMStats50.java   |  104 +-
 .../apache/geode/internal/tcp/BaseMsgStreamer.java |   10 +-
 .../geode/internal/tcp/ByteBufferInputStream.java  |  280 +-
 .../geode/internal/tcp/ConnectExceptions.java      |   22 +-
 .../org/apache/geode/internal/tcp/Connection.java  |  394 ++-
 .../apache/geode/internal/tcp/ConnectionTable.java |  216 +-
 .../geode/internal/tcp/DirectReplySender.java      |   56 +-
 .../apache/geode/internal/tcp/MsgDestreamer.java   |  117 +-
 .../apache/geode/internal/tcp/MsgOutputStream.java |   50 +-
 .../org/apache/geode/internal/tcp/MsgReader.java   |   14 +-
 .../org/apache/geode/internal/tcp/MsgStreamer.java |  430 ++-
 .../apache/geode/internal/tcp/MsgStreamerList.java |   77 +-
 .../tcp/VersionedByteBufferInputStream.java        |    4 +-
 .../geode/internal/tcp/VersionedMsgStreamer.java   |   21 +-
 .../geode/internal/util/AbortableTaskService.java  |    6 +-
 .../geode/internal/util/ArgumentRedactor.java      |  216 +-
 .../apache/geode/internal/util/Breadcrumbs.java    |    8 +-
 .../geode/internal/util/CollectionUtils.java       |   19 +-
 .../apache/geode/internal/util/DriverJarUtils.java |   18 +-
 .../org/apache/geode/internal/util/HostName.java   |    2 +-
 .../geode/internal/util/JavaCommandBuilder.java    |   14 +-
 .../apache/geode/internal/util/PluckStacks.java    |   31 +-
 .../geode/internal/util/ProductVersionUtil.java    |   72 +
 .../org/apache/geode/internal/util/StopWatch.java  |   24 +-
 .../apache/geode/internal/util/TransformUtils.java |   53 +-
 .../geode/internal/util/VersionedArrayList.java    |   60 +-
 .../util/concurrent/CopyOnWriteHashMap.java        |   12 +-
 .../util/concurrent/CopyOnWriteWeakHashMap.java    |   12 +-
 .../concurrent/CustomEntryConcurrentHashMap.java   |  348 ++-
 .../util/concurrent/ReentrantSemaphore.java        |   10 +-
 .../util/concurrent/SemaphoreReadWriteLock.java    |    4 +-
 .../util/concurrent/StoppableCondition.java        |    2 +-
 .../util/concurrent/StoppableReentrantLock.java    |    4 +-
 .../StoppableReentrantReadWriteLock.java           |    4 +-
 .../redaction/CombinedSensitiveDictionary.java     |   41 +
 .../geode/internal/util/redaction/ParserRegex.java |   93 +
 .../internal/util/redaction/RedactionDefaults.java |   58 +
 .../internal/util/redaction/RedactionStrategy.java |   51 +
 .../util/redaction/RegexRedactionStrategy.java     |   50 +
 .../util/redaction/SensitiveDataDictionary.java    |   32 +
 .../util/redaction/SensitivePrefixDictionary.java  |   37 +
 .../redaction/SensitiveSubstringDictionary.java    |   37 +
 .../internal/util/redaction/StringRedaction.java   |  123 +
 .../geode/logging/internal/Configuration.java      |    6 +-
 .../logging/internal/LoggingProviderLoader.java    |    5 +-
 .../geode/management/ClientHealthStatus.java       |    6 +-
 .../apache/geode/management/DiskBackupResult.java  |    6 +-
 .../geode/management/EvictionAttributesData.java   |   16 +-
 .../management/FixedPartitionAttributesData.java   |    6 +-
 .../apache/geode/management/GemFireProperties.java |    6 +-
 .../geode/management/JMXNotificationType.java      |    4 +-
 .../org/apache/geode/management/JVMMetrics.java    |   14 +-
 .../geode/management/MembershipAttributesData.java |    6 +-
 .../org/apache/geode/management/OSMetrics.java     |   26 +-
 .../geode/management/PartitionAttributesData.java  |   20 +-
 .../geode/management/PersistentMemberDetails.java  |    6 +-
 .../geode/management/RegionAttributesData.java     |   66 +-
 .../apache/geode/management/ServerLoadData.java    |    8 +-
 .../geode/management/internal/AgentUtil.java       |    2 +-
 .../geode/management/internal/AlertDetails.java    |   28 +-
 .../management/internal/BackupStatusImpl.java      |    4 +-
 .../management/internal/BaseManagementService.java |   13 +-
 .../management/internal/CompositeConverter.java    |    2 +-
 .../management/internal/DiskBackupStatusImpl.java  |    6 +-
 .../management/internal/FederationComponent.java   |   38 +-
 .../geode/management/internal/FilterParam.java     |    8 +-
 .../internal/GeodeRemoteStreamExporter.java        |   10 +-
 .../management/internal/JmxManagerAdvisee.java     |   24 +-
 .../management/internal/JmxManagerAdvisor.java     |  101 +-
 .../management/internal/JmxManagerLocator.java     |   24 +-
 .../internal/JmxManagerLocatorResponse.java        |   24 +-
 .../internal/JmxRmiOpenTypesSerialFilter.java      |  148 -
 .../management/internal/JmxRmiSerialFilter.java    |   21 -
 .../geode/management/internal/MBeanJMXAdapter.java |   17 +-
 .../internal/MBeanProxyInfoRepository.java         |   14 +-
 .../geode/management/internal/ManagementAgent.java |  159 +-
 .../internal/ManagementAgentFactory.java           |    3 +-
 .../internal/ManagementCacheListener.java          |    4 +-
 .../management/internal/ManagementFunction.java    |   15 +-
 .../internal/ManagementMembershipListener.java     |    2 +-
 .../internal/ManagementResourceRepo.java           |    8 +-
 .../internal/MonitoringRegionCacheListener.java    |    4 +-
 .../internal/NotificationCacheListener.java        |    4 +-
 .../geode/management/internal/NotificationHub.java |   16 +-
 .../management/internal/NotificationHubClient.java |    2 +-
 .../geode/management/internal/NotificationKey.java |   19 +-
 .../geode/management/internal/OpenMethod.java      |    2 +-
 .../management/internal/OpenTypeConverter.java     |   19 +-
 .../geode/management/internal/ProxyInfo.java       |    4 +-
 .../geode/management/internal/RestAgent.java       |    8 +-
 .../management/internal/StringBasedFilter.java     |   10 +-
 .../internal/SystemManagementService.java          |    9 +-
 .../internal/api/GeodeConnectionConfig.java        |    3 +-
 .../internal/beans/AsyncEventQueueMBean.java       |    2 +-
 .../internal/beans/AsyncEventQueueMBeanBridge.java |   10 +-
 .../management/internal/beans/BeanUtilFuncs.java   |    9 +-
 .../internal/beans/CacheServerBridge.java          |   57 +-
 .../internal/beans/CacheServerMBean.java           |    2 +-
 .../management/internal/beans/DataQueryEngine.java |    6 +-
 .../internal/beans/DiskRegionBridge.java           |   14 +-
 .../management/internal/beans/DiskStoreMBean.java  |    2 +-
 .../internal/beans/DiskStoreMBeanBridge.java       |   30 +-
 .../beans/DistributedLockServiceBridge.java        |   12 +-
 .../beans/DistributedLockServiceMBean.java         |    2 +-
 .../internal/beans/DistributedRegionBridge.java    |   52 +-
 .../internal/beans/DistributedSystemBridge.java    |   68 +-
 .../internal/beans/DistributedSystemMBean.java     |    2 +-
 .../management/internal/beans/FileUploader.java    |    6 +-
 .../internal/beans/GatewayReceiverMBean.java       |    2 +-
 .../internal/beans/GatewaySenderMBean.java         |    2 +-
 .../internal/beans/GatewaySenderMBeanBridge.java   |   28 +-
 .../management/internal/beans/LocatorMBean.java    |    2 +-
 .../internal/beans/LocatorMBeanBridge.java         |   12 +-
 .../internal/beans/LockServiceMBean.java           |    2 +-
 .../internal/beans/LockServiceMBeanBridge.java     |    6 +-
 .../management/internal/beans/MBeanAggregator.java |   28 +-
 .../management/internal/beans/ManagerMBean.java    |    2 +-
 .../internal/beans/ManagerMBeanBridge.java         |    4 +-
 .../management/internal/beans/MemberMBean.java     |    2 +-
 .../internal/beans/MemberMBeanBridge.java          |    6 +-
 .../internal/beans/MetricsCalculator.java          |    2 +-
 .../internal/beans/PartitionedRegionBridge.java    |   22 +-
 .../internal/beans/QueryDataFunction.java          |    8 +-
 .../management/internal/beans/RegionMBean.java     |    2 +-
 .../internal/beans/RegionMBeanBridge.java          |   52 +-
 .../beans/RegionMBeanCompositeDataFactory.java     |    7 +-
 .../management/internal/beans/ServerBridge.java    |    6 +-
 .../internal/beans/stats/GCStatsMonitor.java       |    4 +-
 .../stats/GatewayReceiverClusterStatsMonitor.java  |    8 +-
 .../stats/GatewaySenderClusterStatsMonitor.java    |    8 +-
 .../beans/stats/IntegerStatsDeltaAggregator.java   |    8 +-
 .../beans/stats/LongStatsDeltaAggregator.java      |    8 +-
 .../internal/beans/stats/MBeanStatsMonitor.java    |    6 +-
 .../beans/stats/MemberClusterStatsMonitor.java     |   14 +-
 .../beans/stats/MemberLevelDiskMonitor.java        |    2 +-
 .../beans/stats/RegionClusterStatsMonitor.java     |   22 +-
 .../beans/stats/ServerClusterStatsMonitor.java     |    8 +-
 .../internal/beans/stats/StatsAggregator.java      |   32 +-
 .../internal/beans/stats/StatsAverageLatency.java  |    8 +-
 .../internal/beans/stats/StatsLatency.java         |    8 +-
 .../management/internal/beans/stats/StatsRate.java |    8 +-
 .../configuration/domain/CacheElement.java         |    2 +-
 .../configuration/domain/Configuration.java        |   54 +-
 .../domain/ConfigurationChangeResult.java          |   27 +-
 .../internal/configuration/domain/XmlEntity.java   |    2 -
 .../messages/ConfigurationResponse.java            |   21 +-
 .../SharedConfigurationStatusResponse.java         |    8 +-
 .../configuration/mutators/DeploymentManager.java  |    9 +-
 .../realizers/DeploymentRealizer.java              |    2 +-
 .../realizers/GatewayReceiverRealizer.java         |   10 +-
 .../configuration/realizers/IndexRealizer.java     |    2 +-
 .../realizers/RegionConfigRealizer.java            |   37 +-
 .../internal/configuration/utils/XmlUtils.java     |   10 +-
 .../internal/configuration/utils/ZipUtils.java     |    6 +-
 .../validators/DeploymentValidator.java            |    3 +-
 .../configuration/validators/MemberValidator.java  |    6 +-
 .../validators/RegionConfigValidator.java          |    2 +-
 .../functions/CacheRealizationFunction.java        |    4 +-
 .../internal/functions/CliFunctionResult.java      |  125 +-
 .../functions/GetMemberInformationFunction.java    |    4 +-
 .../geode/management/internal/i18n/CliStrings.java |   33 +-
 .../internal/json/AbstractJSONFormatter.java       |    8 +-
 .../internal/json/QueryResultFormatter.java        |    8 +-
 .../internal/messages/CompactRequest.java          |   12 +-
 .../internal/messages/CompactResponse.java         |    4 +-
 .../operation/OperationHistoryManager.java         |   16 +-
 .../internal/operation/OperationManager.java       |    2 +-
 .../internal/operation/OperationState.java         |   31 +-
 .../internal/security/AccessControlMBean.java      |    2 +-
 .../internal/security/MBeanServerWrapper.java      |    8 +-
 .../unsafe/ReadOpFileAccessController.java         |    2 +-
 .../management/internal/util/ManagementUtils.java  |   35 +-
 .../geode/management/internal/util/RegionPath.java |    4 +-
 .../internal/web/domain/QueryParameterSource.java  |    8 +-
 .../UniversalMembershipListenerAdapter.java        |   38 +-
 .../metrics/internal/CompoundMeterBinder.java      |    2 +-
 .../InternalDistributedSystemMetricsService.java   |    6 +-
 .../internal/SSLParameterExtensionContextImpl.java |    2 +-
 .../main/java/org/apache/geode/pdx/FieldType.java  |   12 +-
 .../java/org/apache/geode/pdx/JSONFormatter.java   |    4 +-
 .../geode/pdx/ReflectionBasedAutoSerializer.java   |   24 +-
 .../pdx/internal/AutoSerializableManager.java      |  211 +-
 .../geode/pdx/internal/CheckTypeRegistryState.java |    4 +-
 .../geode/pdx/internal/ClientTypeRegistration.java |    4 +-
 .../java/org/apache/geode/pdx/internal/EnumId.java |   15 +-
 .../org/apache/geode/pdx/internal/EnumInfo.java    |   82 +-
 .../geode/pdx/internal/LonerTypeRegistration.java  |    8 +-
 .../org/apache/geode/pdx/internal/PdxField.java    |   87 +-
 .../apache/geode/pdx/internal/PdxInstanceEnum.java |   46 +-
 .../geode/pdx/internal/PdxInstanceFactoryImpl.java |   74 +-
 .../apache/geode/pdx/internal/PdxInstanceImpl.java |   28 +-
 .../apache/geode/pdx/internal/PdxOutputStream.java |   66 +-
 .../apache/geode/pdx/internal/PdxReaderImpl.java   |   94 +-
 .../org/apache/geode/pdx/internal/PdxString.java   |   30 +-
 .../org/apache/geode/pdx/internal/PdxType.java     |  139 +-
 .../apache/geode/pdx/internal/PdxUnreadData.java   |   20 +-
 .../apache/geode/pdx/internal/PdxWriterImpl.java   |  276 +-
 .../geode/pdx/internal/PeerTypeRegistration.java   |    5 +-
 .../geode/pdx/internal/TrackingPdxReaderImpl.java  |  254 +-
 .../apache/geode/pdx/internal/TypeRegistry.java    |  169 +-
 .../apache/geode/pdx/internal/UnreadPdxType.java   |    6 +-
 .../internal/WeakConcurrentIdentityHashMap.java    |   12 +-
 .../pdx/internal/WritablePdxInstanceImpl.java      |   16 +-
 .../apache/geode/pdx/internal/json/JsonHelper.java |   49 +-
 .../geode/pdx/internal/json/PdxInstanceHelper.java |    2 +-
 .../pdx/internal/json/PdxInstanceSortedHelper.java |   15 +-
 .../apache/geode/pdx/internal/json/PdxToJSON.java  |   55 +-
 .../org/apache/geode/security/AuthInitialize.java  |    2 +-
 .../security/AuthenticationExpiredException.java   |   32 +
 .../geode/security/GemFireSecurityException.java   |   10 +-
 .../geode/security/NotAuthorizedException.java     |    8 +-
 .../apache/geode/security/ResourcePermission.java  |    8 +-
 .../org/apache/geode/security/SecurityManager.java |   12 +-
 .../apache/geode/services/result/impl/Failure.java |    2 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 ....apache.geode.internal.version.ComponentVersion |   16 +
 .../sanctioned-geode-core-serializables.txt        |    8 +-
 .../tools/gfsh/app/windowsbindings.properties      |   40 +-
 .../BaseLineAndCompareQueryPerfJUnitTest.java      |   40 +-
 .../DiskRegionPerfJUnitPerformanceTest.java        |    8 +-
 .../src/test/java/com/company/app/DBLoader.java    |    6 +-
 .../src/test/java/com/company/data/MySizer.java    |    2 +-
 .../org/apache/geode/SystemFailureJUnitTest.java   |    4 +-
 .../test/java/org/apache/geode/UnitTestDoclet.java |   29 +-
 .../apache/geode/admin/AlertLevelJUnitTest.java    |    8 +-
 .../admin/internal/DistributedSystemTestCase.java  |    8 +-
 .../geode/cache/AttributesFactoryJUnitTest.java    |   26 +-
 .../internal/ParallelAsyncEventQueueImplTest.java  |    4 +-
 .../cache/client/internal/AbstractOpTest.java      |   70 +-
 .../client/internal/AbstractOpWithTimeoutTest.java |    2 +-
 .../client/internal/AuthenticateUserOpTest.java    |  156 +
 .../internal/ClientSideHandshakeImplTest.java      |  214 ++
 .../client/internal/ConnectionFactoryImplTest.java |  138 +
 .../internal/ExecuteFunctionOpRetryTest.java       |    4 +-
 .../internal/ExecuteRegionFunctionOpImplTest.java  |    4 +-
 .../internal/ExecuteRegionFunctionOpRetryTest.java |    4 +-
 .../internal/ExecuteRegionFunctionOpTest.java      |    4 +-
 .../ExecuteRegionFunctionSingleHopOpRetryTest.java |    4 +-
 .../cache/client/internal/GetAllOpJUnitTest.java   |    6 +-
 .../cache/client/internal/OpExecutorImplTest.java  |   64 +
 .../client/internal/OpExecutorImplUnitTest.java    |  151 +
 .../geode/cache/client/internal/PoolImplTest.java  |    3 +-
 .../cache/client/internal/TXFailoverOpTest.java    |    2 +-
 .../management/MXMemoryPoolListenerExample.java    |   44 +-
 .../org/apache/geode/cache/query/PerfQuery.java    |   60 +-
 .../functional/JavaSerializationJUnitTest.java     |    2 +-
 .../AbstractCompiledValueTestJUnitTest.java        |    4 +-
 .../query/internal/AttributeDescriptorTest.java    |    4 +-
 .../internal/CompiledAggregateFunctionTest.java    |    4 +-
 .../cache/query/internal/CompiledInJUnitTest.java  |   12 +-
 .../geode/cache/query/internal/QCompilerTest.java  |   32 +-
 .../QueryConfigurationServiceImplTest.java         |    6 +-
 .../cache/query/internal/QueryMonitorTest.java     |    2 +-
 .../QueryObjectSerializationJUnitTest.java         |   15 +-
 .../cache/query/internal/ResultsBagJUnitTest.java  |   82 +-
 .../ResultsBagLimitBehaviourJUnitTest.java         |  140 +-
 .../ResultsCollectionWrapperLimitJUnitTest.java    |   92 +-
 .../internal/StructBagLimitBehaviourJUnitTest.java |   24 +-
 .../cache/query/internal/StructSetJUnitTest.java   |    8 +-
 .../internal/index/CompactRangeIndexTest.java      |   18 +-
 .../internal/index/HashIndexSetJUnitTest.java      |   22 +-
 .../internal/index/IndexElemArrayJUnitTest.java    |   11 +-
 .../internal/index/MemoryIndexStoreJUnitTest.java  |    6 +-
 .../query/internal/types/TypeUtilsJUnitTest.java   |   18 +-
 .../org/apache/geode/cache/util/ObjectsTest.java   |    8 +-
 .../org/apache/geode/cache30/TestDiskRegion.java   |   23 +-
 .../java/org/apache/geode/cache30/TestHeapLRU.java |    2 +-
 .../geode/distributed/LocatorLauncherTest.java     |   43 +
 .../internal/ClusterElderManagerTest.java          |    4 +-
 .../internal/DistributionAdvisorTest.java          |    2 +-
 .../internal/DistributionConfigJUnitTest.java      |  136 +-
 .../internal/DistributionStatsTest.java            |   16 +-
 ...nternalConfigurationPersistenceServiceTest.java |    4 +-
 .../distributed/internal/InternalLocatorTest.java  |    3 +-
 .../internal/LocatorLoadSnapshotJUnitTest.java     |   24 +-
 .../distributed/internal/ReplyMessageTest.java     |   44 +
 .../internal/ServerLocationAndMemberIdTest.java    |    6 +-
 .../internal/StartupMessageDataJUnitTest.java      |   26 +-
 .../deadlock/UnsafeThreadLocalJUnitTest.java       |    2 +-
 .../internal/membership/InternalRoleJUnitTest.java |    2 +-
 .../auth/AbstractGMSAuthenticatorTestCase.java     |   26 +-
 .../GMSAuthenticatorWithAuthenticatorTest.java     |   72 +-
 .../GMSAuthenticatorWithSecurityManagerTest.java   |   60 +-
 .../org/apache/geode/internal/ByteArrayData.java   |   14 +-
 .../internal/CopyOnWriteHashSetJUnitTest.java      |   26 +-
 .../geode/internal/DataSerializableJUnitTest.java  |  862 +++---
 .../internal/DataSerializerHolderJUnitTest.java    |   34 +-
 .../DistributedSerializableObjectConfigTest.java   |   62 +
 ...lDataSerializerSerializationAcceptlistTest.java |  247 +-
 .../InternalDataSerializerShiroAcceptListTest.java |  163 +
 .../geode/internal/LineWrapUnitJUnitTest.java      |    4 +-
 .../apache/geode/internal/NanoTimerJUnitTest.java  |    4 +-
 .../geode/internal/ObjIdConcurrentMapTest.java     |    2 +-
 .../apache/geode/internal/ObjIdMapJUnitTest.java   |   44 +-
 .../internal/OneTaskOnlyDecoratorJUnitTest.java    |   48 +-
 .../internal/PutAllOperationContextJUnitTest.java  |    4 +-
 .../org/apache/geode/internal/SystemTimerTest.java |   10 +-
 .../internal/cache/AbstractCacheServerTest.java    |  178 ++
 .../internal/cache/AbstractDiskRegionTest.java     |    2 +-
 .../cache/AbstractDistributedRegionJUnitTest.java  |    2 +-
 .../internal/cache/AbstractRegionMapTest.java      |   14 +-
 .../cache/AbstractRegionMapTxApplyDestroyTest.java |   26 +-
 .../geode/internal/cache/BucketAdvisorTest.java    |   89 +
 .../internal/cache/BucketRegionJUnitTest.java      |    4 +-
 .../internal/cache/BucketRegionQueueHelper.java    |   16 +-
 .../internal/cache/BucketRegionQueueJUnitTest.java |  111 +-
 .../geode/internal/cache/BucketRegionTest.java     |  115 +-
 .../internal/cache/CacheOperationMessageTest.java  |    2 +-
 .../geode/internal/cache/DestroyMessageTest.java   |    2 +-
 .../geode/internal/cache/DiskIdJUnitTest.java      |    2 +-
 .../apache/geode/internal/cache/DiskUsageTest.java |   22 +-
 .../cache/DistributedCacheOperationTest.java       |   11 +-
 .../cache/DistributedPutAllOperationTest.java      |    2 +-
 ...tributedRegionFunctionStreamingMessageTest.java |    2 +-
 .../internal/cache/DistributedRegionJUnitTest.java |    6 +-
 .../cache/DistributedRemoveAllOperationTest.java   |    2 +-
 .../geode/internal/cache/EntryEventImplTest.java   |  102 +-
 .../cache/EntryEventSerializationTest.java         |    4 +-
 .../internal/cache/EnumListenerEventJUnitTest.java |    3 +-
 .../apache/geode/internal/cache/EventIDTest.java   |   48 +-
 ...eDisconnectedClientTransactionsMessageTest.java |    2 +-
 .../geode/internal/cache/ExpiryTaskTest.java       |  155 +
 .../cache/LatestLastAccessTimeMessageTest.java     |   11 +
 .../geode/internal/cache/LocalRegionTest.java      |   54 +-
 .../internal/cache/NonLocalRegionEntryTest.java    |    2 +-
 .../geode/internal/cache/OldVLJUnitTest.java       |    8 +-
 .../internal/cache/OplogEntryIdMapJUnitTest.java   |   22 +-
 .../org/apache/geode/internal/cache/OplogTest.java |   56 +-
 .../cache/OrderedTombstoneMapJUnitTest.java        |    2 +-
 .../geode/internal/cache/OverflowOplogTest.java    |   53 +
 .../internal/cache/PRHARedundancyProviderTest.java |   76 +-
 .../cache/PartitionAttributesImplJUnitTest.java    |  306 +-
 .../cache/PartitionedRegionDataStoreTest.java      |   12 +-
 .../cache/PartitionedRegionQueryEvaluatorTest.java |   16 +-
 .../internal/cache/PartitionedRegionTest.java      |   44 +-
 .../internal/cache/ProxyBucketRegionTest.java      |   62 +
 .../cache/SearchLoadAndWriteProcessorTest.java     |   53 +-
 .../geode/internal/cache/SenderIdMonitorTest.java  |    7 +-
 .../cache/TXLastEventInTransactionUtilsTest.java   |   22 +-
 .../geode/internal/cache/TXManagerImplTest.java    |  136 +-
 .../cache/TXRegionLockRequestImplTest.java         |    2 +-
 .../geode/internal/cache/TXStateProxyImplTest.java |    2 +-
 .../geode/internal/cache/TXStateStubTest.java      |    2 +-
 .../apache/geode/internal/cache/TXStateTest.java   |    8 +-
 .../apache/geode/internal/cache/VLJUnitTest.java   |    8 +-
 .../internal/cache/ValueComparisonHelperTest.java  |    5 +-
 .../cache/backup/BackupDefinitionTest.java         |    2 +-
 .../internal/cache/backup/BackupServiceTest.java   |    2 +-
 .../FileSystemIncrementalBackupLocationTest.java   |    2 +-
 .../cache/backup/FinishBackupRequestTest.java      |    2 +-
 .../cache/backup/FinishBackupStepTest.java         |    2 +-
 .../cache/control/FilterByPathJUnitTest.java       |   10 +-
 .../cache/control/InternalResourceManagerTest.java |    2 +-
 .../control/RegionRedundancyStatusImplTest.java    |    4 +-
 .../cache/control/ResourceAdvisorTest.java         |    2 +-
 ...SerializableRegionRedundancyStatusImplTest.java |   56 +
 .../cache/entries/AbstractRegionEntryTest.java     |   12 +-
 .../cache/entries/DiskEntryHelperTest.java         |    4 +-
 .../event/NonDistributedEventTrackerTest.java      |    2 +-
 .../eviction/LRUListWithAsyncSortingTest.java      |    2 +-
 .../cache/execute/FunctionContextImplTest.java     |    2 +-
 .../cache/execute/LocalDataSetFunction.java        |    2 +-
 .../PartitionedRegionFunctionExecutorTest.java     |   55 +
 .../cache/execute/PerformanceTestFunction.java     |    5 +-
 .../extension/SimpleExtensionPointJUnitTest.java   |    6 +-
 .../cache/ha/EventIdOptimizationJUnitTest.java     |    4 +-
 .../geode/internal/cache/ha/HARegionQueueTest.java |    2 +-
 .../ha/QueueSynchronizationProcessorTest.java      |   18 +-
 .../cache/ha/ThreadIdentifierJUnitTest.java        |   12 +-
 .../cache/map/AbstractRegionMapPutTest.java        |    2 +-
 .../internal/cache/map/RegionMapDestroyTest.java   |    2 +-
 .../geode/internal/cache/map/RegionMapPutTest.java |   14 +-
 .../partitioned/FetchEntriesMessageJUnitTest.java  |    2 +-
 .../OfflineMembersDetailsJUnitTest.java            |    2 +-
 .../cache/partitioned/PartitionMessageTest.java    |    2 +-
 .../partitioned/PutPutReplyMessageJUnitTest.java   |    8 +-
 .../SingleThreadColocationLoggerTest.java          |    2 +-
 .../rebalance/BucketOperatorImplTest.java          |    4 +-
 .../rebalance/BucketOperatorWrapperTest.java       |   61 +-
 .../cache/partitioned/rebalance/MemberTest.java    |  107 +
 .../PartitionedRegionLoadModelJUnitTest.java       | 1118 +++++--
 .../cache/persistence/DefaultDiskDirsTest.java     |    6 +-
 .../PersistenceInitialImageAdvisorTest.java        |    5 +-
 .../entry/RegionEntryFactoryBuilderJUnitTest.java  |    5 +-
 .../cache/tier/sockets/BaseCommandJUnitTest.java   |    2 +-
 .../tier/sockets/CacheClientNotifierTest.java      |   99 +
 .../cache/tier/sockets/CacheClientProxyTest.java   |  178 ++
 .../tier/sockets/ClientHealthMonitorTest.java      |    4 +-
 .../tier/sockets/ClientProxyMembershipIDTest.java  |   64 +
 .../tier/sockets/ClientUpdateMessageImplTest.java  |  118 +
 .../cache/tier/sockets/ClientUserAuthsTest.java    |  630 ++++
 .../internal/cache/tier/sockets/HandshakeTest.java |   24 +
 .../cache/tier/sockets/MessageDispatcherTest.java  |  188 ++
 .../cache/tier/sockets/MessageIdExtractorTest.java |    8 +-
 .../cache/tier/sockets/MessageJUnitTest.java       |   52 +-
 .../tier/sockets/ObjectPartListJUnitTest.java      |    5 +-
 .../internal/cache/tier/sockets/PartTest.java      |    2 +-
 .../tier/sockets/RandomSubjectIdGeneratorTest.java |  148 +
 .../cache/tier/sockets/ServerConnectionTest.java   |  218 +-
 .../tier/sockets/command/CommitCommandTest.java    |    3 +-
 .../tier/sockets/command/ContainsKey66Test.java    |   82 +-
 .../tier/sockets/command/CreateRegionTest.java     |   78 +-
 .../tier/sockets/command/DestroyRegionTest.java    |   88 +-
 .../command/ExecuteRegionFunction66Test.java       |   22 +-
 .../command/ExecuteRegionFunctionGeode18Test.java  |   22 +-
 .../command/GatewayReceiverCommandTest.java        |  168 ++
 .../cache/tier/sockets/command/GetAll70Test.java   |   96 +-
 .../sockets/command/GetAllWithCallbackTest.java    |   90 +-
 .../GetClientPartitionAttributesCommand66Test.java |   24 +-
 .../tier/sockets/command/Invalidate70Test.java     |   96 +-
 .../cache/tier/sockets/command/KeySetTest.java     |   80 +-
 .../cache/tier/sockets/command/PingTest.java       |   62 +-
 .../cache/tier/sockets/command/Put70Test.java      |    2 +-
 .../sockets/command/PutUserCredentialsTest.java    |   79 +
 .../sockets/command/RegisterInterest61Test.java    |  110 +-
 .../command/RegisterInterestList66Test.java        |  117 +-
 .../cache/tier/sockets/command/RemoveAllTest.java  |  100 +-
 .../sockets/command/UnregisterInterestTest.java    |  115 +-
 .../cache/tx/AbstractPeerTXRegionStubTest.java     |    4 +-
 .../internal/cache/tx/ClientTXStateStubTest.java   |    4 +-
 .../cache/tx/PartitionedTXRegionStubTest.java      |   10 +-
 .../cache/tx/RemoteFetchEntryMessageTest.java      |    2 +-
 .../cache/tx/RemoteOperationMessageTest.java       |    4 +-
 .../cache/tx/RemotePutReplyMessageJUnitTest.java   |    8 +-
 .../cache/versions/AbstractVersionTagTestBase.java |    6 +-
 .../RegionVersionHolderBitSetJUnitTest.java        |    4 +-
 .../RegionVersionHolderRandomJUnitTest.java        |   23 +-
 .../cache/versions/RegionVersionVectorTest.java    |   10 +-
 .../AbstractGatewaySenderEventProcessorTest.java   |   32 +-
 .../cache/wan/GatewaySenderEventImplTest.java      |  134 +-
 ...entParallelGatewaySenderEventProcessorTest.java |    4 +-
 ...rallelGatewaySenderEventProcessorJUnitTest.java |   30 +-
 .../ParallelGatewaySenderEventProcessorTest.java   |    4 +-
 .../wan/parallel/ParallelGatewaySenderHelper.java  |   13 +-
 .../ParallelGatewaySenderQueueJUnitTest.java       |  220 +-
 .../ParallelQueueRemovalMessageJUnitTest.java      |   90 +-
 ...SerialGatewaySenderEventProcessorJUnitTest.java |   98 +-
 .../serial/SerialGatewaySenderQueueJUnitTest.java  |  101 +-
 .../TestSerialGatewaySenderEventProcessor.java     |    2 +-
 .../cache/xmlcache/AbstractEntityResolverTest.java |    3 +-
 .../cache/xmlcache/AbstractXmlParserJUnitTest.java |    2 +-
 .../cache/xmlcache/XmlGeneratorUtilsJUnitTest.java |   30 +-
 .../internal/classloader/ClassPathLoaderTest.java  |   11 +-
 .../internal/datasource/DataSourceFactoryTest.java |    4 +-
 .../geode/internal/jndi/ContextJUnitTest.java      |    8 +-
 .../internal/jta/functional/TestXACacheLoader.java |    2 +-
 .../geode/internal/lang/ClassUtilsJUnitTest.java   |  163 -
 .../internal/lang/InOutParameterJUnitTest.java     |   40 +-
 .../geode/internal/lang/ObjectUtilsJUnitTest.java  |    4 +-
 .../internal/lang/SystemPropertyHelperTest.java    |  148 +-
 .../apache/geode/internal/logging/BannerTest.java  |    9 +-
 .../geode/internal/logging/log4j/LogLevelTest.java |    2 +-
 .../monitoring/ThreadsMonitoringJUnitTest.java     |    2 +-
 .../internal/net/ByteBufferConcurrencyTest.java    |  131 +-
 .../geode/internal/net/ByteBufferVendorTest.java   |   10 +-
 .../geode/internal/net/NioPlainEngineTest.java     |   12 +-
 .../geode/internal/net/NioSslEngineTest.java       |   36 +-
 .../offheap/AbstractStoredObjectTestBase.java      |    4 +-
 .../geode/internal/offheap/DataTypeJUnitTest.java  |   52 +-
 .../geode/internal/offheap/FragmentJUnitTest.java  |    6 +-
 .../internal/offheap/FreeListManagerTest.java      |  388 +--
 .../offheap/LifecycleListenerJUnitTest.java        |  118 +-
 .../MemoryAllocatorFillPatternJUnitTest.java       |   18 +-
 .../internal/offheap/MemoryAllocatorJUnitTest.java |   52 +-
 .../internal/offheap/MemoryBlockNodeJUnitTest.java |   11 +-
 .../offheap/MemoryInspectorImplJUnitTest.java      |   18 +-
 .../internal/offheap/OffHeapHelperJUnitTest.java   |    2 +-
 .../internal/offheap/OffHeapStorageJUnitTest.java  |    5 +-
 .../OffHeapStoredObjectAddressStackJUnitTest.java  |   16 +-
 .../offheap/OffHeapStoredObjectJUnitTest.java      |    2 +-
 .../offheap/RefCountChangeInfoJUnitTest.java       |   25 +-
 .../offheap/ReferenceCountHelperImplTest.java      |    2 +-
 .../internal/offheap/TinyMemoryBlockJUnitTest.java |    6 +-
 .../offheap/TinyStoredObjectJUnitTest.java         |    4 +-
 .../internal/ra/spi/JCALocalTransactionTest.java   |   12 +-
 .../security/IntegratedSecurityServiceTest.java    |  124 +-
 .../internal/security/SecurityServiceTest.java     |   72 +-
 .../ThreadLocalByteArrayCacheTest.java             |    2 +-
 .../geode/internal/size/ObjectTraverserPerf.java   |    2 +-
 .../size/SizeClassOnceObjectSizerJUnitTest.java    |    2 +-
 .../internal/statistics/CallbackSamplerTest.java   |    2 +-
 .../internal/statistics/FakeValueMonitor.java      |    4 +-
 .../internal/statistics/ResourceInstTest.java      |    8 +-
 .../internal/statistics/SampleCollectorTest.java   |   34 +-
 .../statistics/StatMonitorHandlerTest.java         |   18 +-
 ...MonitorHandlerWithEnabledMonitorThreadTest.java |   10 +-
 .../internal/statistics/StatisticsMonitorTest.java |   54 +-
 .../statistics/StatisticsTypeImplTest.java         |    4 +-
 .../internal/statistics/TestSampleHandler.java     |   46 +-
 .../meters/DoubleStatisticBindingTest.java         |    2 +-
 .../meters/LongStatisticBindingTest.java           |    2 +-
 .../apache/geode/internal/tcp/ConnectionTest.java  |   80 +-
 .../geode/internal/tcp/DirectReplySenderTest.java  |   43 +
 .../apache/geode/internal/tcp/MsgStreamerTest.java |    4 +-
 .../util/AbortableTaskServiceJUnitTest.java        |   93 +-
 .../internal/util/ArgumentRedactorJUnitTest.java   |  221 --
 .../geode/internal/util/ArgumentRedactorTest.java  |  675 +++++
 .../apache/geode/internal/util/ArrayUtilsTest.java |   18 +-
 .../apache/geode/internal/util/BlobHelperTest.java |   40 +-
 ...BlobHelperWithThreadContextClassLoaderTest.java |   43 +-
 .../internal/util/DelayedActionJUnitTest.java      |    9 +-
 .../apache/geode/internal/util/HostNameTest.java   |   21 +-
 .../internal/util/ProductVersionUtilTest.java      |   53 +
 .../org/apache/geode/internal/util/Valuable.java   |    4 +-
 .../CompactConcurrentHashSetJUnitTest.java         |    8 +-
 .../SemaphoreReadWriteLockJUnitTest.java           |   95 +-
 .../concurrent/StoppableCountDownLatchTest.java    |    4 +-
 .../redaction/CombinedSensitiveDictionaryTest.java |  130 +
 .../internal/util/redaction/ParserRegexTest.java   | 1006 +++++++
 .../util/redaction/RedactionDefaultsTest.java      |   80 +
 .../util/redaction/RegexRedactionStrategyTest.java |  396 +++
 .../redaction/SensitivePrefixDictionaryTest.java   |  160 +
 .../SensitiveSubstringDictionaryTest.java          |  160 +
 .../util/redaction/StringRedactionTest.java        |  254 ++
 .../management/internal/FederatingManagerTest.java |   12 +-
 .../internal/JmxRmiOpenTypesSerialFilterTest.java  |  351 ---
 .../management/internal/ManagementAgentTest.java   |   60 +
 .../api/LocatorClusterManagementServiceTest.java   |    4 +-
 ...ServerBridgeClientMembershipRegressionTest.java |    2 +-
 .../QueryDataFunctionApplyLimitClauseTest.java     |    8 +-
 .../stats/AggregateRegionStatsMonitorTest.java     |    5 +-
 .../stats/GatewaySenderOverflowMonitorTest.java    |    2 +-
 .../beans/stats/MBeanStatsMonitorTest.java         |   32 +-
 .../beans/stats/MemberLevelDiskMonitorTest.java    |    5 +-
 .../converters/AutoSerializerConverterTest.java    |    2 +-
 .../converters/ClassNameConverterTest.java         |    7 +-
 .../converters/GatewayReceiverConverterTest.java   |    4 +-
 .../converters/IndexConverterTest.java             |    2 +-
 .../configuration/converters/PdxConverterTest.java |    2 +-
 .../domain/CacheElementJUnitTest.java              |    2 +-
 .../configuration/domain/ConfigurationTest.java    |    2 +-
 .../mutators/DeploymentManagerTest.java            |    4 +-
 .../configuration/utils/XmlUtilsJUnitTest.java     |   15 +-
 .../validators/DeploymentValidatorTest.java        |    2 +-
 .../internal/json/QueryResultFormatterTest.java    |    2 +-
 .../operation/OperationHistoryManagerTest.java     |   11 +-
 .../operation/OperationStateConcurrentTest.java    |    2 +-
 .../internal/operation/OperationStateTest.java     |   44 +
 .../internal/security/ResourcePermissionTest.java  |    4 +-
 .../internal/util/ManagementUtilsTest.java         |   44 +
 ...nternalDistributedSystemMetricsServiceTest.java |    2 +-
 .../apache/geode/pdx/internal/EnumInfoTest.java    |    2 +-
 .../geode/pdx/internal/PdxInstanceImplTest.java    |    2 +-
 .../geode/pdx/internal/TypeRegistryTest.java       |    8 +-
 .../geode/pdx/internal/json/PdxToJSONTest.java     |   59 +
 .../security/GemFireSecurityExceptionTest.java     |    8 +-
 .../geode/security/NotAuthorizedExceptionTest.java |    8 +-
 .../test/java/org/apache/geode/sequence/Arrow.java |    6 +-
 .../apache/geode/sequence/DefaultLineMapper.java   |    2 +-
 .../geode/sequence/GemfireSequenceDisplay.java     |   46 +-
 .../org/apache/geode/sequence/HydraLineMapper.java |    5 +-
 .../java/org/apache/geode/sequence/Lifeline.java   |    6 +-
 .../org/apache/geode/sequence/LifelineState.java   |    2 +-
 .../java/org/apache/geode/sequence/LineMapper.java |    2 +-
 .../apache/geode/sequence/SelectGraphDialog.java   |   34 +-
 .../org/apache/geode/sequence/SequenceDiagram.java |   26 +-
 .../org/apache/geode/sequence/StateColorMap.java   |    6 +-
 .../java/org/apache/geode/sequence/TimeAxis.java   |    4 +-
 .../org/apache/geode/sequence/ZoomingPanel.java    |   28 +-
 .../geode/test/process/MainLauncherJUnitTest.java  |   48 +-
 .../java/org/apache/persistence/admin/Logger.java  |   10 +-
 .../org/apache/persistence/logging/Handler.java    |   14 +-
 .../java/org/apache/persistence/logging/Level.java |   12 +-
 .../org/apache/persistence/logging/LogRecord.java  |   24 +-
 .../org/apache/persistence/logging/Logger.java     |   32 +-
 .../persistence/logging/SimpleFormatter.java       |   10 +-
 .../apache/persistence/logging/StreamHandler.java  |   14 +-
 geode-core/src/test/resources/expected-pom.xml     |   57 +-
 .../cli/commands/golden-help-offline.properties    |   11 -
 .../geode/ClusterCommunicationsDUnitTest.java      |   53 +-
 ...overWithMixedVersionServersDistributedTest.java |   26 +-
 .../internal/cache/TxCommitMessageBCTestBase.java  |   17 +-
 .../RollingUpgrade2DUnitTestBase.java              |    7 +-
 .../rollingupgrade/RollingUpgradeDUnitTest.java    |   19 +-
 ...gradeHARegionNameOnDifferentServerVersions.java |    4 +-
 ...UpgradeOplogMagicSeqBackwardCompactibility.java |    2 +-
 .../RollingUpgradeVerifyXmlEntity.java             |    9 +-
 .../AuthExpirationBackwardCompatibleDUnitTest.java |  729 +++++
 .../AuthExpirationTransactionUpgradeTest.java      |  315 ++
 .../ClientAuthenticationPart2DUnitTest.java        |    4 +-
 .../security/ClientAuthenticationTestCase.java     |   18 +-
 ...tAuthorizationLegacyConfigurationDUnitTest.java |    4 +-
 ...aAuthorizationUsingLegacySecurityDUnitTest.java |    4 +-
 ...onUsingLegacySecurityWithFailoverDUnitTest.java |   16 +-
 .../DeltaClientAuthorizationDUnitTest.java         |   18 +-
 .../test/version/VersionManagerUpgradeTest.java    |    4 +-
 geode-cq/build.gradle                              |    4 +-
 .../geode/cache/query/cq/CQDistributedTest.java    |    2 +-
 .../geode/cache/query/cq/CQMetricsDUnitTest.java   |    3 +-
 .../geode/cache/query/cq/dunit/CqDUnitTest.java    |  228 ++
 .../cache/query/cq/dunit/CqDataDUnitTest.java      |   78 +-
 .../query/cq/dunit/CqDataUsingPoolDUnitTest.java   |   52 +-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java      |   15 +-
 .../query/cq/dunit/CqPerfUsingPoolDUnitTest.java   |   61 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java     |   41 +-
 .../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java |   13 +-
 .../query/cq/dunit/CqQueryUsingPoolDUnitTest.java  |  107 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java    |   24 +-
 ...esultSetUsingPoolOptimizedExecuteDUnitTest.java |    4 +-
 .../cache/query/cq/dunit/CqStatsDUnitTest.java     |   10 +-
 .../query/cq/dunit/CqStatsUsingPoolDUnitTest.java  |   12 +-
 .../cache/query/cq/dunit/CqTimeTestListener.java   |   98 +-
 .../DestroyPartitionedRegionMessageDUnitTest.java  |    4 +-
 ...nvalidatePartitionedRegionMessageDUnitTest.java |    4 +-
 .../dunit/PartitionedRegionCqQueryDUnitTest.java   |   63 +-
 ...onedRegionCqQueryOptimizedExecuteDUnitTest.java |   21 +-
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java     |   44 +-
 .../cache/query/dunit/PdxQueryCQDUnitTest.java     |   51 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java      |   91 +-
 .../query/dunit/QueryIndexUpdateRIDUnitTest.java   |  118 +-
 .../cache/query/dunit/QueryMonitorDUnitTest.java   |   38 +-
 .../query/dunit/QueryWithRangeIndexDUnitTest.java  |  206 ++
 ...igurationServiceConstraintsDistributedTest.java |    4 +-
 .../cache/PRDeltaPropagationDUnitTest.java         |   93 +-
 .../cache/PutAllClientServerDistributedTest.java   |  559 ++--
 .../cache/RemoteCQTransactionDUnitTest.java        |   10 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java      |  103 +-
 .../internal/cache/ha/HADispatcherDUnitTest.java   |   49 +-
 .../tier/sockets/ClientToServerDeltaDUnitTest.java |  245 +-
 .../sockets/DeltaPropagationWithCQDUnitTest.java   |   16 +-
 ...ltaToRegionRelationCQRegistrationDUnitTest.java |  169 +-
 .../DurableClientCQClusterRestartDUnitTest.java    |  316 ++
 .../tier/sockets/DurableClientCQDUnitTest.java     |  154 +-
 .../tier/sockets/DurableClientCrashDUnitTest.java  |   10 +-
 .../sockets/DurableClientHAQueuedDUnitTest.java    |  138 +-
 .../sockets/DurableClientNetDownDUnitTest.java     |   18 +-
 .../tier/sockets/DurableClientSimpleDUnitTest.java |  270 +-
 .../cache/tier/sockets/DurableClientTestBase.java  |   39 +-
 .../cache/tier/sockets/DurableClientTestCase.java  |  204 +-
 .../management/CacheServerManagementDUnitTest.java |   24 +-
 .../AlterQueryServiceCommandDistributedTest.java   |    4 +-
 .../commands/DescribeClientCommandDUnitTest.java   |    1 -
 .../commands/DurableClientCommandsDUnitTest.java   |    1 -
 .../management/internal/pulse/TestCQDUnitTest.java |   10 +-
 .../internal/pulse/TestClientsDUnitTest.java       |   11 +-
 .../internal/pulse/TestServerDUnitTest.java        |    6 +-
 .../security/CQPDXPostProcessorDUnitTest.java      |    4 +-
 .../geode/security/CQPostProcessorDunitTest.java   |    2 +-
 .../ClientCQPostAuthorizationDUnitTest.java        |   12 +-
 .../security/ClientPostAuthorizationDUnitTest.java |    5 +-
 .../geode/security/ClientQueryAuthDUnitTest.java   |    2 +-
 .../geode/security/FilterPostAuthorization.java    |   34 +-
 .../geode/security/FilterPreAuthorization.java     |   16 +-
 .../geode/security/MultiUserAPIDUnitTest.java      |   78 +-
 .../security/MultiUserDurableCQAuthzDUnitTest.java |    6 +-
 .../org/apache/geode/security/ObjectWithAuthz.java |   16 +-
 .../CqSecurityAllowedUsersDistributedTest.java     |    2 +-
 .../CqSecurityForbiddenUsersDistributedTest.java   |    2 +-
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../AnalyzeCQSerializablesIntegrationTest.java     |   38 +
 .../AnalyzeCQSerializablesJUnitTest.java           |   34 -
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    2 -
 .../org/apache/geode/codeAnalysis/openBugs.txt     |   21 -
 .../cq/internal/CQDistributedSystemService.java    |   43 -
 .../internal/CQSanctionedSerializablesService.java |   27 +
 .../cache/query/cq/internal/ClientCQImpl.java      |  132 +-
 .../cache/query/cq/internal/CqConflatable.java     |   12 +-
 .../geode/cache/query/cq/internal/CqEventImpl.java |   42 +-
 .../geode/cache/query/cq/internal/CqQueryImpl.java |   66 +-
 .../cache/query/cq/internal/CqServiceImpl.java     |  144 +-
 .../query/cq/internal/CqServiceStatisticsImpl.java |   12 +-
 .../cache/query/cq/internal/CqServiceVsdStats.java |   50 +-
 .../cache/query/cq/internal/CqStatisticsImpl.java  |    8 +-
 .../cache/query/cq/internal/ServerCQImpl.java      |  102 +-
 .../cache/query/cq/internal/command/CloseCQ.java   |   11 +-
 .../query/cq/internal/command/ExecuteCQ61.java     |   30 +-
 .../query/cq/internal/command/GetCQStats.java      |    7 +-
 .../query/cq/internal/command/GetDurableCQs.java   |    8 +-
 .../cache/query/cq/internal/command/MonitorCQ.java |    7 +-
 .../cache/query/cq/internal/command/StopCQ.java    |   11 +-
 .../cache/query/cq/internal/ops/CreateCQOp.java    |   27 +-
 .../query/cq/internal/ops/CreateCQWithIROp.java    |   17 +-
 .../query/cq/internal/ops/GetDurableCQsOp.java     |    6 +-
 .../query/cq/internal/ops/ServerCQProxyImpl.java   |   33 +-
 ...e.distributed.internal.DistributedSystemService |   16 -
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../cache/tier/sockets/command/CloseCQTest.java    |   27 +-
 .../cache/tier/sockets/command/StopCQTest.java     |   27 +-
 .../geode/test/dunit/rules/CQUnitTestRule.java     |    1 +
 .../tier/sockets/ClientServerMiscBCDUnitTest.java  |   10 +-
 .../geode-deployment-legacy/build.gradle           |   26 +-
 .../backup/BackupFileCopierIntegrationTest.java    |    2 +-
 .../deployment/JarDeployerIntegrationTest.java     |   28 +-
 .../internal/LegacyClasspathServiceImpl.java       |   23 +-
 .../geode/deployment/internal/DeployedJar.java     |   52 +-
 .../geode/deployment/internal/JarDeployer.java     |   34 +-
 .../legacy/LegacyJarDeploymentService.java         |   96 +-
 .../internal/JarDeployerDeadlockTest.java          |   10 +-
 .../src/test/resources/expected-pom.xml            |   17 -
 .../copy_on_read.html.md.erb                       |    2 +-
 .../data_regions/managing_data_regions.html.md.erb |    2 +-
 .../cluster_config/export-import.html.md.erb       |    9 +-
 geode-docs/developing/book_intro.html.md.erb       |    9 -
 ...ementing_write_behind_event_handler.html.md.erb |    6 +-
 .../geode_apis_compatible_with_redis.html.md.erb   |  240 --
 geode-docs/getting_started/book_intro.html.md.erb  |    3 +
 .../getting_started/intro_to_clients.html.md.erb   |  365 +++
 geode-docs/images/Apache_Tomcat_Homepage.png       |  Bin 0 -> 134725 bytes
 .../geode_apis_compatible_with_redis.svg           |   19 -
 .../disk_storage/how_disk_stores_work.html.md.erb  |    2 +-
 .../disk_storage/using_disk_stores.html.md.erb     |    5 -
 .../logging/configuring_log4j2.html.md.erb         |   10 +-
 .../managing/logging/how_logging_works.html.md.erb |    4 +-
 .../management/jmx_manager_operations.html.md.erb  |    4 +-
 ...t_communication_have_enough_sockets.html.md.erb |    2 +-
 ...twork_partitioning_management_works.html.md.erb |    2 +-
 .../security/authentication_examples.html.md.erb   |   25 +-
 .../security/authentication_overview.html.md.erb   |    4 +
 .../security/authorization_example.html.md.erb     |   18 +
 .../implementing_authentication.html.md.erb        |  289 +-
 .../implementing_authentication_expiry.html.md.erb |   70 +
 .../implementing_authorization.html.md.erb         |   13 +-
 .../troubleshooting/chapter_overview.html.md.erb   |    3 +
 .../log_messages_and_solutions.html.md.erb         | 1564 ++++++++++
 .../system_failure_and_recovery.html.md.erb        |   51 +-
 geode-docs/reference/statistics_list.html.md.erb   |    1 +
 .../topics/gemfire_properties.html.md.erb          |   20 +-
 .../topics/region_shortcuts_table.html.md.erb      |  515 +---
 geode-docs/rest_apps/rest_examples.html.md.erb     |    2 +-
 geode-docs/tools_modules/book_intro.html.md.erb    |    8 +
 .../tools_modules/geode_for_redis.html.md.erb      |  255 ++
 .../gfsh/command-pages/connect.html.md.erb         |    4 +-
 .../gfsh/command-pages/create.html.md.erb          |   18 +-
 .../gfsh/command-pages/import.html.md.erb          |   10 +-
 .../gfsh/command-pages/start.html.md.erb           |  562 +---
 .../gfsh/command-pages/wan_copy_region.html.md.erb |  192 ++
 .../gfsh/gfsh_command_index.html.md.erb            |    5 +-
 .../gfsh/quick_ref_commands_by_area.html.md.erb    |    3 +-
 .../http_session_mgmt/quick_start.html.md.erb      |   45 +-
 .../tc_installing_the_module.html.md.erb           |    9 +-
 .../tomcat_changing_gf_default_cfg.html.md.erb     |   31 +-
 .../tomcat_installing_the_module.html.md.erb       |   38 +-
 .../tomcat_setting_up_the_module.html.md.erb       |   72 +-
 .../weblogic_setting_up_the_module.html.md.erb     |    4 +-
 .../micrometer/micrometer-meters.html.md.erb       |    2 +-
 .../multisite_overview.html.md.erb                 |    5 -
 geode-dunit/build.gradle                           |    2 +-
 .../examples/AsyncInvokeCallableExampleTest.java   |   14 +-
 .../tests/ClusterStartupRuleDistributedTest.java   |   36 +
 .../ClusterStartupRuleLimitedVmCountTest.java      |   34 +
 .../DistributedDiskDirRuleDistributedTest.java     |   17 +-
 .../DistributedErrorCollectorDistributedTest.java  |    6 +-
 ...dExecutorServiceRuleLimitedThreadCountTest.java |  103 +
 ...butedExecutorServiceRuleLimitedVmCountTest.java |   37 +
 ...xecutorServiceRuleUnlimitedThreadCountTest.java |   75 +
 .../tests/DistributedRuleLimitedVmCountTest.java   |   34 +
 .../tests/MemberStarterRuleAwaitDUnitTest.java     |    2 +-
 .../MemberStarterRuleAwaitIntegrationTest.java     |    6 +-
 .../test/dunit/tests/BasicDistributedTest.java     |   14 +-
 .../tests/GetCurrentVmNumDistributedTest.java      |    3 +-
 .../geode/test/dunit/tests/VMDistributedTest.java  |   34 +-
 .../AnalyzeDUnitSerializablesIntegrationTest.java  |   65 +
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../junit/rules/DiskDirRuleIntegrationTest.java    |    5 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    4 +
 .../codeAnalysis/sanctionedDataSerializables.txt   |   47 +
 .../cache/client/internal/LocatorTestBase.java     |    6 +-
 .../apache/geode/cache/query/QueryTestUtils.java   |   24 +-
 .../cache/query/cq/dunit/CqQueryTestListener.java  |  327 +-
 .../cache/query/dunit/CloseCacheAuthorization.java |    4 +-
 .../geode/cache/query/dunit/HelperTestCase.java    |    8 +-
 .../geode/cache/query/dunit/SecurityTestUtils.java |  108 +
 .../apache/geode/cache/query/dunit/TestObject.java |   42 +-
 .../OrderByPartitionedJUnitTestBase.java           |   48 +-
 .../functional/OrderByTestImplementation.java      |   89 +-
 .../internal/index/IndexTrackingTestHook.java      |    8 +-
 .../org/apache/geode/cache30/CacheXmlTestCase.java |   10 +-
 .../geode/cache30/MultiVMRegionTestCase.java       |  225 +-
 .../org/apache/geode/cache30/RegionTestCase.java   |  130 +-
 .../apache/geode/cache30/TestCacheCallback.java    |   15 +-
 .../apache/geode/cache30/TestCacheListener.java    |   30 +-
 .../org/apache/geode/cache30/TestCacheLoader.java  |    2 +-
 .../org/apache/geode/cache30/TestCacheWriter.java  |    8 +-
 .../cache/CustomerIDPartitionResolver.java         |    7 +-
 .../cache/PartitionedRegionGetSomeKeys.java        |    2 +-
 .../cache/execute/CustomerIDPartitionResolver.java |    6 +-
 .../cache/execute/PRColocationDUnitTestHelper.java |   33 -
 .../execute/PRColocationDistributedTestHelper.java |   33 +
 .../internal/cache/execute/data/Customer.java      |   17 +-
 .../geode/internal/cache/execute/data/Order.java   |   15 +-
 .../internal/cache/execute/data/Shipment.java      |   15 +-
 .../internal/cache/functions/TestFunction.java     |   72 +-
 .../cache/tier/sockets/CacheServerTestUtil.java    |   85 +-
 .../sockets/ClientServerMiscDUnitTestBase.java     |   27 +-
 .../cache/wan/AsyncEventQueueTestBase.java         |   97 +-
 .../org/apache/geode/management/MBeanUtil.java     |    6 +-
 .../management/internal/cli/HeadlessGfsh.java      |   22 +-
 .../commands/ExportLogsDistributedTestBase.java    |   10 +-
 .../ExportLogsStatsDistributedTestBase.java        |    3 +-
 .../commands/FunctionCommandsDUnitTestBase.java    |    3 +-
 .../cli/commands/GcCommandDUnitTestBase.java       |  116 -
 .../cli/commands/GcCommandDistributedTestBase.java |  116 +
 .../commands/GemfireDataCommandsDUnitTestBase.java |  365 ---
 .../GeodeDataCommandsDistributedTestBase.java      |  297 ++
 .../commands/ListIndexCommandDUnitTestBase.java    |   87 -
 .../ListIndexCommandDistributedTestBase.java       |   89 +
 .../cli/commands/QueryCommandDUnitTestBase.java    |  514 ++--
 .../commands/QueryCommandIntegrationTestBase.java  |    4 +-
 .../RegionMembershipMBeanDUnitTestBase.java        |  386 ---
 .../RegionMembershipMBeanDistributedTestBase.java  |  383 +++
 .../commands/ShowDeadlockDistributedTestBase.java  |    3 +-
 .../ShowLogCommandDistributedTestBase.java         |    3 +-
 .../internal/configuration/ClusterConfig.java      |   95 +-
 .../configuration/ClusterConfigTestBase.java       |   12 +-
 .../apache/geode/pdx/JSONFormatVerifyUtility.java  |    4 +-
 .../security/ClientAuthorizationTestCase.java      |  158 +-
 .../apache/geode/security/SecurityTestUtils.java   |   49 +-
 .../generator/AuthzCredentialGenerator.java        |   37 +-
 .../security/generator/CredentialGenerator.java    |   35 +-
 .../generator/DummyAuthzCredentialGenerator.java   |   12 +-
 .../generator/LdapUserCredentialGenerator.java     |    2 +-
 .../generator/PKCSCredentialGenerator.java         |    4 +-
 .../security/generator/SSLCredentialGenerator.java |    8 +-
 .../UserPasswordWithExtraPropsAuthInit.java        |    9 +-
 .../generator/XmlAuthzCredentialGenerator.java     |   45 +-
 .../AbstractQuerySecurityDistributedTest.java      |    2 +-
 .../security/templates/DummyAuthorization.java     |   24 +-
 .../templates/FunctionSecurityPrmsHolder.java      |    6 +-
 .../security/templates/LdapUserAuthenticator.java  |   18 +-
 .../geode/security/templates/PKCSAuthInit.java     |    3 +-
 .../security/templates/PKCSAuthenticator.java      |   21 +-
 .../geode/security/templates/PKCSPrincipal.java    |    4 +-
 .../security/templates/UsernamePrincipal.java      |    4 +-
 .../geode/security/templates/XmlAuthorization.java |   79 +-
 .../geode/security/templates/XmlErrorHandler.java  |    4 +-
 .../org/apache/geode/test/dunit/Disconnect.java    |    2 +-
 .../geode/test/dunit/DistributedTestUtils.java     |    4 +-
 .../java/org/apache/geode/test/dunit/Host.java     |   10 +-
 .../java/org/apache/geode/test/dunit/Invoke.java   |    2 +-
 .../geode/test/dunit/SerializableCallable.java     |    6 +-
 .../geode/test/dunit/SerializableRunnable.java     |    6 +-
 .../geode/test/dunit/StoppableWaitCriterion.java   |    2 +-
 .../org/apache/geode/test/dunit/ThreadUtils.java   |    4 +-
 .../org/apache/geode/test/dunit/WaitCriterion.java |    4 +-
 .../dunit/cache/internal/JUnit4CacheTestCase.java  |   12 +-
 .../geode/test/dunit/internal/DUnitHost.java       |    2 +-
 .../geode/test/dunit/internal/DUnitLauncher.java   |   25 +-
 .../DUnitSanctionedSerializablesService.java       |   27 +
 .../test/dunit/internal/IdentifiableCallable.java  |    6 +-
 .../test/dunit/internal/IdentifiableRunnable.java  |    6 +-
 .../dunit/internal/JUnit4DistributedTestCase.java  |   63 +-
 .../geode/test/dunit/internal/ProcessHolder.java   |    4 +-
 .../geode/test/dunit/internal/ProcessManager.java  |   76 +-
 .../test/dunit/internal/StandAloneDUnitEnv.java    |    2 +-
 .../apache/geode/test/dunit/rules/CacheRule.java   |    2 +-
 .../geode/test/dunit/rules/CacheXmlRule.java       |   31 +-
 .../geode/test/dunit/rules/ClientCacheRule.java    |    2 +-
 .../apache/geode/test/dunit/rules/ClientVM.java    |    2 +-
 .../geode/test/dunit/rules/ClusterStartupRule.java |   37 +-
 .../test/dunit/rules/DistributedBlackboard.java    |    6 +-
 .../test/dunit/rules/DistributedDiskDirRule.java   |   18 +-
 .../dunit/rules/DistributedErrorCollector.java     |    4 +-
 .../rules/DistributedExecutorServiceRule.java      |  173 +-
 .../geode/test/dunit/rules/DistributedMap.java     |    2 +-
 .../test/dunit/rules/DistributedReference.java     |    8 +-
 .../rules/DistributedRestoreSystemProperties.java  |    8 +-
 .../geode/test/dunit/rules/DistributedRule.java    |    4 +-
 .../DistributedUseJacksonForJsonPathRule.java      |    8 +-
 .../apache/geode/test/dunit/rules/MemberVM.java    |    4 +-
 .../test/dunit/rules/SerializableFunction.java     |    7 +
 .../apache/geode/test/greplogs/LogConsumer.java    |    2 +-
 .../geode/test/junit/rules/ClientCacheRule.java    |    6 +-
 .../apache/geode/test/junit/rules/DiskDirRule.java |   14 +-
 .../geode/test/junit/rules/GfshCommandRule.java    |   22 +-
 .../junit/rules/LocatorLauncherStartupRule.java    |    5 +-
 .../geode/test/junit/rules/MemberStarterRule.java  |   29 +-
 .../junit/rules/ServerLauncherStartupRule.java     |    5 +-
 .../geode/test/junit/rules/ServerStarterRule.java  |   14 +-
 .../apache/geode/test/junit/rules/VMProvider.java  |    6 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../sanctioned-geode-dunit-serializables.txt       |  185 ++
 .../security/templates/PKCSPrincipalTest.java      |    2 +-
 .../security/templates/UsernamePrincipalTest.java  |    2 +-
 .../test/dunit/internal/VMEventNotifierTest.java   |    4 +-
 geode-dunit/src/test/resources/expected-pom.xml    |    5 +
 geode-for-redis/README.md                          |  324 ++
 geode-for-redis/build.gradle                       |  136 +
 .../gfsh.png                                       |  Bin
 ...CommandPipeliningNativeRedisAcceptanceTest.java |    0
 .../GeodeRedisServerStartupAcceptanceTest.java     |  217 ++
 .../apache/geode/redis/NativeRedisClusterTest.java |  109 +
 ...eRedisServerStartupUsingGfshAcceptanceTest.java |  167 +
 .../GlobPatternNativeRedisAcceptanceTest.java      |   32 +
 .../executor/UnknownNativeRedisAcceptanceTest.java |   32 +
 .../cluster/ClusterNativeRedisAcceptanceTest.java  |   31 +
 .../connection/AuthNativeRedisAcceptanceTest.java  |   79 +
 .../ClientNativeRedisAcceptanceTest.java           |   34 +
 .../connection/EchoNativeRedisAcceptanceTest.java  |   37 +
 .../connection/PingNativeRedisAcceptanceTest.java  |   33 +
 .../SelectNativeRedisAcceptanceTest.java           |   33 +
 .../hash/HScanNativeRedisAcceptanceTest.java       |   35 +
 .../hash/HashesNativeRedisAcceptanceTest.java      |   36 +
 .../hash/HincrByFloatNativeRedisAccetanceTest.java |   36 +
 .../executor/key/DelNativeRedisAcceptanceTest.java |   37 +
 .../key/DumpRestoreNativeRedisAcceptanceTest.java  |   37 +
 .../key/ExistsNativeRedisAcceptanceTest.java       |   37 +
 .../key/ExpireAtNativeRedisAcceptanceTest.java     |   37 +
 .../key/ExpireNativeRedisAcceptanceTest.java       |   37 +
 .../key/KeysNativeRedisAcceptanceTest.java         |   36 +
 .../key/PExpireAtNativeRedisAcceptanceTest.java    |   37 +
 .../key/PTTLNativeRedisAcceptanceTest.java         |   37 +
 .../key/PersistNativeRedisAcceptanceTest.java      |   37 +
 .../key/PexpireNativeRedisAcceptanceTest.java      |   37 +
 .../key/RenameNXNativeRedisAcceptanceTest.java     |   36 +
 .../key/RenameNativeRedisAcceptanceTest.java       |   36 +
 .../key/ScanNativeRedisAcceptanceTest.java         |   37 +
 .../executor/key/TTLNativeRedisAcceptanceTest.java |   35 +
 .../key/TypeNativeRedisAcceptanceTest.java         |   35 +
 .../key/UnlinkNativeRedisAcceptanceTest.java       |   37 +
 .../LettucePubSubNativeRedisAcceptanceTest.java    |   32 +
 .../NativeRedisSubCommandsIntegrationTest.java     |   38 +
 .../pubsub/PubSubNativeRedisAcceptanceTest.java    |   88 +
 .../SubscriptionsNativeRedisAcceptanceTest.java    |   31 +
 .../server/DBSizeNativeRedisAcceptanceTest.java    |   32 +
 .../server/FlushAllNativeRedisAcceptanceTest.java  |   32 +
 .../server/FlushDBNativeRedisAcceptanceTest.java   |   32 +
 .../HitsMissesNativeRedisAcceptanceTest.java       |   31 +
 .../server/InfoNativeRedisAcceptanceTest.java      |   31 +
 .../server/InfoStatsNativeRedisAcceptanceTest.java |   41 +
 .../MemoryStatsNativeRedisAcceptanceTest.java      |   37 +
 .../server/SlowlogNativeRedisAcceptanceTest.java   |   31 +
 .../server/TimeNativeRedisAcceptanceTest.java      |   32 +
 .../set/SCardNativeRedisAcceptanceTest.java        |   34 +
 .../set/SDiffNativeRedisAcceptanceTest.java        |   37 +
 .../set/SDiffStoreNativeRedisAcceptanceTest.java   |   37 +
 .../set/SInterNativeRedisAcceptanceTest.java       |   37 +
 .../set/SInterStoreNativeRedisAcceptanceTest.java  |   37 +
 .../set/SIsMemberNativeRedisAcceptanceTest.java    |   36 +
 .../set/SMoveNativeRedisAcceptanceTest.java        |   37 +
 .../set/SPopNativeRedisAcceptanceTest.java         |   37 +
 .../set/SRandMemberNativeRedisAcceptanceTest.java  |   34 +
 .../set/SRemNativeRedisAcceptanceTest.java         |   37 +
 .../set/SScanNativeRedisAcceptanceTest.java        |   37 +
 .../set/SUnionNativeRedisAcceptanceTest.java       |   37 +
 .../set/SUnionStoreNativeRedisAcceptanceTest.java  |   36 +
 .../set/SetsNativeRedisAcceptanceTest.java         |   37 +
 .../sortedset/ZAddNativeRedisAcceptanceTest.java   |   36 +
 .../sortedset/ZCardNativeRedisAcceptanceTest.java  |   36 +
 .../sortedset/ZCountNativeRedisAcceptanceTest.java |   35 +
 .../ZIncrByNativeRedisIntegrationTest.java         |   35 +
 .../ZInterStoreNativeRedisAcceptanceTest.java      |   36 +
 .../ZLexCountNativeRedisAcceptanceTest.java        |   34 +
 .../ZPopMaxNativeRedisAcceptanceTest.java          |   36 +
 .../ZPopMinNativeRedisAcceptanceTest.java          |   36 +
 .../ZRangeByLexNativeRedisAcceptanceTest.java      |   34 +
 .../ZRangeByScoreNativeRedisAcceptanceTest.java    |   35 +
 .../sortedset/ZRangeNativeRedisAcceptanceTest.java |   36 +
 .../sortedset/ZRankNativeRedisAcceptanceTest.java  |   35 +
 .../sortedset/ZRemNativeRedisAcceptanceTest.java   |   34 +
 .../ZRemRangeByLexNativeRedisAcceptanceTest.java   |   34 +
 .../ZRemRangeByRankNativeRedisAcceptanceTest.java  |   35 +
 .../ZRemRangeByScoreNativeRedisAcceptanceTest.java |   35 +
 .../ZRevRangeByLexNativeRedisAcceptanceTest.java   |   34 +
 .../ZRevRangeByScoreNativeRedisAcceptanceTest.java |   36 +
 .../ZRevRangeNativeRedisAcceptanceTest.java        |   36 +
 .../ZRevRankNativeRedisAcceptanceTest.java         |   35 +
 .../sortedset/ZScanNativeRedisIntegrationTest.java |   35 +
 .../sortedset/ZScoreNativeRedisAcceptanceTest.java |   35 +
 .../ZUnionStoreNativeRedisAcceptanceTest.java      |   36 +
 .../string/AppendNativeRedisAcceptanceTest.java    |   35 +
 .../string/BitCountNativeRedisAcceptanceTest.java  |   35 +
 .../string/BitOpNativeRedisAcceptanceTest.java     |   35 +
 .../string/BitPosNativeRedisAcceptanceTest.java    |   31 +
 .../string/DecrByNativeRedisAcceptanceTest.java    |   35 +
 .../string/DecrNativeRedisAcceptanceTest.java      |   36 +
 .../string/GetBitNativeRedisAcceptanceTest.java    |   35 +
 .../string/GetNativeRedisAcceptanceTest.java       |   35 +
 .../string/GetRangeNativeRedisAcceptanceTest.java  |   36 +
 .../string/GetSetNativeRedisAcceptanceTest.java    |   36 +
 .../IncrByFloatNativeRedisAcceptanceTest.java      |   35 +
 .../string/IncrByNativeRedisAcceptanceTest.java    |   35 +
 .../string/IncrNativeRedisAcceptanceTest.java      |   36 +
 .../string/MGetNativeRedisAcceptanceTest.java      |   35 +
 .../string/MSetNXNativeRedisAcceptanceTest.java    |   36 +
 .../string/MSetNativeRedisAcceptanceTest.java      |   36 +
 .../string/PSetEXNativeRedisAcceptanceTest.java    |   36 +
 .../string/SetBitNativeRedisAcceptanceTest.java    |   36 +
 .../string/SetExNativeRedisAcceptanceTest.java     |   36 +
 .../string/SetNXNativeRedisAcceptanceTest.java     |   36 +
 .../string/SetNativeRedisAcceptanceTest.java       |   35 +
 .../string/SetRangeNativeRedisAcceptanceTest.java  |   36 +
 .../string/StringNativeRedisAcceptanceTest.java    |   36 +
 .../MemoryOverheadNativeRedisAcceptanceTest.java   |   62 +
 .../session/NativeRedisSessionAcceptanceTest.java  |   62 +
 ...NativeRedisSessionExpirationAcceptanceTest.java |   56 +
 .../resources/0001-configure-redis-tests.patch     | 2546 ++++++++++++++++
 .../resources/testcontainers.properties            |    0
 .../java/org/apache/geode/NativeRedisTestRule.java |   94 +
 .../java/org/apache/geode/redis/ClusterNode.java   |   76 +
 .../java/org/apache/geode/redis/ClusterNodes.java  |  126 +
 .../geode/redis/ConcurrentLoopingThreads.java      |  191 ++
 .../apache/geode/redis/GeodeRedisServerRule.java   |   86 +
 .../geode/redis/NativeRedisClusterTestRule.java    |  199 ++
 .../apache/geode/redis/RedisIntegrationTest.java   |   42 +
 .../proxy/ClusterNodesResponseProcessor.java       |   65 +
 .../proxy/ClusterSlotsResponseProcessor.java       |    0
 .../geode/redis/internal/proxy/HostPort.java       |    0
 .../redis/internal/proxy/MovedResponseHandler.java |    0
 .../internal/proxy/NoopRedisResponseProcessor.java |    0
 .../geode/redis/internal/proxy/RedisProxy.java     |   88 +
 .../internal/proxy/RedisProxyInboundHandler.java   |  191 ++
 .../internal/proxy/RedisProxyOutboundHandler.java  |    0
 .../internal/proxy/RedisResponseProcessor.java     |    0
 .../geode/redis/internal/ssl/TestSSLServer.java    | 1491 +++++++++
 .../geode/redis/mocks/MockBinarySubscriber.java    |   45 +
 .../apache/geode/redis/mocks/MockSubscriber.java   |  262 ++
 .../test/dunit/rules/RedisClusterStartupRule.java  |  273 ++
 .../commonTest/resources/redis-cluster-compose.yml |   65 +
 .../geode/redis/CheckPrimaryBucketFunction.java    |  137 +
 .../redis/EnsurePrimaryStaysPutDUnitTest.java      |    0
 .../geode/redis/ExpiringSecurityManager.java       |   57 +
 .../apache/geode/redis/OutOfMemoryDUnitTest.java   |  380 +++
 .../org/apache/geode/redis/RedisDistDUnitTest.java |  229 ++
 .../java/org/apache/geode/redis/SSLDUnitTest.java  |  336 +++
 .../geode/redis/UserExpirationDUnitTest.java       |  114 +
 .../commands/executor/FlushAllDUnitTest.java       |  108 +
 .../internal/commands/executor/MovedDUnitTest.java |  172 ++
 .../cluster/ClusterSlotsAndNodesDUnitTest.java     |  317 ++
 .../cluster/JedisAndLettuceClusterDUnitTest.java   |   85 +
 .../commands/executor/hash/HExistsDUnitTest.java   |  134 +
 .../commands/executor/hash/HGetDUnitTest.java      |   89 +
 .../commands/executor/hash/HKeysDUnitTest.java     |  156 +
 .../commands/executor/hash/HMgetDUnitTest.java     |   96 +
 .../commands/executor/hash/HMsetDUnitTest.java     |  231 ++
 .../commands/executor/hash/HScanDunitTest.java     |  157 +
 .../commands/executor/hash/HSetNXDunitTest.java    |   85 +
 .../executor/hash/HashesAndCrashesDUnitTest.java   |  290 ++
 .../commands/executor/hash/HdelDUnitTest.java      |  164 +
 .../commands/executor/hash/HlenDUnitTest.java      |  164 +
 .../commands/executor/hash/HsetDUnitTest.java      |  232 ++
 .../commands/executor/hash/HstrlenDUnitTest.java   |   97 +
 .../commands/executor/hash/HvalsDUnitTest.java     |   96 +
 .../key/AbstractRenameRedirectionsDUnitTest.java   |  110 +
 .../commands/executor/key/ExpireDUnitTest.java     |  179 ++
 .../NativeRedisRenameRedirectionsDUnitTest.java    |   36 +
 .../commands/executor/key/PersistDUnitTest.java    |  114 +
 .../key/RadishRenameRedirectionsDUnitTest.java     |   45 +
 .../commands/executor/key/RenameDUnitTest.java     |  352 +++
 .../executor/pubsub/PubSubConcurrentDUnitTest.java |  295 ++
 .../commands/executor/pubsub/PubSubDUnitTest.java  |  490 +++
 .../commands/executor/set/SaddDUnitTest.java       |  150 +
 .../commands/executor/set/SremDUnitTest.java       |  173 ++
 .../commands/executor/sortedset/ZAddDUnitTest.java |  129 +
 .../sortedset/ZAddIncrOptionDUnitTest.java         |  230 ++
 .../commands/executor/sortedset/ZRemDUnitTest.java |  275 ++
 .../sortedset/ZRemRangeByLexDUnitTest.java         |  277 ++
 .../sortedset/ZRemRangeByRankDUnitTest.java        |  245 ++
 .../sortedset/ZRemRangeByScoreDUnitTest.java       |  258 ++
 .../commands/executor/string/MSetDUnitTest.java    |  193 ++
 .../commands/executor/string/MSetNXDUnitTest.java  |  183 ++
 .../commands/executor/string/StringsDUnitTest.java |  371 +++
 .../geode/redis/internal/data/DeltaDUnitTest.java  |  213 ++
 .../data/PartitionedRegionStatsUpdateTest.java     |  467 +++
 .../auth/AuthWhileServersRestartDUnitTest.java     |  133 +
 .../StringsKillMultipleServersDUnitTest.java       |  115 +
 .../cluster/RedisPartitionResolverDUnitTest.java   |  128 +
 .../geode/redis/session/RedisSessionDUnitTest.java |  157 +
 .../geode/redis/session/SessionDUnitTest.java      |  253 ++
 .../redis/session/SessionExpirationDUnitTest.java  |  177 ++
 .../redis/session/SessionsAndCrashesDUnitTest.java |  225 ++
 .../RedisSpringTestApplication.java                |    0
 .../SessionController.java                         |    0
 .../config/SessionListener.java                    |    0
 .../config/WebMvcConfig.java                       |   62 +
 .../AnalyzeRedisSerializablesIntegrationTest.java  |   37 +
 .../AbstractCommandPipeliningIntegrationTest.java  |  124 +
 .../redis/CommandPipeliningIntegrationTest.java    |    0
 .../geode/redis/ConcurrentLoopingThreadsTest.java  |  148 +
 .../redis/RedisCommandArgumentsTestHelper.java     |  129 +
 .../org/apache/geode/redis/RedisTestHelper.java    |   44 +
 .../geode/redis/internal/GeodeServerRunTest.java   |    0
 ...ctionedSerializablesServiceIntegrationTest.java |   40 +
 .../AbstractGlobPatternIntegrationTest.java        |  292 ++
 .../executor/AbstractUnknownIntegrationTest.java   |   91 +
 .../executor/GlobPatternIntegrationTest.java       |   32 +
 .../commands/executor/UnknownIntegrationTest.java  |   40 +
 .../cluster/AbstractClusterIntegrationTest.java    |  100 +
 .../executor/cluster/ClusterIntegrationTest.java   |   46 +
 .../common/UnsupportedCommandsIntegrationTest.java |   86 +
 .../connection/AbstractAuthIntegrationTest.java    |  285 ++
 .../connection/AbstractClientIntegrationTest.java  |  137 +
 .../connection/AbstractEchoIntegrationTest.java    |   56 +
 .../connection/AbstractPingIntegrationTest.java    |   74 +
 .../connection/AbstractSelectIntegrationTest.java  |   56 +
 .../executor/connection/AuthIntegrationTest.java   |  327 ++
 .../executor/connection/ClientIntegrationTest.java |   40 +
 .../executor/connection/EchoIntegrationTest.java   |   33 +
 .../executor/connection/PingIntegrationTest.java   |   33 +
 .../executor/connection/QuitIntegrationTest.java   |   83 +
 .../executor/connection/SelectIntegrationTest.java |   44 +
 .../hash/AbstractHScanIntegrationTest.java         |  614 ++++
 .../hash/AbstractHashesIntegrationTest.java        |  908 ++++++
 .../hash/AbstractHincrByFloatIntegrationTest.java  |  182 ++
 .../executor/hash/HScanIntegrationTest.java        |   50 +
 .../executor/hash/HashesIntegrationTest.java       |   31 +
 .../executor/hash/HincrByFloatIntegrationTest.java |   32 +
 .../executor/key/AbstractDelIntegrationTest.java   |  118 +
 .../key/AbstractDumpRestoreIntegrationTest.java    |  258 ++
 .../key/AbstractExistsIntegrationTest.java         |  192 ++
 .../key/AbstractExpireAtIntegrationTest.java       |  129 +
 .../key/AbstractExpireIntegrationTest.java         |  355 +++
 .../executor/key/AbstractKeysIntegrationTest.java  |  125 +
 .../key/AbstractPExpireAtIntegrationTest.java      |   72 +
 .../executor/key/AbstractPTTLIntegrationTest.java  |   65 +
 .../key/AbstractPersistIntegrationTest.java        |  145 +
 .../key/AbstractPexpireIntegrationTest.java        |  108 +
 .../key/AbstractRenameIntegrationTest.java         |  438 +++
 .../key/AbstractRenameNXIntegrationTest.java       |  447 +++
 .../executor/key/AbstractScanIntegrationTest.java  |  304 ++
 .../executor/key/AbstractTTLIntegrationTest.java   |   83 +
 .../executor/key/AbstractTypeIntegrationTest.java  |   78 +
 .../key/AbstractUnlinkIntegrationTest.java         |  118 +
 .../commands/executor/key/DelIntegrationTest.java  |   32 +
 .../executor/key/DumpRestoreIntegrationTest.java   |   67 +
 .../executor/key/ExistsIntegrationTest.java        |   32 +
 .../executor/key/ExpireAtIntegrationTest.java      |   32 +
 .../executor/key/ExpireIntegrationTest.java        |   32 +
 .../commands/executor/key/KeysIntegrationTest.java |   33 +
 .../executor/key/PExpireAtIntegrationTest.java     |   32 +
 .../commands/executor/key/PTTLIntegrationTest.java |   32 +
 .../executor/key/PersistIntegrationTest.java       |   31 +
 .../executor/key/PexpireIntegrationTest.java       |   32 +
 .../executor/key/RenameIntegrationTest.java        |   32 +
 .../executor/key/RenameNXIntegrationTest.java      |   32 +
 .../commands/executor/key/ScanIntegrationTest.java |   56 +
 .../commands/executor/key/TTLIntegrationTest.java  |   32 +
 .../commands/executor/key/TypeIntegrationTest.java |   33 +
 .../executor/key/UnlinkIntegrationTest.java        |   32 +
 .../AbstractLettucePubSubIntegrationTest.java      |  384 +++
 .../pubsub/AbstractPubSubIntegrationTest.java      |  981 ++++++
 .../pubsub/AbstractSubCommandsIntegrationTest.java |  379 +++
 .../AbstractSubscriptionsIntegrationTest.java      |  202 ++
 .../pubsub/LettucePubSubIntegrationTest.java       |   32 +
 .../executor/pubsub/PubSubIntegrationTest.java     |   31 +
 .../pubsub/SubCommandsIntegrationTest.java         |   33 +
 .../pubsub/SubscriptionsIntegrationTest.java       |   53 +
 .../server/AbstractDBSizeIntegrationTest.java      |   52 +
 .../server/AbstractFlushAllIntegrationTest.java    |   67 +
 .../server/AbstractFlushDBIntegrationTest.java     |   59 +
 .../server/AbstractHitsMissesIntegrationTest.java  |  641 ++++
 .../server/AbstractInfoIntegrationTest.java        |  294 ++
 .../AbstractRedisInfoStatsIntegrationTest.java     |  319 ++
 .../AbstractRedisMemoryStatsIntegrationTest.java   |   91 +
 .../server/AbstractSlowlogIntegrationTest.java     |  151 +
 .../server/AbstractTimeIntegrationTest.java        |   74 +
 .../executor/server/CommandIntegrationTest.java    |  183 ++
 .../executor/server/DBSizeIntegrationTest.java     |   32 +
 .../executor/server/FlushAllIntegrationTest.java   |   39 +
 .../executor/server/FlushDBIntegrationTest.java    |   33 +
 .../executor/server/HitsMissesIntegrationTest.java |   32 +
 .../executor/server/InfoIntegrationTest.java       |   46 +
 .../executor/server/InfoStatsIntegrationTest.java  |   41 +
 .../executor/server/LolWutIntegrationTest.java     |  139 +
 .../server/MemoryStatsIntegrationTest.java         |   30 +
 .../executor/server/ShutdownIntegrationTest.java   |   62 +
 .../executor/server/SlowlogIntegrationTest.java    |   34 +
 .../executor/server/TimeIntegrationTest.java       |   32 +
 .../executor/set/AbstractSCardIntegrationTest.java |  105 +
 .../executor/set/AbstractSDiffIntegrationTest.java |  235 ++
 .../set/AbstractSDiffStoreIntegrationTest.java     |  235 ++
 .../set/AbstractSInterIntegrationTest.java         |  194 ++
 .../set/AbstractSInterStoreIntegrationTest.java    |  237 ++
 .../set/AbstractSIsMemberIntegrationTest.java      |  110 +
 .../executor/set/AbstractSMoveIntegrationTest.java |  243 ++
 .../executor/set/AbstractSPopIntegrationTest.java  |  198 ++
 .../set/AbstractSRandMemberIntegrationTest.java    |  165 +
 .../executor/set/AbstractSRemIntegrationTest.java  |  180 ++
 .../executor/set/AbstractSScanIntegrationTest.java |  476 +++
 .../set/AbstractSUnionIntegrationTest.java         |  189 ++
 .../set/AbstractSUnionStoreIntegrationTest.java    |  244 ++
 .../executor/set/AbstractSetsIntegrationTest.java  |  126 +
 .../executor/set/SCardIntegrationTest.java         |   29 +
 .../executor/set/SDiffIntegrationTest.java         |   31 +
 .../executor/set/SDiffStoreIntegrationTest.java    |   31 +
 .../executor/set/SInterIntegrationTest.java        |   31 +
 .../executor/set/SInterStoreIntegrationTest.java   |   31 +
 .../executor/set/SIsMemberIntegrationTest.java     |   31 +
 .../executor/set/SMoveIntegrationTest.java         |   31 +
 .../commands/executor/set/SPopIntegrationTest.java |   31 +
 .../executor/set/SRandMemberIntegrationTest.java   |   29 +
 .../commands/executor/set/SRemIntegrationTest.java |   31 +
 .../executor/set/SScanIntegrationTest.java         |   65 +
 .../executor/set/SUnionIntegrationTest.java        |   31 +
 .../executor/set/SUnionStoreIntegrationTest.java   |   31 +
 .../commands/executor/set/SetsIntegrationTest.java |   31 +
 .../sortedset/AbstractZAddIntegrationTest.java     |  487 +++
 .../sortedset/AbstractZCardIntegrationTest.java    |   88 +
 .../sortedset/AbstractZCountIntegrationTest.java   |  207 ++
 .../sortedset/AbstractZIncrByIntegrationTest.java  |  312 ++
 .../AbstractZInterStoreIntegrationTest.java        |  842 ++++++
 .../AbstractZLexCountIntegrationTest.java          |  247 ++
 .../sortedset/AbstractZPopMaxIntegrationTest.java  |  163 +
 .../sortedset/AbstractZPopMinIntegrationTest.java  |  176 ++
 .../AbstractZRangeByLexIntegrationTest.java        |  442 +++
 .../AbstractZRangeByScoreIntegrationTest.java      |  400 +++
 .../sortedset/AbstractZRangeIntegrationTest.java   |  165 +
 .../sortedset/AbstractZRankIntegrationTest.java    |  247 ++
 .../sortedset/AbstractZRemIntegrationTest.java     |  153 +
 .../AbstractZRemRangeByLexIntegrationTest.java     |  317 ++
 .../AbstractZRemRangeByRankIntegrationTest.java    |  206 ++
 .../AbstractZRemRangeByScoreIntegrationTest.java   |  271 ++
 .../AbstractZRevRangeByLexIntegrationTest.java     |  451 +++
 .../AbstractZRevRangeByScoreIntegrationTest.java   |  388 +++
 .../AbstractZRevRangeIntegrationTest.java          |  200 ++
 .../sortedset/AbstractZRevRankIntegrationTest.java |  141 +
 .../sortedset/AbstractZScanIntegrationTest.java    |  566 ++++
 .../sortedset/AbstractZScoreIntegrationTest.java   |   97 +
 .../AbstractZUnionStoreIntegrationTest.java        |  543 ++++
 .../executor/sortedset/ZAddIntegrationTest.java    |   31 +
 .../executor/sortedset/ZCardIntegrationTest.java   |   31 +
 .../executor/sortedset/ZCountIntegrationTest.java  |   30 +
 .../executor/sortedset/ZIncrByIntegrationTest.java |   30 +
 .../sortedset/ZInterStoreIntegrationTest.java      |   31 +
 .../sortedset/ZLexCountIntegrationTest.java        |   30 +
 .../executor/sortedset/ZPopMaxIntegrationTest.java |   31 +
 .../executor/sortedset/ZPopMinIntegrationTest.java |   31 +
 .../sortedset/ZRangeByLexIntegrationTest.java      |   30 +
 .../sortedset/ZRangeByScoreIntegrationTest.java    |   30 +
 .../executor/sortedset/ZRangeIntegrationTest.java  |   31 +
 .../executor/sortedset/ZRankIntegrationTest.java   |   31 +
 .../executor/sortedset/ZRemIntegrationTest.java    |   29 +
 .../sortedset/ZRemRangeByLexIntegrationTest.java   |   30 +
 .../sortedset/ZRemRangeByRankIntegrationTest.java  |   29 +
 .../sortedset/ZRemRangeByScoreIntegrationTest.java |   29 +
 .../sortedset/ZRevRangeByLexIntegrationTest.java   |   30 +
 .../sortedset/ZRevRangeByScoreIntegrationTest.java |   30 +
 .../sortedset/ZRevRangeIntegrationTest.java        |   31 +
 .../sortedset/ZRevRankIntegrationTest.java         |   30 +
 .../executor/sortedset/ZScanIntegrationTest.java   |   48 +
 .../executor/sortedset/ZScoreIntegrationTest.java  |   31 +
 .../sortedset/ZUnionStoreIntegrationTest.java      |   31 +
 .../string/AbstractAppendIntegrationTest.java      |  136 +
 .../string/AbstractBitCountIntegrationTest.java    |  111 +
 .../string/AbstractBitOpIntegrationTest.java       |  222 ++
 .../string/AbstractBitPosIntegrationTest.java      |  182 ++
 .../string/AbstractDecrByIntegrationTest.java      |  165 +
 .../string/AbstractDecrIntegrationTest.java        |   89 +
 .../string/AbstractGetBitIntegrationTest.java      |   88 +
 .../string/AbstractGetIntegrationTest.java         |   93 +
 .../string/AbstractGetRangeIntegrationTest.java    |  267 ++
 .../string/AbstractGetSetIntegrationTest.java      |  136 +
 .../string/AbstractIncrByFloatIntegrationTest.java |  183 ++
 .../string/AbstractIncrByIntegrationTest.java      |  137 +
 .../string/AbstractIncrIntegrationTest.java        |  121 +
 .../AbstractLettuceAppendIntegrationTest.java      |   61 +
 .../string/AbstractMGetIntegrationTest.java        |   97 +
 .../string/AbstractMSetIntegrationTest.java        |  158 +
 .../string/AbstractMSetNXIntegrationTest.java      |  172 ++
 .../string/AbstractPSetEXIntegrationTest.java      |   65 +
 .../string/AbstractSetBitIntegrationTest.java      |  104 +
 .../string/AbstractSetEXIntegrationTest.java       |   63 +
 .../string/AbstractSetIntegrationTest.java         |  546 ++++
 .../string/AbstractSetNXIntegrationTest.java       |  105 +
 .../string/AbstractSetRangeIntegrationTest.java    |  116 +
 .../string/AbstractStringIntegrationTest.java      |  159 +
 .../executor/string/AppendIntegrationTest.java     |   31 +
 .../executor/string/BitCountIntegrationTest.java   |   31 +
 .../executor/string/BitOpIntegrationTest.java      |   31 +
 .../executor/string/BitPosIntegrationTest.java     |   32 +
 .../executor/string/DecrByIntegrationTest.java     |   31 +
 .../executor/string/DecrIntegrationTest.java       |   31 +
 .../executor/string/GetBitIntegrationTest.java     |   31 +
 .../executor/string/GetIntegrationTest.java        |   31 +
 .../executor/string/GetRangeIntegrationTest.java   |   31 +
 .../executor/string/GetSetIntegrationTest.java     |   31 +
 .../string/IncrByFloatIntegrationTest.java         |   31 +
 .../executor/string/IncrByIntegrationTest.java     |   31 +
 .../executor/string/IncrIntegrationTest.java       |   31 +
 .../string/LettuceAppendIntegrationTest.java       |   31 +
 .../executor/string/MGetIntegrationTest.java       |   31 +
 .../executor/string/MSetIntegrationTest.java       |   31 +
 .../executor/string/MSetNXIntegrationTest.java     |   31 +
 .../executor/string/PSetEXIntegrationTest.java     |   31 +
 .../executor/string/SetBitIntegrationTest.java     |   31 +
 .../executor/string/SetEXIntegrationTest.java      |   31 +
 .../executor/string/SetIntegrationTest.java        |   31 +
 .../executor/string/SetNXIntegrationTest.java      |   31 +
 .../executor/string/SetRangeIntegrationTest.java   |   31 +
 .../executor/string/StringIntegrationTest.java     |   31 +
 .../AbstractMemoryOverheadIntegrationTest.java     |  290 ++
 .../data/MemoryOverheadIntegrationTest.java        |  106 +
 .../pubsub/SubscriptionsIntegrationTest.java       |  140 +
 .../LockingStripedCoordinatorIntegrationTest.java  |   67 +
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   19 +
 .../codeAnalysis/sanctionedDataSerializables.txt   |   35 +
 .../collections/OrderedStatisticTreeBenchmark.java |   71 +
 .../data/collections/RedisHashMapBenchmark.java    |   71 +
 .../geode/redis/internal/GeodeRedisServer.java     |  179 ++
 .../geode/redis/internal/GeodeRedisService.java    |  119 +
 .../geode/redis/internal/RedisConstants.java       |   98 +
 .../geode/redis/internal/RedisException.java       |   42 +
 .../geode/redis/internal/RedisProperties.java      |  105 +
 .../geode/redis/internal/commands/Command.java     |  233 ++
 .../commands/RedisCommandSupportLevel.java         |   23 +
 .../redis/internal/commands/RedisCommandType.java  |  575 ++++
 .../internal/commands/executor/BaseSetOptions.java |   57 +
 .../commands/executor/CommandExecutor.java         |   39 +
 .../internal/commands/executor/GlobPattern.java    |  134 +
 .../internal/commands/executor/RedisResponse.java  |  216 ++
 .../commands/executor/UnknownExecutor.java         |   52 +
 .../internal/commands/executor/cluster/CRC16.java  |   79 +
 .../commands/executor/cluster/ClusterExecutor.java |  196 ++
 .../executor/cluster/RedisPartitionResolver.java   |   35 +
 .../commands/executor/connection/AuthExecutor.java |   66 +
 .../executor/connection/ClientExecutor.java        |   81 +
 .../commands/executor/connection/EchoExecutor.java |   31 +
 .../commands/executor/connection/PingExecutor.java |   58 +
 .../commands/executor/connection/QuitExecutor.java |   32 +
 .../executor/connection/SelectExecutor.java        |   36 +
 .../commands/executor/hash/HDelExecutor.java       |   61 +
 .../commands/executor/hash/HExistsExecutor.java    |   55 +
 .../commands/executor/hash/HGetAllExecutor.java    |   55 +
 .../commands/executor/hash/HGetExecutor.java       |   55 +
 .../commands/executor/hash/HIncrByExecutor.java    |   77 +
 .../executor/hash/HIncrByFloatExecutor.java        |   79 +
 .../commands/executor/hash/HKeysExecutor.java      |   54 +
 .../commands/executor/hash/HLenExecutor.java       |   49 +
 .../commands/executor/hash/HMGetExecutor.java      |   57 +
 .../commands/executor/hash/HMSetExecutor.java      |   64 +
 .../commands/executor/hash/HScanExecutor.java      |   42 +
 .../commands/executor/hash/HSetExecutor.java       |   62 +
 .../commands/executor/hash/HSetNXExecutor.java     |   41 +
 .../commands/executor/hash/HStrLenExecutor.java    |   39 +
 .../commands/executor/hash/HValsExecutor.java      |   63 +
 .../executor/key/AbstractRenameExecutor.java       |   77 +
 .../executor/key/AbstractScanExecutor.java         |  130 +
 .../commands/executor/key/DelExecutor.java         |   48 +
 .../commands/executor/key/DumpExecutor.java        |   41 +
 .../commands/executor/key/ExistsExecutor.java      |   47 +
 .../commands/executor/key/ExpireAtExecutor.java    |   61 +
 .../commands/executor/key/ExpireExecutor.java      |   66 +
 .../commands/executor/key/KeysExecutor.java        |   54 +
 .../commands/executor/key/PExpireAtExecutor.java   |   26 +
 .../commands/executor/key/PExpireExecutor.java     |   26 +
 .../commands/executor/key/PTTLExecutor.java        |   27 +
 .../commands/executor/key/PersistExecutor.java     |   37 +
 .../commands/executor/key/RenameExecutor.java      |   48 +
 .../commands/executor/key/RenameNXExecutor.java    |   47 +
 .../commands/executor/key/RestoreExecutor.java     |  111 +
 .../commands/executor/key/RestoreOptions.java      |   42 +
 .../commands/executor/key/ScanExecutor.java        |  147 +
 .../commands/executor/key/TTLExecutor.java         |   61 +
 .../commands/executor/key/TypeExecutor.java        |   41 +
 .../executor/pubsub/PsubscribeExecutor.java        |   45 +
 .../commands/executor/pubsub/PubSubExecutor.java   |   73 +
 .../commands/executor/pubsub/PublishExecutor.java  |   40 +
 .../executor/pubsub/PunsubscribeExecutor.java      |   37 +
 .../executor/pubsub/SubscribeExecutor.java         |   70 +
 .../executor/pubsub/UnsubscribeExecutor.java       |   37 +
 .../executor/server/CommandCommandExecutor.java    |   91 +
 .../commands/executor/server/DBSizeExecutor.java   |   33 +
 .../commands/executor/server/FlushAllExecutor.java |   41 +
 .../commands/executor/server/InfoExecutor.java     |  201 ++
 .../commands/executor/server/LolWutExecutor.java   |  180 ++
 .../commands/executor/server/SlowlogExecutor.java  |   46 +
 .../commands/executor/server/TimeExecutor.java     |   35 +
 .../commands/executor/set/SAddExecutor.java        |   42 +
 .../commands/executor/set/SCardExecutor.java       |   33 +
 .../commands/executor/set/SDiffExecutor.java       |   32 +
 .../commands/executor/set/SDiffStoreExecutor.java  |   31 +
 .../commands/executor/set/SInterExecutor.java      |   31 +
 .../commands/executor/set/SInterStoreExecutor.java |   32 +
 .../commands/executor/set/SIsMemberExecutor.java   |   36 +
 .../commands/executor/set/SMembersExecutor.java    |   36 +
 .../commands/executor/set/SMoveExecutor.java       |   44 +
 .../commands/executor/set/SPopExecutor.java        |   50 +
 .../commands/executor/set/SRandMemberExecutor.java |   43 +
 .../commands/executor/set/SRemExecutor.java        |   43 +
 .../commands/executor/set/SScanExecutor.java       |   43 +
 .../commands/executor/set/SUnionExecutor.java      |   31 +
 .../commands/executor/set/SUnionStoreExecutor.java |   30 +
 .../commands/executor/set/SetOpExecutor.java       |   65 +
 .../commands/executor/set/SetRandomExecutor.java   |   65 +
 .../sortedset/AbstractSortedSetRangeExecutor.java  |   53 +
 .../sortedset/AbstractSortedSetRangeOptions.java   |  167 +
 .../executor/sortedset/AbstractZPopExecutor.java   |   52 +
 .../executor/sortedset/AbstractZRankExecutor.java  |   46 +
 .../sortedset/SortedSetLexRangeOptions.java        |  116 +
 .../sortedset/SortedSetRankRangeOptions.java       |   97 +
 .../sortedset/SortedSetScoreRangeOptions.java      |   82 +
 .../commands/executor/sortedset/ZAddExecutor.java  |  146 +
 .../commands/executor/sortedset/ZAddOptions.java   |   45 +
 .../commands/executor/sortedset/ZAggregator.java   |   47 +
 .../commands/executor/sortedset/ZCardExecutor.java |   33 +
 .../executor/sortedset/ZCountExecutor.java         |   36 +
 .../executor/sortedset/ZIncrByExecutor.java        |   52 +
 .../executor/sortedset/ZInterStoreExecutor.java    |   45 +
 .../commands/executor/sortedset/ZKeyWeight.java    |   44 +
 .../executor/sortedset/ZLexCountExecutor.java      |   35 +
 .../executor/sortedset/ZPopMaxExecutor.java        |   31 +
 .../executor/sortedset/ZPopMinExecutor.java        |   31 +
 .../executor/sortedset/ZRangeByLexExecutor.java    |   48 +
 .../executor/sortedset/ZRangeByScoreExecutor.java  |   48 +
 .../executor/sortedset/ZRangeExecutor.java         |   47 +
 .../commands/executor/sortedset/ZRankExecutor.java |   24 +
 .../commands/executor/sortedset/ZRemExecutor.java  |   41 +
 .../executor/sortedset/ZRemRangeByLexExecutor.java |   34 +
 .../sortedset/ZRemRangeByRankExecutor.java         |   35 +
 .../sortedset/ZRemRangeByScoreExecutor.java        |   34 +
 .../executor/sortedset/ZRevRangeByLexExecutor.java |   36 +
 .../sortedset/ZRevRangeByScoreExecutor.java        |   37 +
 .../executor/sortedset/ZRevRangeExecutor.java      |   37 +
 .../executor/sortedset/ZRevRankExecutor.java       |   24 +
 .../commands/executor/sortedset/ZScanExecutor.java |   42 +
 .../executor/sortedset/ZScoreExecutor.java         |   37 +
 .../executor/sortedset/ZStoreExecutor.java         |  123 +
 .../executor/sortedset/ZUnionStoreExecutor.java    |   45 +
 .../executor/string/AbstractMSetExecutor.java      |   91 +
 .../commands/executor/string/AppendExecutor.java   |   44 +
 .../commands/executor/string/BitCountExecutor.java |   57 +
 .../commands/executor/string/BitOpExecutor.java    |  182 ++
 .../commands/executor/string/BitPosExecutor.java   |   80 +
 .../commands/executor/string/DecrByExecutor.java   |   55 +
 .../commands/executor/string/DecrExecutor.java     |   36 +
 .../commands/executor/string/GetBitExecutor.java   |   51 +
 .../commands/executor/string/GetExecutor.java      |   36 +
 .../commands/executor/string/GetRangeExecutor.java |   62 +
 .../commands/executor/string/GetSetExecutor.java   |   45 +
 .../commands/executor/string/IncrByExecutor.java   |   56 +
 .../executor/string/IncrByFloatExecutor.java       |   70 +
 .../commands/executor/string/IncrExecutor.java     |   37 +
 .../commands/executor/string/MGetExecutor.java     |   44 +
 .../commands/executor/string/MSetExecutor.java     |   49 +
 .../commands/executor/string/MSetNXExecutor.java   |   51 +
 .../commands/executor/string/PSetEXExecutor.java   |   24 +
 .../commands/executor/string/SetBitExecutor.java   |   72 +
 .../commands/executor/string/SetEXExecutor.java    |   74 +
 .../commands/executor/string/SetExecutor.java      |  228 ++
 .../commands/executor/string/SetNXExecutor.java    |   47 +
 .../commands/executor/string/SetOptions.java       |   43 +
 .../commands/executor/string/SetRangeExecutor.java |   64 +
 .../commands/executor/string/StrlenExecutor.java   |   34 +
 .../parameters/ClusterParameterRequirements.java   |   39 +
 .../internal/commands/parameters/Parameter.java    |  163 +
 .../RedisParametersMismatchException.java          |   24 +
 .../parameters/SlowlogParameterRequirements.java   |   73 +
 .../redis/internal/data/AbstractRedisData.java     |  388 +++
 .../geode/redis/internal/data/KeyHashUtil.java     |   63 +
 .../geode/redis/internal/data/NullRedisData.java   |  143 +
 .../internal/data/NullRedisDataStructures.java     |    0
 .../geode/redis/internal/data/NullRedisHash.java   |   63 +
 .../geode/redis/internal/data/NullRedisSet.java    |   75 +
 .../redis/internal/data/NullRedisSortedSet.java    |  149 +
 .../geode/redis/internal/data/NullRedisString.java |  143 +
 .../internal/data/RedisCrossSlotException.java     |   30 +
 .../geode/redis/internal/data/RedisData.java       |  114 +
 .../internal/data/RedisDataMovedException.java     |   31 +
 .../geode/redis/internal/data/RedisDataType.java   |   49 +
 .../data/RedisDataTypeMismatchException.java       |   37 +
 .../geode/redis/internal/data/RedisHash.java       |  399 +++
 .../apache/geode/redis/internal/data/RedisKey.java |  106 +
 .../internal/data/RedisKeyExistsException.java     |   34 +
 .../apache/geode/redis/internal/data/RedisSet.java |  551 ++++
 .../geode/redis/internal/data/RedisSortedSet.java  |  945 ++++++
 .../geode/redis/internal/data/RedisString.java     |  493 +++
 .../data/collections/Bytes2ObjectOpenHashMap.java  | 1300 ++++++++
 .../data/collections/OrderStatisticsSet.java       |   76 +
 .../data/collections/OrderStatisticsTree.java      |  850 ++++++
 ...bleBytes2ObjectOpenCustomHashMapWithCursor.java |  202 ++
 .../SizeableObjectOpenCustomHashSetWithCursor.java |  205 ++
 .../internal/data/collections/package-info.java    |   23 +
 .../data/delta/AddByteArrayDoublePairs.java        |   66 +
 .../internal/data/delta/AddByteArrayPairs.java     |   66 +
 .../redis/internal/data/delta/AddByteArrays.java   |   63 +
 .../redis/internal/data/delta/AppendByteArray.java |   44 +
 .../geode/redis/internal/data/delta/DeltaInfo.java |   24 +
 .../geode/redis/internal/data/delta/DeltaType.java |   32 +
 .../internal/data/delta/RemoveByteArrays.java      |   69 +
 .../data/delta/ReplaceByteArrayAtOffset.java       |   50 +
 .../data/delta/ReplaceByteArrayDoublePairs.java    |   62 +
 .../internal/data/delta/ReplaceByteArrays.java     |   57 +
 .../internal/data/delta/ReplaceByteAtOffset.java   |   48 +
 .../redis/internal/data/delta/SetByteArray.java    |   47 +
 .../data/delta/SetByteArrayAndTimestamp.java       |   52 +
 .../redis/internal/data/delta/SetTimestamp.java    |   44 +
 .../redis/internal/netty/ByteToCommandDecoder.java |  230 ++
 .../apache/geode/redis/internal/netty/Client.java  |  206 ++
 .../apache/geode/redis/internal/netty/Coder.java   |  716 +++++
 .../geode/redis/internal/netty/CoderException.java |    0
 .../internal/netty/ExecutionHandlerContext.java    |  505 ++++
 .../redis/internal/netty/NettyRedisServer.java     |  287 ++
 .../netty/RedisCommandParserException.java         |   41 +
 .../redis/internal/netty/StringBytesGlossary.java  |  290 ++
 .../pubsub/AbstractSubscriptionManager.java        |  238 ++
 .../pubsub/ChannelSubscriptionManager.java         |   60 +
 .../internal/pubsub/ClientSubscriptionManager.java |   58 +
 .../pubsub/ClientSubscriptionManagerImpl.java      |   78 +
 .../pubsub/PatternSubscriptionManager.java         |  133 +
 .../apache/geode/redis/internal/pubsub/PubSub.java |  115 +
 .../geode/redis/internal/pubsub/PubSubImpl.java    |  113 +
 .../geode/redis/internal/pubsub/Publisher.java     |  527 ++++
 .../redis/internal/pubsub/SubscribeResult.java     |    0
 .../geode/redis/internal/pubsub/Subscription.java  |   40 +
 .../redis/internal/pubsub/SubscriptionImpl.java    |  102 +
 .../redis/internal/pubsub/SubscriptionManager.java |   72 +
 .../geode/redis/internal/pubsub/Subscriptions.java |  266 ++
 .../internal/services/ActiveExpirationManager.java |   91 +
 .../RedisSanctionedSerializablesService.java       |   27 +
 .../redis/internal/services/RegionProvider.java    |  347 +++
 .../internal/services/cluster/RedisMemberInfo.java |  107 +
 .../cluster/RedisMemberInfoRetrievalFunction.java  |   88 +
 .../internal/services/cluster/SlotAdvisor.java     |  191 ++
 .../locking/LockingStripedCoordinator.java         |   87 +
 .../services/locking/RedisSecurityService.java     |   68 +
 .../internal/services/locking/StripedCallable.java |   30 +
 .../services/locking/StripedCoordinator.java       |   44 +
 .../services/locking/StripedExecutorService.java   |  511 ++++
 .../internal/services/locking/StripedObject.java   |   31 +
 .../internal/services/locking/StripedRunnable.java |   28 +
 .../redis/internal/statistics/GeodeRedisStats.java |  308 ++
 .../redis/internal/statistics/RedisStats.java      |  235 ++
 .../org.apache.geode.internal.cache.CacheService   |   16 +
 ...serialization.DataSerializableFixedIdRegistrant |   16 +
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../sanctioned-geode-for-redis-serializables.txt   |    8 +
 .../src/performanceTest/benchmark.sh               |    0
 .../src/performanceTest/environment-setup.sh       |  124 +
 .../src/performanceTest/execute-operation.sh       |    0
 .../src/performanceTest/shacompare.sh              |    0
 .../src/performanceTest/summarize-batch-results.sh |    0
 .../performanceTest/summarize-operation-results.sh |    0
 .../geode/redis/internal/RedisCommandTypeTest.java |   38 +
 .../geode/redis/internal/RedisPropertiesTest.java  |  169 ++
 .../commands/executor/GlobPatternTest.java         |   88 +
 .../commands/executor/cluster/CRC16JUnitTest.java  |   54 +
 .../executor/connection/AuthExecutorTest.java      |   66 +
 .../executor/sortedset/ZScanExecutorTest.java      |   37 +
 .../geode/redis/internal/data/KeyHashUtilTest.java |   81 +
 .../geode/redis/internal/data/RedisHashTest.java   |  484 +++
 .../redis/internal/data/RedisKeyJUnitTest.java     |   40 +
 .../geode/redis/internal/data/RedisSetTest.java    |  563 ++++
 .../redis/internal/data/RedisSortedSetTest.java    |  938 ++++++
 .../internal/data/RedisStringQuickCheckTest.java   |   83 +
 .../geode/redis/internal/data/RedisStringTest.java |  543 ++++
 .../data/collections/OrderStatisticsTreeTest.java  |  783 +++++
 .../OrderedStatisticTreeQuickCheckTest.java        |  143 +
 ...tOpenCustomHashMapWithCursorQuickCheckTest.java |   92 +
 ...ytes2ObjectOpenCustomHashMapWithCursorTest.java |  395 +++
 ...eableObjectOpenCustomHashSetWithCursorTest.java |  284 ++
 .../geode/redis/internal/netty/ClientTest.java     |  199 ++
 .../geode/redis/internal/netty/CoderTest.java      |  276 ++
 .../redis/internal/netty/CommandJUnitTest.java     |  114 +
 .../netty/ExecutionHandlerContextTest.java         |  110 +
 .../pubsub/ChannelSubscriptionManagerTest.java     |  104 +
 .../pubsub/ClientSubscriptionManagerImplTest.java  |   94 +
 .../pubsub/PatternSubscriptionManagerTest.java     |  169 ++
 .../redis/internal/pubsub/PubSubImplTest.java      |   52 +
 .../geode/redis/internal/pubsub/PublisherTest.java |  196 ++
 .../internal/pubsub/SubscriptionImplTest.java      |   75 +
 .../pubsub/SubscriptionManagerTestBase.java        |  163 +
 .../internal/pubsub/SubscriptionsJUnitTest.java    |  412 +++
 .../services/LockingStripedCoordinatorTest.java    |   74 +
 .../services/RedisSecurityServiceTest.java         |   92 +
 .../internal/services/RegionProviderTest.java      |   74 +
 .../services/StripedExecutorServiceJUnitTest.java  |  329 ++
 .../RedisMemberInfoRetrievalFunctionTest.java      |  153 +
 .../services/cluster/RedisMemberInfoTest.java      |   93 +
 .../src/test/resources/expected-pom.xml            |  105 +
 geode-gfsh/build.gradle                            |  141 +-
 .../geode/gfsh/GfshWithSslAcceptanceTest.java      |  153 +
 .../management/internal/cli/NetstatDUnitTest.java  |    3 +-
 ...erQueryServiceCommandWithSecurityDUnitTest.java |    8 +-
 ...ueryServiceCommandWithoutSecurityDUnitTest.java |    2 +-
 ...TimeToLiveExpirationOnProxyRegionDUnitTest.java |    4 +-
 ...eRegionCommandWithNoClusterConfigDUnitTest.java |    3 +-
 ...DeployCommandFunctionRegistrationDUnitTest.java |    2 +-
 .../DeploySemanticVersionJarDUnitTest.java         |   66 +-
 .../cli/commands/DeployWithGroupsDUnitTest.java    |   23 +-
 .../cli/commands/DiskStoreCommandsDUnitTest.java   |   12 +-
 .../commands/ExecuteFunctionCommandDUnitTest.java  |    4 +-
 .../ExecuteFunctionCommandSecurityTest.java        |    4 +-
 .../ExportLogsOnServerManagerDistributedTest.java  |    3 +-
 .../commands/ExportStackTraceCommandDUnitTest.java |    4 +-
 .../internal/cli/commands/GcCommandDUnitTest.java  |   18 -
 .../cli/commands/GcCommandDistributedTest.java     |   18 +
 .../cli/commands/GemfireDataCommandsDUnitTest.java |   19 -
 .../commands/GeodeDataCommandsDistributedTest.java |   19 +
 .../IndexCommandsShareConfigurationDUnitTest.java  |    6 +-
 .../cli/commands/ListIndexCommandDUnitTest.java    |   19 -
 .../commands/ListIndexCommandDistributedTest.java  |   19 +
 .../cli/commands/ListMembersCommandDUnitTest.java  |    6 +-
 .../OfflineDiskStoreCommandsDUnitTest.java         |    4 +-
 .../cli/commands/QueryCommandDUnitTest.java        |   23 +
 .../commands/RebalanceMembersColocationTest.java   |    4 +-
 ...ersistThroughClusterConfigurationDUnitTest.java |    1 -
 .../commands/RegionMembershipMBeanDUnitTest.java   |   18 -
 .../RegionMembershipMBeanDistributedTest.java      |   18 +
 .../cli/commands/RepeatedRebalanceDUnitTest.java   |    2 +-
 .../RepeatedRebalancePartitionResolver.java        |    4 +-
 .../commands/StatusRedundancyCommandDUnitTest.java |   37 +
 .../AnalyzeGfshSerializablesIntegrationTest.java   |   37 +
 .../AnalyzeGfshSerializablesJUnitTest.java         |   31 -
 ...ctionedSerializablesServiceIntegrationTest.java |   56 +
 .../GfshParserAutoCompletionIntegrationTest.java   |   17 +-
 .../internal/cli/HeadlessGfshIntegrationTest.java  |    6 +-
 .../ConfigurePDXCommandIntegrationTest.java        |    2 +-
 .../CreateRegionCommandIntegrationTest.java        |    2 +-
 .../commands/DescribeRegionIntegrationTest.java    |    6 +-
 .../cli/commands/ExportDataIntegrationTest.java    |    2 +-
 .../cli/commands/GetCommandIntegrationTest.java    |   10 +-
 .../commands/HTTPServiceSSLSupportJUnitTest.java   |    4 +-
 .../cli/commands/ListRegionIntegrationTest.java    |    8 +-
 .../cli/commands/PutCommandIntegrationTest.java    |    4 +-
 .../cli/commands/VersionCommandJUnitTest.java      |    7 +-
 .../GfshStatusCommandsIntegrationTest.java         |    6 +-
 .../functions/DataCommandFunctionJUnitTest.java    |    4 +-
 .../internal/cli/functions/Geode3544JUnitTest.java |   10 +-
 .../shell/JmxOperationInvokerIntegrationTest.java  |  179 ++
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    2 -
 .../org/apache/geode/codeAnalysis/openBugs.txt     |   18 -
 .../management/GfshDistributedSystemService.java   |   43 -
 .../GfshSanctionedSerializablesService.java        |   27 +
 .../gfsh/console/GfeConsoleReaderFactory.java      |    2 +-
 .../org/apache/geode/management/cli/Result.java    |   10 +-
 .../internal/cli/AbstractCliAroundInterceptor.java |   12 +-
 .../geode/management/internal/cli/CliUtils.java    |    3 +-
 .../management/internal/cli/CommandManager.java    |    4 +-
 .../management/internal/cli/CommandRequest.java    |    8 +-
 .../management/internal/cli/GfshParseResult.java   |    6 +-
 .../geode/management/internal/cli/Launcher.java    |   71 +-
 .../geode/management/internal/cli/LogWrapper.java  |    8 +-
 .../cli/commands/AlterAsyncEventQueueCommand.java  |    2 +-
 .../cli/commands/AlterGatewaySenderCommand.java    |    2 +-
 .../cli/commands/AlterRuntimeConfigCommand.java    |    3 +-
 .../cli/commands/ChangeLogLevelCommand.java        |    2 +-
 .../commands/CompactOfflineDiskStoreCommand.java   |    2 +-
 .../internal/cli/commands/ConnectCommand.java      |    3 +-
 .../cli/commands/CreateAsyncEventQueueCommand.java |    2 +-
 .../cli/commands/CreateDiskStoreCommand.java       |   27 +-
 .../cli/commands/CreateJndiBindingCommand.java     |    2 +-
 .../internal/cli/commands/DeployCommand.java       |   21 +-
 .../cli/commands/DescribeClientCommand.java        |    4 +-
 .../cli/commands/DescribeDiskStoreCommand.java     |    2 +-
 .../cli/commands/DestroyFunctionCommand.java       |    2 +-
 .../cli/commands/DestroyJndiBindingCommand.java    |    2 +-
 .../ExportClusterConfigurationCommand.java         |    2 +-
 .../internal/cli/commands/ExportConfigCommand.java |    2 +-
 .../internal/cli/commands/ExportLogsCommand.java   |    2 +-
 .../cli/commands/LauncherSignalListener.java       |    2 +-
 .../internal/cli/commands/ListDeployedCommand.java |    8 +-
 .../internal/cli/commands/ListFunctionCommand.java |    2 +-
 .../internal/cli/commands/ListGatewayCommand.java  |    2 +-
 .../internal/cli/commands/ListMembersCommand.java  |    2 +-
 .../internal/cli/commands/NetstatCommand.java      |    2 +-
 .../internal/cli/commands/RebalanceCommand.java    |    3 +-
 .../internal/cli/commands/RemoveCommand.java       |    4 +-
 .../internal/cli/commands/ShutdownCommand.java     |    4 +-
 .../cli/commands/StartGatewaySenderCommand.java    |    2 +-
 .../internal/cli/commands/StartLocatorCommand.java |    9 +-
 .../internal/cli/commands/StartMemberUtils.java    |    3 +-
 .../internal/cli/commands/StartServerCommand.java  |   45 +-
 .../cli/commands/StopGatewaySenderCommand.java     |  112 +-
 .../StopGatewaySenderOnMemberWithBeanImpl.java     |   65 +
 .../internal/cli/commands/UndeployCommand.java     |   44 +-
 .../commands/UpgradeOfflineDiskStoreCommand.java   |    2 +-
 .../converters/ClusterMemberIdNameConverter.java   |    2 +-
 .../converters/ConnectionEndpointConverter.java    |    2 +-
 .../internal/cli/converters/EnumConverter.java     |    2 +-
 .../internal/cli/converters/FilePathConverter.java |    2 +-
 .../cli/converters/GatewaySenderIdConverter.java   |    2 +-
 .../cli/converters/JarDirPathConverter.java        |    2 +-
 .../cli/converters/JarFilesPathConverter.java      |    2 +-
 .../LocatorDiscoveryConfigConverter.java           |    2 +-
 .../cli/converters/LocatorIdNameConverter.java     |    2 +-
 .../cli/domain/AsyncEventQueueDetails.java         |   14 +-
 .../cli/domain/ConnectToLocatorResult.java         |   12 +-
 .../internal/cli/domain/DataCommandRequest.java    |    4 +-
 .../internal/cli/domain/DataCommandResult.java     |   28 +-
 .../internal/cli/domain/DeploymentInfo.java        |   11 +-
 .../internal/cli/domain/DiskStoreDetails.java      |  105 +-
 .../cli/domain/EvictionAttributesInfo.java         |   22 +-
 .../cli/domain/FixedPartitionAttributesInfo.java   |   24 +-
 .../internal/cli/domain/IndexDetails.java          |    4 +-
 .../cli/domain/MemberConfigurationInfo.java        |    2 +-
 .../cli/domain/PartitionAttributesInfo.java        |   68 +-
 .../internal/cli/domain/RegionAttributesInfo.java  |    4 +-
 .../internal/cli/domain/RegionDescription.java     |   37 +-
 .../cli/domain/RegionDescriptionPerMember.java     |   32 +-
 .../internal/cli/domain/RegionInformation.java     |   46 +-
 .../internal/cli/domain/StackTracesPerMember.java  |    6 +-
 .../cli/functions/AlterGatewaySenderFunction.java  |   16 +-
 .../cli/functions/AsyncEventQueueFunctionArgs.java |   32 +-
 .../cli/functions/CreateRegionFunctionArgs.java    |    2 +-
 .../internal/cli/functions/DeployFunction.java     |   15 +-
 .../DestroyAsyncEventQueueFunctionArgs.java        |    4 +-
 .../functions/DestroyDiskStoreFunctionArgs.java    |    4 +-
 .../cli/functions/ExportConfigFunction.java        |    4 +-
 .../internal/cli/functions/ExportLogsFunction.java |   20 +-
 .../GatewaySenderDestroyFunctionArgs.java          |    4 +-
 .../cli/functions/GatewaySenderFunctionArgs.java   |   82 +-
 .../internal/cli/functions/NetstatFunction.java    |    2 +-
 .../cli/functions/RegionCreateFunction.java        |   16 +-
 .../internal/cli/functions/RegionFunctionArgs.java |  106 +-
 .../internal/cli/functions/UndeployFunction.java   |   93 +-
 .../management/internal/cli/help/HelpBlock.java    |    8 +-
 .../geode/management/internal/cli/help/Helper.java |   11 +-
 .../geode/management/internal/cli/help/Topic.java  |    2 +-
 .../cli/remote/CommandExecutionContext.java        |    2 +-
 .../internal/cli/remote/CommandExecutor.java       |    2 +-
 .../internal/cli/remote/CommandStatementImpl.java  |    6 +-
 .../internal/cli/remote/MemberCommandService.java  |   14 +-
 .../cli/remote/OnlineCommandProcessor.java         |   12 +-
 .../cli/result/CommandResultException.java         |    2 +-
 .../management/internal/cli/result/Table.java      |    6 +-
 .../cli/result/model/AbstractResultModel.java      |    2 +-
 .../internal/cli/result/model/DataResultModel.java |    2 +-
 .../internal/cli/result/model/FileResultModel.java |   16 +-
 .../internal/cli/result/model/ResultModel.java     |    4 +-
 .../cli/result/model/TabularResultModel.java       |    2 +-
 .../geode/management/internal/cli/shell/Gfsh.java  |  107 +-
 .../management/internal/cli/shell/GfshConfig.java  |   72 +-
 .../internal/cli/shell/GfshExecutionStrategy.java  |    8 +-
 .../internal/cli/shell/JMXConnectionException.java |    2 +-
 .../internal/cli/shell/JmxOperationInvoker.java    |   80 +-
 .../internal/cli/shell/MultiCommandHelper.java     |    8 +-
 .../internal/cli/shell/ScriptExecutionDetails.java |   10 +-
 .../internal/cli/shell/jline/ANSIBuffer.java       |   10 +-
 .../internal/cli/shell/jline/ANSIHandler.java      |    6 +-
 .../internal/cli/util/CommandStringBuilder.java    |    4 +-
 .../internal/cli/util/DeploymentInfoTableUtil.java |    7 +-
 .../internal/cli/util/DiskStoreCompacter.java      |    2 +-
 .../cli/util/FixedPartitionAttributesInfo.java     |   24 +-
 .../internal/cli/util/GfshConsoleReader.java       |    2 +-
 .../internal/cli/util/HyphenFormatter.java         |    4 +-
 .../management/internal/cli/util/LogExporter.java  |   21 +-
 .../management/internal/cli/util/LogFilter.java    |    4 +-
 .../internal/cli/util/LogLevelExtractor.java       |    4 +-
 .../management/internal/cli/util/MergeLogs.java    |   10 +-
 .../internal/cli/util/ReadWriteFile.java           |    4 +-
 .../internal/cli/util/RegionAttributesDefault.java |    3 +-
 .../internal/cli/util/ThreePhraseGenerator.java    |    4 +-
 .../internal/web/http/support/HttpRequester.java   |   20 +-
 .../internal/web/shell/HttpOperationInvoker.java   |   12 +-
 .../web/shell/support/HttpInvocationHandler.java   |    2 +-
 .../web/shell/support/HttpMBeanProxyFactory.java   |    1 -
 ...e.distributed.internal.DistributedSystemService |   16 -
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../sanctioned-geode-gfsh-serializables.txt        |    2 +-
 .../commands/AlterAsyncEventQueueCommandTest.java  |    2 +-
 .../commands/AlterGatewaySenderCommandTest.java    |    4 +-
 .../internal/cli/commands/ConnectCommandTest.java  |   27 +-
 .../cli/commands/CreateDiskStoreCommandTest.java   |   61 +-
 .../commands/CreateGatewaySenderCommandTest.java   |    2 +-
 .../cli/commands/CreateJndiBindingCommandTest.java |    2 +-
 .../cli/commands/CreateRegionCommandTest.java      |    2 +-
 .../commands/DescribeJndiBindingCommandTest.java   |    2 +-
 .../cli/commands/DescribeRegionJUnitTest.java      |    4 +-
 .../DestroyAsyncEventQueueCommandTest.java         |    4 +-
 .../commands/DestroyJndiBindingCommandTest.java    |    2 +-
 .../cli/commands/DestroyRegionCommandTest.java     |   10 +-
 .../cli/commands/DiskStoreCommandsUtilsTest.java   |    4 +-
 .../ExportClusterConfigurationCommandTest.java     |    6 +-
 .../cli/commands/ListAsyncEventQueuesTest.java     |   20 +-
 .../cli/commands/LogLevelInterceptorTest.java      |    6 +-
 .../cli/commands/StopGatewaySenderCommandTest.java |  156 +
 .../StopGatewaySenderOnMemberWithBeanImplTest.java |  122 +
 .../converters/BaseStringConverterJUnitTest.java   |    2 +-
 .../converters/ConfigPropertyConverterTest.java    |    2 +-
 .../converters/RegionPathConverterJUnitTest.java   |    2 +-
 .../functions/AlterGatewaySenderFunctionTest.java  |   10 +-
 .../GatewayReceiverCreateFunctionTest.java         |   12 +-
 .../cli/functions/GetRegionsFunctionTest.java      |    2 +-
 .../functions/RegionCreateFunctionJUnitTest.java   |   56 +-
 .../internal/cli/help/HelpBlockUnitTest.java       |    9 +-
 .../internal/cli/util/BytesToStringTest.java       |    8 +-
 .../internal/cli/util/CommentSkipHelperTest.java   |   24 +-
 .../internal/cli/util/HyphenFormatterTest.java     |   66 +-
 .../management/internal/cli/util/JdkToolTest.java  |    2 +-
 .../web/http/support/HttpRequesterTest.java        |    8 +-
 geode-gfsh/src/test/resources/expected-pom.xml     |   10 +
 geode-http-service/build.gradle                    |    3 +-
 .../cache/http/service/InternalHttpService.java    |   14 +-
 geode-jmh/build.gradle                             |   23 +
 .../benchmark/jmh/profilers/ObjectSizeAgent.java   |  158 +
 .../jmh/profilers/ObjectSizeProfiler.java          |   80 +
 .../jmh/profilers/ObjectSizeAgentTest.java         |  194 ++
 .../services/org.openjdk.jmh.profile.Profiler      |   14 +
 geode-junit/build.gradle                           |   20 +-
 .../AnalyzeJUnitSerializablesIntegrationTest.java  |   51 +
 .../apache/geode/test/compiler/JarBuilderTest.java |    2 +-
 .../geode/test/compiler/JavaCompilerTest.java      |   75 -
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../rules/ExecutorServiceRuleIntegrationTest.java  |    2 +-
 .../test/junit/rules/TemporaryFileRuleTest.java    |    4 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    3 +
 .../codeAnalysis/sanctionedDataSerializables.txt   |  100 +
 .../src/main/java/com/examples/ds/Company.java     |    8 +-
 .../java/com/examples/ds/CompanySerializer.java    |    2 +-
 .../src/main/java/com/examples/ds/Employee.java    |   16 +-
 .../src/main/java/com/examples/ds/User.java        |    8 +-
 .../java/com/examples/snapshot/MyObjectPdx.java    |    2 +-
 .../main/java/org/apache/geode/DeltaTestImpl.java  |  121 +-
 .../java/org/apache/geode/TXWriterTestCase.java    |   30 +-
 .../admin/internal/HealthEvaluatorTestCase.java    |    6 +-
 .../org/apache/geode/cache/query/CacheUtils.java   |    2 +-
 .../geode/cache/query/MultithreadedTester.java     |    2 +-
 .../java/org/apache/geode/cache/query/Utils.java   |    7 +-
 .../org/apache/geode/cache/query/data/City.java    |    8 +-
 .../geode/cache/query/data/CollectionHolder.java   |   15 +-
 .../geode/cache/query/data/ComparableWrapper.java  |   14 +-
 .../org/apache/geode/cache/query/data/Country.java |   16 +-
 .../apache/geode/cache/query/data/District.java    |    4 +-
 .../apache/geode/cache/query/data/Employee.java    |   20 +-
 .../apache/geode/cache/query/data/Instrument.java  |   16 +-
 .../apache/geode/cache/query/data/Inventory.java   |   18 +-
 .../org/apache/geode/cache/query/data/Manager.java |    4 +-
 .../org/apache/geode/cache/query/data/PhoneNo.java |    8 +-
 .../apache/geode/cache/query/data/Portfolio.java   |  100 +-
 .../geode/cache/query/data/PortfolioData.java      |   18 +-
 .../geode/cache/query/data/PortfolioNoDS.java      |   30 +-
 .../geode/cache/query/data/PortfolioPdx.java       |   88 +-
 .../apache/geode/cache/query/data/Position.java    |   84 +-
 .../geode/cache/query/data/PositionNoDS.java       |   18 +-
 .../apache/geode/cache/query/data/PositionPdx.java |   88 +-
 .../cache/query/data/ProhibitedSecurityQuote.java  |    6 +-
 .../org/apache/geode/cache/query/data/Quote.java   |    2 +-
 .../apache/geode/cache/query/data/Restricted.java  |    2 +-
 .../geode/cache/query/data/SecurityMaster.java     |   10 +-
 .../org/apache/geode/cache/query/data/State.java   |    8 +-
 .../org/apache/geode/cache/query/data/Student.java |    4 +-
 .../apache/geode/cache/query/data/TestData.java    |    6 +-
 .../apache/geode/cache/query/data/TradingLine.java |   12 +-
 .../org/apache/geode/cache/query/data/Village.java |    6 +-
 .../NonDistinctOrderByTestImplementation.java      |  117 +-
 .../query/functional/StructSetOrResultsSet.java    |   66 +-
 .../org/apache/geode/cache/ssl/CertStores.java     |   17 +-
 .../apache/geode/cache/ssl/CertificateBuilder.java |  199 +-
 .../geode/cache/ssl/CertificateMaterial.java       |    9 +-
 .../geode/cache30/MyGatewayEventFilter1.java       |    6 +-
 .../AnalyzeDataSerializablesJUnitTestBase.java     |  337 ---
 .../AnalyzeDataSerializablesTestBase.java          |  383 +++
 ...SerializablesWithClassAnalysisRuleTestBase.java |   40 +
 .../AnalyzeSerializablesJUnitTestBase.java         |  358 ---
 .../codeAnalysis/AnalyzeSerializablesTestBase.java |  400 +++
 ...SerializablesWithClassAnalysisRuleTestBase.java |   43 +
 .../geode/codeAnalysis/ClassAndMethodDetails.java  |    4 +-
 .../apache/geode/codeAnalysis/ClassAndMethods.java |    4 +-
 .../codeAnalysis/ClassAndVariableDetails.java      |   10 +-
 .../geode/codeAnalysis/ClassAndVariables.java      |    4 +-
 .../geode/codeAnalysis/CompiledClassUtils.java     |   22 +-
 ...nedSerializablesServiceIntegrationTestBase.java |   89 +
 .../codeAnalysis/decode/CompiledAttribute.java     |    2 +-
 .../geode/codeAnalysis/decode/CompiledClass.java   |   18 +-
 .../geode/codeAnalysis/decode/CompiledCode.java    |    6 +-
 .../geode/codeAnalysis/decode/CompiledField.java   |    6 +-
 .../geode/codeAnalysis/decode/CompiledMethod.java  |   12 +-
 .../geode/codeAnalysis/decode/cp/CpUtf8.java       |   30 +-
 .../apache/geode/internal/AvailablePortHelper.java |   89 +-
 .../apache/geode/internal/UniquePortSupplier.java  |    2 +-
 .../geode/internal/cache/DiskRegionProperties.java |   26 +-
 .../internal/cache/DiskRegionTestingBase.java      |   10 +-
 .../cache/PartitionedRegionTestHelper.java         |    4 +-
 .../geode/internal/cache/SnapshotTestUtil.java     |    2 +-
 .../internal/cache/TestObjectWithIdentifier.java   |    4 +-
 .../org/apache/geode/internal/cache/TestUtils.java |    2 +-
 .../geode/internal/cache/UnitTestValueHolder.java  |    8 +-
 .../cache/control/TestMemoryThresholdListener.java |   80 +-
 .../internal/cache/eviction/LRUTestEntry.java      |   14 +-
 .../cache/eviction/TestEvictionController.java     |    2 +-
 .../geode/internal/cache/execute/data/CustId.java  |   12 +-
 .../geode/internal/cache/execute/data/OrderId.java |   16 +-
 .../internal/cache/execute/data/ShipmentId.java    |   16 +-
 .../geode/internal/cache/ha/ConflatableObject.java |   22 +-
 .../cache/ha/TestBlockingHARegionQueue.java        |   10 +-
 .../cache/wan/CustomAsyncEventListener.java        |    4 +-
 .../apache/geode/internal/cache/wan/Filter70.java  |    7 +-
 .../internal/cache/wan/MyGatewayEventFilter.java   |   12 +-
 .../cache/wan/MyGatewaySenderEventListener.java    |   10 +-
 .../cache/wan/MyGatewaySenderEventListener2.java   |   10 +-
 .../cache/wan/MyGatewayTransportFilter1.java       |    2 +-
 .../cache/wan/MyGatewayTransportFilter2.java       |    2 +-
 .../cache/wan/MyGatewayTransportFilter3.java       |    2 +-
 .../cache/wan/MyGatewayTransportFilter4.java       |    2 +-
 .../geode/internal/cache/wan/QueueListener.java    |    2 +-
 ...ilGatewaySenderFlushedCoordinatorJUnitTest.java |   14 +-
 .../cache/wan/WaitingAsyncEventListener.java       |    8 +-
 .../org/apache/geode/internal/jta/JTAUtils.java    |   16 +-
 .../internal/offheap/NullOffHeapMemoryStats.java   |    4 +-
 .../offheap/NullOutOfOffHeapMemoryListener.java    |    4 +-
 ...AbstractProcessStreamReaderIntegrationTest.java |   22 +-
 .../geode/internal/process/lang/AvailablePid.java  |    8 +-
 .../internal/statistics/StatSamplerTestCase.java   |   26 +-
 .../geode/internal/statistics/StatUtils.java       |    5 +-
 .../internal/statistics/TestStatisticsSampler.java |    5 +-
 .../internal/util/concurrent/cm/LoopHelpers.java   |    2 +-
 .../management/bean/stats/MBeanStatsTestCase.java  |   14 +-
 .../cli/commands/ToUpperResultCollector.java       |    2 +-
 .../internal/cli/domain/MyCacheListener.java       |    2 +-
 .../management/internal/cli/domain/Stock.java      |    8 +-
 .../geode/management/internal/cli/dto/Key.java     |    4 +-
 .../geode/management/internal/cli/dto/Key1.java    |    4 +-
 .../geode/management/internal/cli/dto/Key2.java    |    4 +-
 .../geode/management/internal/cli/dto/Value1.java  |   18 +-
 .../geode/management/internal/cli/dto/Value2.java  |   16 +-
 .../internal/cli/util/TestMethodAuthorizer.java    |    2 +-
 .../internal/configuration/ConfigGroup.java        |   45 +-
 .../management/internal/security/TestCommand.java  |    6 +-
 .../org/apache/geode/management/model/Order.java   |    4 +-
 .../java/org/apache/geode/pdx/DSInsidePdx.java     |   34 +-
 .../java/org/apache/geode/pdx/DomainObject.java    |   25 +-
 .../org/apache/geode/pdx/DomainObjectPdxAuto.java  |   10 +-
 .../main/java/org/apache/geode/pdx/Employee.java   |   20 +-
 .../main/java/org/apache/geode/pdx/NestedPdx.java  |   38 +-
 .../java/org/apache/geode/pdx/PdxInsideDS.java     |   30 +-
 .../java/org/apache/geode/pdx/SimpleClass.java     |   33 +-
 .../java/org/apache/geode/pdx/SimpleClass1.java    |   64 +-
 .../geode/pdx/TestObjectForJSONFormatter.java      |  128 +-
 .../geode/security/ExpirableSecurityManager.java   |   98 +
 .../apache/geode/security/PDXPostProcessor.java    |   10 +-
 .../apache/geode/security/SpySecurityManager.java  |    8 +-
 .../apache/geode/security/TestSecurityManager.java |   12 +-
 .../security/UpdatableUserAuthInitialize.java      |   76 +
 .../geode/security/query/UserPermissions.java      |    2 +-
 .../security/query/data/PdxQueryTestObject.java    |    6 +-
 .../apache/geode/security/query/data/PdxTrade.java |    2 +-
 .../geode/security/query/data/QueryTestObject.java |    6 +-
 .../templates/CountableUserPasswordAuthInit.java   |   38 +
 .../assertj/internal/AbstractLogFileAssert.java    |    4 +-
 .../apache/geode/test/compiler/ClassBuilder.java   |   22 +-
 .../geode/test/compiler/CompilationReporter.java   |   34 +
 .../geode/test/compiler/CompiledSourceCode.java    |   35 -
 .../geode/test/compiler/InMemoryClassFile.java     |   45 +
 .../geode/test/compiler/InMemoryFileManager.java   |   44 +
 .../geode/test/compiler/InMemoryJavaCompiler.java  |   88 +
 .../geode/test/compiler/InMemorySourceFile.java    |   88 +
 .../org/apache/geode/test/compiler/JarBuilder.java |   27 +-
 .../apache/geode/test/compiler/JavaCompiler.java   |  132 -
 .../geode/test/compiler/UncompiledSourceCode.java  |   82 -
 .../test/concurrent/CPUContentionService.java      |    4 +-
 .../test/concurrent/FileBasedCountDownLatch.java   |    4 +-
 .../geode/test/golden/ExecutableProcess.java       |    2 +-
 .../apache/geode/test/golden/GoldenComparator.java |   10 +-
 .../golden/PassWithExpectedProblemTestCase.java    |    4 +-
 .../assertions/AbstractResultModelAssert.java      |    2 +-
 .../ClusterManagementGetResultAssert.java          |    2 +-
 .../ClusterManagementListResultAssert.java         |    2 +-
 .../test/junit/assertions/CommandResultAssert.java |    6 +-
 .../junit/assertions/CommandResultExecution.java   |    4 +-
 .../assertions/TabularResultModelAnyRowAssert.java |    2 +-
 .../assertions/TabularResultModelColumnAssert.java |    2 +-
 .../assertions/TabularResultModelRowAssert.java    |    2 +-
 .../assertions/TabularResultModelSliceAssert.java  |    6 +-
 .../junit/categories/IgnoreInRepeatTestTasks.java  |   21 +
 .../categories/SanctionedSerializablesTest.java    |   21 +
 .../JUnitSanctionedSerializablesService.java       |   27 +
 .../geode/test/junit/rules/ClassAnalysisRule.java  |   69 +-
 .../geode/test/junit/rules/ConcurrencyRule.java    |   52 +-
 .../test/junit/rules/ExecutorServiceRule.java      |  104 +-
 .../test/junit/rules/ExpectedTimeoutRule.java      |   36 +-
 .../geode/test/junit/rules/GfshParserRule.java     |    6 +-
 .../apache/geode/test/junit/rules/JarFileRule.java |   16 +-
 .../apache/geode/test/junit/rules/RandomRule.java  |   48 +-
 .../geode/test/junit/rules/RequiresGeodeHome.java  |    9 +-
 .../geode/test/junit/rules/RestoreTCCLRule.java    |    4 +-
 .../apache/geode/test/junit/rules/RetryRule.java   |   12 +-
 .../apache/geode/test/junit/rules/RuleList.java    |   16 +-
 .../geode/test/junit/rules/TemporaryFileRule.java  |    2 +-
 .../geode/test/junit/rules/gfsh/GfshRule.java      |   12 +-
 .../geode/test/junit/rules/gfsh/GfshScript.java    |   10 +-
 .../test/junit/rules/gfsh/internal/OutputLine.java |    4 +-
 .../rules/serializable/SerializableRuleList.java   |    4 +-
 .../rules/serializable/SerializableTestName.java   |    4 +-
 .../rules/serializable/SerializableTimeout.java    |   38 +-
 .../test/junit/runners/GeodeParamsRunner.java      |  164 +
 .../geode/test/junit/runners/SuiteBlockRunner.java |    4 +-
 .../geode/test/junit/runners/TestRunner.java       |    2 +-
 .../test/junit/support/DefaultIgnoreCondition.java |    2 +-
 .../apache/geode/test/process/OutputFormatter.java |    2 +-
 .../geode/test/process/ProcessOutputReader.java    |   14 +-
 .../geode/test/process/ProcessStreamReader.java    |   14 +-
 .../apache/geode/test/process/ProcessWrapper.java  |   28 +-
 .../org/apache/geode/test/util/ResourceUtils.java  |   35 +-
 .../geode/test/util/StressNewTestHelper.java       |    7 +-
 .../apache/geode/test/version/VersionManager.java  |    8 +
 .../java/org/apache/geode/util/JSR166TestCase.java |   48 +-
 .../java/parReg/query/unittest/NewPortfolio.java   |   44 +-
 .../main/java/parReg/query/unittest/Position.java  |   48 +-
 geode-junit/src/main/java/perffmwk/Formatter.java  |   18 +-
 geode-junit/src/main/java/util/TestException.java  |    2 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../sanctioned-geode-junit-serializables.txt       |  114 +
 .../geode/cache/ssl/CertificateBuildingTest.java   |   62 +
 .../test/compiler/InMemoryJavaCompilerTest.java    |   61 +
 .../test/compiler/InMemorySourceFileTest.java      |   45 +
 .../test/compiler/UncompiledSourceCodeTest.java    |   39 -
 .../test/junit/rules/ConcurrencyRuleTest.java      |   51 +-
 .../test/junit/rules/ExecutorServiceRuleTest.java  |    2 +-
 .../geode/test/junit/rules/RandomRuleTest.java     |   15 +
 .../geode/test/junit/rules/RuleListTest.java       |   22 +-
 .../junit/rules/examples/RuleAndClassRuleTest.java |    8 +-
 .../SerializableExternalResourceTest.java          |    4 +-
 .../serializable/SerializableRuleListTest.java     |    6 +-
 .../serializable/SerializableTestNameTest.java     |    2 +-
 .../serializable/SerializableTestWatcherTest.java  |    4 +-
 .../serializable/SerializableTimeoutTest.java      |   28 +-
 ...CategoryWithParameterizedRunnerFactoryTest.java |    2 +-
 .../test/junit/runners/ComparableDescription.java  |   89 +
 .../test/junit/runners/GeodeParamsRunnerTest.java  |  359 +++
 .../geode/test/util/WhatExtendsJUnitTest.java      |    4 +-
 geode-junit/src/test/resources/expected-pom.xml    |   30 +-
 geode-log4j/build.gradle                           |    1 -
 .../log4j/internal/impl/NonBlankStrings.java       |    5 +-
 .../internal/impl/LogWriterAppenderBenchmark.java  |    2 +-
 .../log4j/internal/impl/Log4jLoggingProvider.java  |   12 +-
 geode-logging/build.gradle                         |   60 +-
 .../apache/geode/logging/internal/OSProcess.java   |   10 +-
 .../logging/internal/executors/LoggingThread.java  |    2 +-
 .../api/message/GemFireParameterizedMessage.java   |   22 +-
 geode-lucene/build.gradle                          |    1 -
 geode-lucene/geode-lucene-test/build.gradle        |    1 -
 .../internal/repository/serializer/Type2.java      |    2 +-
 .../apache/geode/cache/lucene/test/Customer.java   |    4 +-
 .../cache/lucene/test/IndexRepositorySpy.java      |    2 +-
 .../cache/lucene/test/LuceneTestSerializer.java    |    2 +-
 .../org/apache/geode/cache/lucene/test/Page.java   |   12 +-
 .../org/apache/geode/cache/lucene/test/Person.java |   20 +-
 .../apache/geode/cache/lucene/test/TestObject.java |    4 +-
 .../geode/cache/lucene/EvictionDUnitTest.java      |   11 +-
 .../geode/cache/lucene/ExpirationDUnitTest.java    |    4 +-
 .../lucene/LuceneClientSecurityDUnitTest.java      |    8 +-
 ...uceneClientSecurityPostProcessingDUnitTest.java |    4 +-
 ...urityWithRegionCreatedBeforeIndexDUnitTest.java |    4 +-
 .../lucene/LuceneCommandsSecurityDUnitTest.java    |   44 +-
 ...urityWithRegionCreatedBeforeIndexDUnitTest.java |   17 +-
 .../apache/geode/cache/lucene/LuceneDUnitTest.java |   12 +-
 .../cache/lucene/LuceneIndexCreationDUnitTest.java |   22 +-
 .../LuceneIndexCreationOnFixedPRDUnitTest.java     |    4 +-
 .../cache/lucene/LuceneIndexDestroyDUnitTest.java  |  120 +-
 .../cache/lucene/LuceneQueriesAccessorBase.java    |   12 +-
 .../cache/lucene/LuceneQueriesClientDUnitTest.java |    4 +-
 .../geode/cache/lucene/LuceneQueriesDUnitTest.java |    6 +-
 .../LuceneQueriesReindexClientDUnitTest.java       |    4 +-
 .../lucene/LuceneQueriesReindexDUnitTest.java      |   12 +-
 ...hRegionCreatedBeforeReindexClientDUnitTest.java |    4 +-
 ...iesWithRegionCreatedBeforeReindexDUnitTest.java |    4 +-
 ...eriesWithReindexFlagEnabledClientDUnitTest.java |    4 +-
 ...ceneQueriesWithReindexFlagEnabledDUnitTest.java |    4 +-
 .../cache/lucene/MixedObjectIndexDUnitTest.java    |   68 +-
 .../geode/cache/lucene/PaginationDUnitTest.java    |   13 +-
 .../geode/cache/lucene/RebalanceDUnitTest.java     |    4 +-
 .../lucene/RebalanceWithRedundancyDUnitTest.java   |    4 +-
 ...ncyWithRegionCreatedBeforeReindexDUnitTest.java |   14 +-
 .../IndexRepositoryFactoryDistributedTest.java     |    2 +-
 .../cli/DestroyLuceneIndexCommandsDUnitTest.java   |   60 +-
 .../management/LuceneManagementDUnitTest.java      |    8 +-
 .../test/LuceneDistributedTestUtilities.java       |    2 +-
 .../FlatFormatPdxSerializerIntegrationTest.java    |    2 +-
 .../apache/geode/cache/lucene/LocalCacheRule.java  |    4 +-
 .../lucene/LuceneIndexCreationIntegrationTest.java |   12 +-
 ...eneIndexCreationPersistenceIntegrationTest.java |    8 +-
 .../LuceneIndexMaintenanceIntegrationTest.java     |    9 +-
 .../cache/lucene/LuceneQueriesIntegrationTest.java |   37 +-
 .../LuceneQueriesPersistenceIntegrationTest.java   |    4 +-
 .../NestedObjectSeralizerIntegrationTest.java      |   94 +-
 .../IndexRepositoryFactoryIntegrationTest.java     |    2 +-
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../cli/LuceneIndexCommandsIntegrationTest.java    |   32 +-
 .../repository/IndexRepositoryImplJUnitTest.java   |   13 +-
 .../LuceneIndexXmlParserIntegrationJUnitTest.java  |   10 +-
 .../lucene/test/LuceneFunctionSecurityTest.java    |    4 +-
 .../AnalyzeLuceneSerializablesIntegrationTest.java |   38 +
 .../AnalyzeLuceneSerializablesJUnitTest.java       |   35 -
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    2 -
 .../org/apache/geode/codeAnalysis/openBugs.txt     |   21 -
 .../codeAnalysis/sanctionedDataSerializables.txt   |    1 -
 .../lucene/LuceneIndexDestroyedException.java      |    4 +-
 .../cache/lucene/LuceneIndexExistsException.java   |    6 +-
 .../cache/lucene/LuceneIndexNotFoundException.java |    4 +-
 .../internal/CreateRegionProcessorForLucene.java   |    8 +-
 .../lucene/internal/DestroyLuceneIndexMessage.java |   28 +-
 .../lucene/internal/LuceneBucketListener.java      |    2 +-
 .../internal/LuceneDistributedSystemService.java   |   43 -
 .../cache/lucene/internal/LuceneEventListener.java |    4 +-
 .../LuceneFileRegionColocationListener.java        |    4 +-
 .../internal/LuceneIndexCreationProfile.java       |   50 +-
 .../lucene/internal/LuceneIndexFactoryImpl.java    |   12 +-
 .../internal/LuceneIndexForPartitionedRegion.java  |   18 +-
 .../cache/lucene/internal/LuceneIndexImpl.java     |   38 +-
 .../cache/lucene/internal/LuceneIndexStats.java    |   12 +-
 .../lucene/internal/LuceneQueryFactoryImpl.java    |    4 +-
 .../cache/lucene/internal/LuceneQueryImpl.java     |   18 +-
 .../lucene/internal/LuceneRegionListener.java      |   42 +-
 .../lucene/internal/LuceneResultStructImpl.java    |   10 +-
 .../LuceneSanctionedSerializablesService.java      |   27 +
 .../cache/lucene/internal/LuceneServiceImpl.java   |   81 +-
 .../internal/PageableLuceneQueryResultsImpl.java   |    8 +-
 .../internal/PartitionedRepositoryManager.java     |   10 +-
 .../internal/cli/LuceneDestroyIndexInfo.java       |    2 +-
 .../lucene/internal/cli/LuceneIndexDetails.java    |   30 +-
 .../cache/lucene/internal/cli/LuceneQueryInfo.java |    8 +-
 .../cli/commands/LuceneCreateIndexCommand.java     |    2 +-
 .../cli/commands/LuceneDestroyIndexCommand.java    |    2 +-
 .../cli/commands/LuceneSearchIndexCommand.java     |    2 +-
 .../cli/functions/LuceneSearchIndexFunction.java   |    2 +-
 .../lucene/internal/directory/FileIndexInput.java  |   18 +-
 .../distributed/LuceneFunctionContext.java         |    6 +-
 .../internal/distributed/LuceneQueryFunction.java  |    2 +-
 .../lucene/internal/distributed/TopEntries.java    |    2 +-
 .../internal/distributed/TopEntriesCollector.java  |    2 +-
 .../distributed/TopEntriesCollectorManager.java    |   19 +-
 .../distributed/TopEntriesFunctionCollector.java   |    8 +-
 .../distributed/WaitUntilFlushedFunction.java      |    2 +-
 .../WaitUntilFlushedFunctionContext.java           |    4 +-
 .../cache/lucene/internal/filesystem/ChunkKey.java |   12 +-
 .../cache/lucene/internal/filesystem/File.java     |    2 +-
 .../internal/filesystem/FileInputStream.java       |   16 +-
 .../internal/filesystem/FileOutputStream.java      |    4 +-
 .../internal/filesystem/FileSystemStats.java       |    2 +-
 .../management/LuceneIndexStatsMonitor.java        |   12 +-
 .../internal/management/LuceneServiceBridge.java   |   18 +-
 .../internal/management/LuceneServiceMBean.java    |   12 +-
 .../management/ManagementIndexListener.java        |    2 +-
 .../internal/partition/BucketTargetingMap.java     |    2 +-
 .../internal/repository/IndexRepositoryImpl.java   |   12 +-
 .../serializer/HeterogeneousLuceneSerializer.java  |    6 +-
 .../serializer/ReflectionLuceneSerializer.java     |    8 +-
 .../repository/serializer/SerializerUtil.java      |    2 +-
 .../cache/lucene/internal/results/PageResults.java |    2 +-
 .../lucene/internal/xml/LuceneIndexCreation.java   |   22 +-
 .../cache/lucene/internal/xml/LuceneXmlParser.java |    6 +-
 .../lucene/management/LuceneIndexMetrics.java      |   57 +-
 .../lucene/management/configuration/Index.java     |   12 +-
 ...e.distributed.internal.DistributedSystemService |   16 -
 ...serialization.DataSerializableFixedIdRegistrant |   16 +
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../IndexRepositoryImplPerformanceTest.java        |   44 +-
 .../repository/LuceneIndexMemoryOverheadTest.java  |   14 +-
 .../lucene/FlatFormatSerializerJUnitTest.java      |    4 +-
 .../internal/LuceneEventListenerJUnitTest.java     |    2 +-
 .../LuceneIndexCreationProfileJUnitTest.java       |    5 +-
 .../LuceneIndexForPartitionedRegionTest.java       |    4 +-
 .../lucene/internal/LuceneQueryImplJUnitTest.java  |    6 +-
 .../internal/LuceneResultStructImpJUnitTest.java   |   10 +-
 .../internal/LuceneServiceImplJUnitTest.java       |    7 +-
 .../PageableLuceneQueryResultsImplJUnitTest.java   |   37 +-
 .../PartitionedRepositoryManagerJUnitTest.java     |   19 +-
 .../RawLuceneRepositoryManagerJUnitTest.java       |    4 +-
 .../internal/StringQueryProviderJUnitTest.java     |    1 -
 .../cli/commands/LuceneIndexCommandsJUnitTest.java |   60 +-
 .../LuceneCreateIndexFunctionJUnitTest.java        |    4 +-
 .../LuceneDestroyIndexFunctionJUnitTest.java       |   91 +-
 .../LuceneSearchIndexFunctionJUnitTest.java        |    2 +-
 .../directory/DumpDirectoryFilesJUnitTest.java     |    6 +-
 .../distributed/DistributedScoringJUnitTest.java   |    4 +-
 .../internal/distributed/EntryScoreJUnitTest.java  |    4 +-
 .../LuceneQueryFunctionContextJUnitTest.java       |    3 -
 .../distributed/LuceneQueryFunctionJUnitTest.java  |   14 +-
 .../distributed/TopEntriesCollectorJUnitTest.java  |   19 +-
 .../TopEntriesFunctionCollectorJUnitTest.java      |   10 +-
 .../internal/distributed/TopEntriesJUnitTest.java  |   12 +-
 .../WaitUntilFlushedFunctionJUnitTest.java         |   10 +-
 .../internal/filesystem/ChunkKeyJUnitTest.java     |    2 -
 .../lucene/internal/filesystem/FileJUnitTest.java  |    2 -
 .../internal/filesystem/FileSystemJUnitTest.java   |   14 +-
 .../internal/partition/BucketTargetingMapTest.java |    2 +-
 .../results/LuceneGetPageFunctionJUnitTest.java    |    4 +-
 .../internal/results/PageResultsJUnitTest.java     |    5 -
 .../xml/LuceneIndexXmlGeneratorJUnitTest.java      |    8 +-
 .../xml/LuceneIndexXmlParserJUnitTest.java         |   32 +-
 geode-lucene/src/test/resources/expected-pom.xml   |    5 -
 .../LuceneSearchWithRollingUpgradeDUnit.java       |    2 +-
 .../LuceneSearchWithRollingUpgradeTestBase.java    |    5 +-
 geode-management/build.gradle                      |    3 +
 ...lyzeManagementSerializablesIntegrationTest.java |   37 +
 .../AnalyzeManagementSerializablesJUnitTest.java   |   28 -
 ...ctionedSerializablesServiceIntegrationTest.java |   40 +
 .../management/api/ClusterManagementException.java |    2 +-
 .../management/api/ClusterManagementOperation.java |    2 +
 .../api/ClusterManagementOperationResult.java      |    8 +-
 .../api/ClusterManagementRealizationResult.java    |    4 +-
 .../management/api/ClusterManagementResult.java    |    8 +-
 .../client/ClusterManagementServiceBuilder.java    |    2 +-
 .../internal/ClientClusterManagementService.java   |    2 +-
 .../geode/management/configuration/ClassName.java  |    8 +-
 .../geode/management/configuration/Deployment.java |   67 +-
 .../geode/management/configuration/DiskStore.java  |    2 +-
 .../geode/management/configuration/HasFile.java    |    4 +-
 .../geode/management/configuration/IndexType.java  |    2 +-
 .../geode/management/configuration/Links.java      |    4 +-
 .../geode/management/configuration/Region.java     |    8 +-
 .../ManagementSanctionedSerializablesService.java  |   27 +
 .../operation/RebalanceRegionResultImpl.java       |    2 +-
 .../management/operation/RebalanceOperation.java   |   16 +-
 .../geode/management/runtime/CacheServerInfo.java  |   18 +-
 .../management/runtime/MemberInformation.java      |    6 +-
 .../runtime/RestoreRedundancyResults.java          |    2 +-
 .../management/runtime/RuntimeRegionInfo.java      |    2 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../sanctioned-geode-management-serializables.txt  |   42 -
 .../sanctioned-geode-management-serializables.txt  |   42 +
 .../ConfigurationJsonMappingTest.java              |    2 +-
 .../api/ClusterManagementListResultTest.java       |    2 +-
 .../geode/management/api/EntityGroupInfoTest.java  |    2 +-
 .../org/apache/geode/management/api/LinksTest.java |    2 +-
 .../management/api/RealizationResultTest.java      |    2 +-
 .../configuration/AutoSerializerTest.java          |    2 +-
 .../management/configuration/ClassNameTest.java    |    2 +-
 .../management/configuration/DeploymentTest.java   |    2 +-
 .../geode/management/configuration/PdxTest.java    |    2 +-
 .../geode/management/configuration/RegionTest.java |    2 +-
 .../src/test/resources/expected-pom.xml            |    5 +
 .../src/test/script/update-management-wiki.sh      |   25 +-
 geode-membership/build.gradle                      |   69 +-
 ...lyzeMembershipSerializablesIntegrationTest.java |   69 +
 .../AnalyzeMembershipSerializablesJUnitTest.java   |   68 -
 .../membership/GMSMembershipViewJUnitTest.java     |   37 +-
 .../MembershipDependenciesJUnitTest.java           |    2 +-
 .../membership/gms/GMSMemberDataJUnitTest.java     |    1 -
 .../membership/gms/GMSMembershipJUnitTest.java     |   86 +-
 .../internal/membership/gms/GMSUtilTest.java       |    4 +-
 .../membership/gms/MembershipIntegrationTest.java  |    7 +-
 ...ctionedSerializablesServiceIntegrationTest.java |   40 +
 .../gms/fd/GMSHealthMonitorJUnitTest.java          |   40 +-
 .../gms/locator/GMSLocatorIntegrationTest.java     |    1 -
 .../gms/membership/GMSJoinLeaveJUnitTest.java      |  118 +-
 .../gms/messenger/GMSEncryptJUnitTest.java         |    4 +-
 .../gms/messenger/GMSQuorumCheckerJUnitTest.java   |   36 +-
 .../gms/messenger/JGroupsMessengerJUnitTest.java   |   12 +-
 .../gms/messenger/StatRecorderJUnitTest.java       |    4 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    1 -
 .../codeAnalysis/sanctionedDataSerializables.txt   |    4 +-
 .../internal/membership/api/LifecycleListener.java |    6 +-
 .../internal/membership/api/MemberDataBuilder.java |    2 +-
 .../internal/membership/api/MemberIdentifier.java  |    8 +-
 .../internal/membership/api/MembershipConfig.java  |    2 +-
 .../membership/api/MembershipLocatorBuilder.java   |    2 +-
 .../internal/membership/api/MembershipView.java    |   36 +-
 .../internal/membership/gms/GMSMemberData.java     |  154 +-
 .../internal/membership/gms/GMSMembership.java     |  151 +-
 .../internal/membership/gms/GMSMembershipView.java |  104 +-
 .../internal/membership/gms/GMSUtil.java           |    6 +-
 .../membership/gms/LifecycleListenerNoOp.java      |    2 +-
 .../membership/gms/MemberDataBuilderImpl.java      |    6 +-
 .../membership/gms/MemberIdentifierImpl.java       |  236 +-
 .../gms/MembershipLocatorBuilderImpl.java          |    3 +-
 .../MembershipSanctionedSerializablesService.java  |   27 +
 .../internal/membership/gms/Services.java          |  217 +-
 .../internal/membership/gms/SuspectMember.java     |    4 +-
 .../membership/gms/fd/GMSHealthMonitor.java        |  100 +-
 .../gms/locator/FindCoordinatorRequest.java        |   42 +-
 .../gms/locator/FindCoordinatorResponse.java       |   28 +-
 .../membership/gms/locator/GMSLocator.java         |    4 +-
 .../gms/locator/MembershipLocatorImpl.java         |   10 +-
 .../membership/gms/locator/PrimaryHandler.java     |    4 +-
 .../membership/gms/membership/GMSJoinLeave.java    |  268 +-
 .../gms/messages/AbstractGMSMessage.java           |    4 +-
 .../gms/messages/HeartbeatRequestMessage.java      |    2 +-
 .../gms/messages/InstallViewMessage.java           |   30 +-
 .../gms/messages/JoinRequestMessage.java           |    9 +-
 .../gms/messages/JoinResponseMessage.java          |   13 +-
 .../gms/messages/LeaveRequestMessage.java          |    4 +-
 .../gms/messages/RemoveMemberMessage.java          |    4 +-
 .../gms/messages/SuspectMembersMessage.java        |    2 +-
 .../membership/gms/messages/SuspectRequest.java    |   10 +-
 .../membership/gms/messages/ViewAckMessage.java    |   20 +-
 .../membership/gms/messenger/AddressManager.java   |    4 +-
 .../membership/gms/messenger/GMSEncrypt.java       |   14 +-
 .../membership/gms/messenger/GMSMemberWrapper.java |    2 +-
 .../membership/gms/messenger/GMSPingPonger.java    |    4 +-
 .../membership/gms/messenger/GMSQuorumChecker.java |   18 +-
 .../membership/gms/messenger/JGAddress.java        |   18 +-
 .../membership/gms/messenger/JGroupsMessenger.java |   72 +-
 .../gms/messenger/MembershipInformationImpl.java   |    2 +-
 .../membership/gms/messenger/StatRecorder.java     |    2 +-
 .../membership/gms/messenger/Transport.java        |    6 +-
 .../internal/membership/utils/AvailablePort.java   |  117 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../src/test/resources/expected-pom.xml            |    5 -
 geode-memcached/build.gradle                       |    2 +
 ...alyzeMemcachedSerializablesIntegrationTest.java |   37 +
 .../AnalyzeMemcachedSerializablesJUnitTest.java    |   31 -
 ...ctionedSerializablesServiceIntegrationTest.java |   40 +
 .../memcached/DomainObjectsAsValuesJUnitTest.java  |   16 +-
 .../memcached/GemcachedBinaryClientJUnitTest.java  |    5 +-
 .../memcached/GemcachedDevelopmentJUnitTest.java   |    9 +-
 .../org/apache/geode/codeAnalysis/openBugs.txt     |   22 -
 .../codeAnalysis/sanctionedDataSerializables.txt   |    1 -
 .../apache/geode/internal/memcached/Command.java   |    2 +-
 .../internal/memcached/ConnectionHandler.java      |    4 +-
 .../internal/memcached/GeodeMemcachedService.java  |    8 +-
 .../geode/internal/memcached/KeyWrapper.java       |   18 +-
 .../MemcachedDistributedSystemService.java         |   43 -
 .../MemcachedSanctionedSerializablesService.java   |   27 +
 .../geode/internal/memcached/RequestReader.java    |   39 +-
 .../geode/internal/memcached/ValueWrapper.java     |   20 +-
 .../memcached/commands/AbstractCommand.java        |   11 +-
 .../internal/memcached/commands/AppendCommand.java |    4 +-
 .../memcached/commands/DecrementCommand.java       |    7 +-
 .../internal/memcached/commands/DeleteCommand.java |    2 +-
 .../memcached/commands/FlushAllCommand.java        |   14 +-
 .../internal/memcached/commands/GetCommand.java    |    6 +-
 .../memcached/commands/IncrementCommand.java       |    7 +-
 .../memcached/commands/PrependCommand.java         |    4 +-
 .../memcached/commands/StorageCommand.java         |    7 +-
 .../geode/memcached/GemFireMemcachedServer.java    |   75 +-
 ...e.distributed.internal.DistributedSystemService |    1 -
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../src/test/resources/expected-pom.xml            |    5 +
 geode-old-client-support/build.gradle              |    1 -
 .../apache/geode/OldClientSupportDUnitTest.java    |  257 --
 .../geode/OldClientSupportDistributedTest.java     |  272 ++
 .../com/gemstone/gemfire/GemFireException.java     |    6 +-
 .../gemstone/gemfire/OldClientSupportProvider.java |   20 +-
 .../gemfire/cache/execute/FunctionException.java   |    6 +-
 .../execute/FunctionInvocationTargetException.java |    2 +-
 geode-pulse/build.gradle                           |    2 +
 geode-pulse/geode-pulse-test/build.gradle          |    1 -
 .../tools/pulse/tests/DataBrowserResultLoader.java |    5 +-
 .../geode/tools/pulse/tests/JMXProperties.java     |    2 +-
 .../org/apache/geode/tools/pulse/tests/Region.java |    8 +-
 .../geode/tools/pulse/tests/RegionOnMember.java    |    4 +-
 .../org/apache/geode/tools/pulse/tests/Server.java |   10 +-
 .../geode/tools/pulse/tests/ServerObject.java      |   14 +-
 .../pulse/tests/rules/ScreenshotOnFailureRule.java |    6 +-
 .../geode/tools/pulse/tests/rules/ServerRule.java  |    4 +-
 .../tools/pulse/tests/rules/WebDriverRule.java     |    4 +-
 .../AnalyzePulseSerializablesIntegrationTest.java  |   36 +
 .../context/PulseControllerTestContext.java        |    2 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    1 +
 .../internal/controllers/PulseController.java      |    8 +-
 .../geode/tools/pulse/internal/data/Cluster.java   |    6 +-
 .../tools/pulse/internal/data/DataBrowser.java     |    2 +-
 .../pulse/internal/data/JmxManagerFinder.java      |    2 +-
 .../tools/pulse/internal/data/PulseConfig.java     |   22 +-
 .../tools/pulse/internal/data/PulseConstants.java  |    2 +-
 .../tools/pulse/internal/data/PulseVersion.java    |    2 +-
 .../internal/service/ClusterRegionService.java     |    2 +-
 .../internal/service/ClusterRegionsService.java    |    2 +-
 .../service/ClusterSelectedRegionService.java      |    2 +-
 .../ClusterSelectedRegionsMemberService.java       |    2 +-
 .../tools/pulse/internal/util/ConnectionUtil.java  |    2 +-
 .../tools/pulse/internal/util/IPAddressUtil.java   |    2 +-
 geode-pulse/src/main/webapp/META-INF/NOTICE        |    2 +-
 geode-pulse/src/main/webapp/clusterDetail.html     |    2 +-
 geode-pulse/src/main/webapp/scripts/lib/common.js  |    4 +-
 .../src/main/webapp/scripts/lib/excanvas.js        |    2 +-
 geode-pulse/src/main/webapp/scripts/lib/jit.js     |   12 +-
 .../src/main/webapp/scripts/lib/jquery-1.7.2.js    |    2 +-
 .../main/webapp/scripts/lib/jquery.jqGrid.src.js   |    4 +-
 .../webapp/scripts/lib/jquery.ztree.core-3.5.js    |    2 +-
 .../main/webapp/scripts/multiselect/jquery-ui.js   |    2 +-
 .../main/webapp/scripts/multiselect/prettify.js    |    4 +-
 .../webapp/scripts/pulsescript/MemberDetails.js    |    2 +-
 .../webapp/scripts/pulsescript/PulseCallbacks.js   |   18 +-
 .../webapp/scripts/pulsescript/PulseFunctions.js   |   54 +-
 .../webapp/scripts/pulsescript/clusterDetail.js    |   38 +-
 .../src/main/webapp/scripts/pulsescript/common.js  |   38 +-
 .../scripts/pulsescript/pages/DataBrowser.js       |   22 +-
 .../scripts/pulsescript/pages/DataBrowserQuery.js  |   16 +-
 .../pulsescript/pages/DataBrowserQueryHistory.js   |    4 +-
 .../data/JMXDataUpdaterGetDoubleAttributeTest.java |   16 +-
 .../tools/pulse/tests/ui/PulseAutomatedTest.java   |    2 +-
 .../geode/tools/pulse/tests/ui/PulseTestUtils.java |   36 +-
 geode-rebalancer/build.gradle                      |    1 +
 .../util/AutoBalancerIntegrationJUnitTest.java     |   31 +-
 .../org/apache/geode/cache/util/AutoBalancer.java  |   59 +-
 geode-serialization/ANALYZE_SERIALIZABLES.md       |  116 +
 geode-serialization/build.gradle                   |    9 +-
 ...eSerializationSerializablesIntegrationTest.java |   37 +
 ...ctionedSerializablesServiceIntegrationTest.java |   40 +
 ...ationWhenFilterIsAlreadySetIntegrationTest.java |   53 +
 ...enObjectInputFilterNotFoundIntegrationTest.java |  108 +
 ...nputFilterApiSetFilterBlankIntegrationTest.java |   62 +
 ...jectInputFilterApiSetFilterIntegrationTest.java |   60 +
 ...InputFilterApiSetFilterNullIntegrationTest.java |   61 +
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    0
 .../internal/serialization/BasicSerializable.java  |    3 -
 .../geode/internal/serialization/DSCODE.java       |    2 +-
 .../serialization/DSFIDNotFoundException.java      |   10 +-
 .../internal/serialization/DSFIDSerializer.java    |    9 +-
 .../serialization/DataSerializableFixedID.java     |   39 +-
 .../DataSerializableFixedIdRegistrant.java         |   29 +
 .../DataSerializableFixedIdRegistrar.java          |   27 +
 .../geode/internal/serialization/KnownVersion.java |   72 +-
 ...erializationSanctionedSerializablesService.java |   27 +
 .../serialization/SerializationVersions.java       |    6 +-
 .../serialization/ThreadLocalByteArrayCache.java   |    2 +-
 .../serialization/VersionedDataInputStream.java    |    4 +-
 .../serialization/VersionedDataOutputStream.java   |    4 +-
 .../serialization/VersionedDataStream.java         |    3 +
 .../internal/serialization/filter/ApiPackage.java  |   41 +
 .../filter/FilterAlreadyConfiguredException.java   |   36 +
 .../serialization/filter/FilterConfiguration.java  |   27 +
 .../serialization/filter/FilterPattern.java        |   28 +
 .../serialization/filter/GlobalSerialFilter.java   |   30 +
 .../filter/GlobalSerialFilterConfiguration.java    |  126 +
 .../GlobalSerialFilterConfigurationFactory.java    |   29 +
 .../filter/GlobalSerialFilterFactory.java          |   30 +
 .../Java9ReflectiveObjectInputFilterApi.java       |   64 +
 .../filter/JmxSerialFilterConfiguration.java       |   73 +
 .../JmxSerialFilterConfigurationFactory.java       |   28 +
 .../filter/NullStreamSerialFilter.java             |   28 +
 .../serialization/filter/ObjectInputFilterApi.java |   88 +
 .../filter/ObjectInputFilterApiFactory.java        |   24 +
 .../filter/ObjectInputFilterInvocationHandler.java |  109 +
 .../filter/ObjectInputFilterUtils.java             |   61 +
 .../filter/OpenMBeanFilterPattern.java             |   68 +
 .../filter/ReflectiveFacadeGlobalSerialFilter.java |  102 +
 .../ReflectiveFacadeGlobalSerialFilterFactory.java |   46 +
 .../filter/ReflectiveFacadeStreamSerialFilter.java |  112 +
 .../ReflectiveFacadeStreamSerialFilterFactory.java |   39 +
 .../filter/ReflectiveObjectInputFilterApi.java     |  238 ++
 .../ReflectiveObjectInputFilterApiFactory.java     |   45 +
 .../filter/SanctionedSerializables.java            |   99 +
 .../SanctionedSerializablesFilterPattern.java      |  111 +
 .../filter/SanctionedSerializablesService.java     |   39 +
 .../filter/SerializableObjectConfig.java           |   31 +
 .../serialization/filter/StreamSerialFilter.java   |   32 +
 .../filter/StreamSerialFilterFactory.java          |   24 +
 ...ertyGlobalSerialFilterConfigurationFactory.java |   68 +
 ...ropertyJmxSerialFilterConfigurationFactory.java |   55 +
 .../filter/UnableToSetSerialFilterException.java   |   36 +
 .../internal/DSFIDSerializerImpl.java              |   23 +-
 .../internal/SerializationContextImpl.java         |    3 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 ...anctioned-geode-serialization-serializables.txt |    6 +
 .../serialization/ByteArrayDataInputTest.java      |   16 +-
 .../geode/internal/serialization/DSCODETest.java   |    2 +-
 .../serialization/KnownVersionJUnitTest.java       |   10 +-
 .../SerializationDependenciesJUnitTest.java        |   48 -
 .../SerializationDependenciesTest.java             |   49 +
 .../serialization/filter/ApiPackageTest.java       |   61 +
 .../GlobalSerialFilterConfigurationTest.java       |  118 +
 .../JmxSerialFilterConfigurationFactoryTest.java   |   74 +
 .../filter/JmxSerialFilterConfigurationTest.java   |  165 +
 .../filter/NullObjectInputFilterTest.java          |   35 +
 .../ObjectInputFilterInvocationHandlerTest.java    |   97 +
 .../filter/ObjectInputFilterUtilsTest.java         |   94 +
 .../filter/OpenMBeanFilterPatternTest.java         |  142 +
 ...lectiveFacadeGlobalSerialFilterFactoryTest.java |   76 +
 .../ReflectiveFacadeGlobalSerialFilterTest.java    |  168 ++
 ...flectiveFacadeObjectInputFilterFactoryTest.java |   84 +
 .../ReflectiveFacadeObjectInputFilterTest.java     |  175 ++
 .../ReflectiveObjectInputFilterApiFactoryTest.java |   69 +
 .../filter/ReflectiveObjectInputFilterApiTest.java |  228 ++
 .../SanctionedSerializablesFilterPatternTest.java  |  206 ++
 .../filter/SanctionedSerializablesTest.java        |   95 +
 .../filter/SerialFilterAssertions.java             |   69 +
 .../filter/SerializableObjectConfigTest.java       |   46 +
 ...GlobalSerialFilterConfigurationFactoryTest.java |  144 +
 ...rtyJmxSerialFilterConfigurationFactoryTest.java |   94 +
 .../internal/DSFIDSerializerImplTest.java          |   44 +
 .../src/test/resources/expected-pom.xml            |   10 +
 geode-server-all/build.gradle                      |   81 +
 .../geode/GeodeServerAllJarIntegrationTest.java    |   79 +
 .../resources/dependency_classpath.txt             |   98 +
 .../src/test/resources/expected-pom.xml            |  150 +
 geode-tcp-server/build.gradle                      |   36 +-
 .../tcpserver/AdvancedSocketCreatorImpl.java       |    4 +-
 .../internal/tcpserver/InetSocketWrapper.java      |    8 -
 .../internal/tcpserver/HostAndPortTest.java        |   20 +-
 .../internal/tcpserver/TcpServerJUnitTest.java     |    2 +-
 geode-unsafe/build.gradle                          |    8 +-
 .../internal/sun/misc/SignalHandlerTest.java       |    5 +-
 .../geode/unsafe/internal/sun/misc/SignalTest.java |    5 +-
 .../internal/sun/nio/ch/DirectBufferTest.java      |    8 +-
 geode-wan/build.gradle                             |    5 +-
 .../commands/WanCopyRegionCommandDUnitTest.java    | 1523 ++++++++++
 .../internal/cache/UpdateVersionDUnitTest.java     |   92 +-
 ...ueueOverflowMBeanAttributesDistributedTest.java |    4 +-
 .../cache/wan/CacheClientNotifierDUnitTest.java    |    8 +-
 .../cache/wan/GatewayReceiverMBeanDUnitTest.java   |   39 +-
 ...nderOverflowMBeanAttributesDistributedTest.java |    8 +-
 .../cache/wan/Simple2CacheServerDUnitTest.java     |   30 +-
 .../geode/internal/cache/wan/WANTestBase.java      |  479 +--
 .../ConcurrentParallelGatewaySenderDUnitTest.java  |   52 +-
 ...ParallelGatewaySenderOperation_1_DUnitTest.java |   40 +-
 ...ParallelGatewaySenderOperation_2_DUnitTest.java |   86 +-
 .../ConcurrentWANPropagation_1_DUnitTest.java      |   34 +-
 .../ConcurrentWANPropagation_2_DUnitTest.java      |   42 +-
 .../cache/wan/disttx/DistTXWANDUnitTest.java       |   12 +-
 .../misc/AuthenticationExpiredWANDunitTest.java    |  172 ++
 .../misc/CommonParallelGatewaySenderDUnitTest.java |   31 +-
 .../KeepEventsOnGatewaySenderQueueDUnitTest.java   |    2 +-
 .../NewWANConcurrencyCheckForDestroyDUnitTest.java |   64 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java    |   10 +-
 .../cache/wan/misc/PDXNewWanDUnitTest.java         |  126 +-
 ...atedRegion_ParallelWANPersistenceDUnitTest.java |   52 +-
 ...atedRegion_ParallelWANPropagationDUnitTest.java |   78 +-
 .../misc/SenderWithTransportFilterDUnitTest.java   |   18 +-
 ...hutdownAllPersistentGatewaySenderDUnitTest.java |    8 +-
 .../cache/wan/misc/WANLocatorServerDUnitTest.java  |    8 +-
 .../internal/cache/wan/misc/WANSSLDUnitTest.java   |   27 +-
 .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java  |  107 +-
 ...elGatewaySenderAndCQDurableClientDUnitTest.java |  503 ++++
 .../ParallelGatewaySenderOperationsDUnitTest.java  |  154 +-
 ...arallelGatewaySenderQueueOverflowDUnitTest.java |   88 +-
 .../parallel/ParallelWANConflationDUnitTest.java   |   40 +-
 ...ANPersistenceEnabledGatewaySenderDUnitTest.java |  428 ++-
 ...arallelWANPropagationClientServerDUnitTest.java |    8 +-
 ...rallelWANPropagationConcurrentOpsDUnitTest.java |   42 +-
 .../parallel/ParallelWANPropagationDUnitTest.java  |    4 +-
 .../ParallelWANPropagationLoopBackDUnitTest.java   |   10 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java    |  343 +--
 .../cache/wan/serial/GatewayReceiverDUnitTest.java |   12 +-
 ...erialGatewaySenderAlterOperationsDUnitTest.java |   32 +-
 ...lGatewaySenderDistributedDeadlockDUnitTest.java |   22 +-
 .../SerialGatewaySenderEventListenerDUnitTest.java |   16 +-
 ...rialGatewaySenderOperationsDistributedTest.java |   60 +-
 .../serial/SerialGatewaySenderQueueDUnitTest.java  |   59 +-
 ...ANPersistenceEnabledGatewaySenderDUnitTest.java |   54 +-
 .../wan/serial/SerialWANPropagationDUnitTest.java  |  156 +-
 .../SerialWANPropagationLoopBackDUnitTest.java     |   78 +-
 ...lWANPropagation_PartitionedRegionDUnitTest.java |   38 +-
 .../cache/wan/serial/SerialWANStatsDUnitTest.java  |  355 +--
 .../CreateGatewayReceiverCommandDUnitTest.java     |    4 +-
 .../PauseGatewaySenderCommandDUnitTest.java        |    7 +-
 .../StopGatewaySenderCommandDUnitTest.java         |  134 +-
 .../cache/wan/wancommand/WANCommandUtils.java      |   10 +-
 .../geode/management/AEQManagementDUnitTest.java   |    4 +-
 .../geode/management/WANManagementDUnitTest.java   |   40 +-
 .../AlterRegionCommandWithRemoteLocator.java       |    2 +-
 ...rConfigurationIndexWithFromClauseDUnitTest.java |    4 +-
 .../WANClusterConfigurationDUnitTest.java          |    1 -
 ...ewayReceiverXmlParsingValidationsJUnitTest.java |   28 +-
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../WanCommandAutoCompletionIntegrationTest.java   |   50 +
 .../AnalyzeWANSerializablesIntegrationTest.java    |   38 +
 .../AnalyzeWANSerializablesJUnitTest.java          |   35 -
 .../cache/wan/misc/WANConfigurationJUnitTest.java  |   10 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    2 -
 .../org/apache/geode/codeAnalysis/openBugs.txt     |   21 -
 .../internal/locator/wan/LocatorJoinMessage.java   |   21 +-
 .../locator/wan/RemoteLocatorJoinRequest.java      |    8 +-
 .../locator/wan/RemoteLocatorJoinResponse.java     |   10 +-
 .../internal/locator/wan/RemoteLocatorRequest.java |    8 +-
 .../locator/wan/RemoteLocatorResponse.java         |    6 +-
 .../wan/internal/AbstractRemoteGatewaySender.java  |   49 +-
 .../wan/internal/GatewayReceiverFactoryImpl.java   |   50 +-
 .../cache/wan/internal/GatewayReceiverImpl.java    |   16 +-
 .../GatewaySenderEventRemoteDispatcher.java        |  231 +-
 .../wan/internal/GatewaySenderFactoryImpl.java     |  200 +-
 .../wan/internal/WANDistributedSystemService.java  |   43 -
 .../WANSanctionedSerializablesService.java         |   27 +
 .../wan/internal/WanCopyRegionFunctionService.java |  123 +
 ...gionFunctionServiceAlreadyRunningException.java |   24 +
 .../cli/commands/WanCopyRegionCommand.java         |  138 +
 .../client/locator/GatewaySenderBatchOp.java       |   73 +-
 .../internal/client/locator/LocatorDiscovery.java  |   10 +-
 .../wan/internal/client/locator/LocatorHelper.java |   10 +-
 .../locator/LocatorMembershipListenerImpl.java     |   16 +-
 .../wan/internal/client/locator/SenderProxy.java   |    4 +-
 .../internal/client/locator/WANFactoryImpl.java    |   47 +-
 .../client/locator/WanLocatorDiscovererImpl.java   |   12 +-
 .../parallel/ParallelGatewaySenderImpl.java        |   49 +-
 ...currentParallelGatewaySenderEventProcessor.java |    6 +-
 .../RemoteParallelGatewaySenderEventProcessor.java |   68 +-
 ...oncurrentSerialGatewaySenderEventProcessor.java |    2 +-
 .../RemoteSerialGatewaySenderEventProcessor.java   |    6 +-
 .../internal/serial/SerialGatewaySenderImpl.java   |   58 +-
 .../cli/functions/WanCopyRegionFunction.java       |  215 ++
 .../functions/WanCopyRegionFunctionDelegate.java   |  456 +++
 ...e.distributed.internal.DistributedSystemService |   15 -
 .../org.apache.geode.internal.cache.CacheService   |    1 +
 ...serialization.DataSerializableFixedIdRegistrant |   16 +
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../org.springframework.shell.core.CommandMarker   |    1 +
 .../sanctioned-geode-wan-serializables.txt         |    6 +
 .../wan/internal/AckReaderThreadJUnitTest.java     |   10 +-
 .../wan/internal/GatewayReceiverImplTest.java      |    8 +-
 ...atewaySenderEventRemoteDispatcherJUnitTest.java |   78 +-
 .../internal/WanCopyRegionFunctionServiceTest.java |  186 ++
 .../cli/commands/WanCopyRegionCommandTest.java     |   49 +
 .../locator/LocatorMembershipListenerTest.java     |    2 +-
 .../parallel/ParallelGatewaySenderImplTest.java    |   47 +-
 .../serial/SerialGatewaySenderImplTest.java        |   42 -
 .../WanCopyRegionFunctionDelegateTest.java         |  665 ++++
 .../cli/functions/WanCopyRegionFunctionTest.java   |  142 +
 geode-wan/src/test/resources/expected-pom.xml      |    5 +
 ...ateGatewaySenderMixedSiteOneCurrentSiteTwo.java |   13 +-
 .../cache/wan/WANRollingUpgradeDUnitTest.java      |   24 +-
 ...adeEventProcessingOldSiteOneCurrentSiteTwo.java |    3 +-
 ...ipleReceiversDefinedInClusterConfiguration.java |    4 +-
 .../WANRollingUpgradeNewSenderProcessOldEvent.java |    5 +-
 ...eCacheServerProfileToMembersOlderThan1dot5.java |    4 +-
 .../AnalyzeWebApiSerializablesIntegrationTest.java |   38 +
 .../AnalyzeWebApiSerializablesJUnitTest.java       |   28 -
 ...ctionedSerializablesServiceIntegrationTest.java |   39 +
 .../rest/internal/web/controllers/Customer.java    |   34 +-
 .../geode/rest/internal/web/controllers/Item.java  |   42 +-
 .../WebApiSanctionedSerializablesService.java      |   27 +
 .../web/controllers/AbstractBaseController.java    |    3 +-
 .../web/controllers/PdxBasedCrudController.java    |    6 +-
 .../web/controllers/QueryAccessController.java     |    2 +-
 .../support/RestServersResultCollector.java        |    2 +-
 .../CustomMappingJackson2HttpMessageConverter.java |    6 +-
 .../web/security/GeodeAuthenticationProvider.java  |    2 +-
 .../web/security/RestSecurityConfiguration.java    |    2 +-
 .../rest/internal/web/util/IdentifiableUtils.java  |   12 +-
 .../geode/rest/internal/web/util/JSONUtils.java    |    2 +-
 .../geode/rest/internal/web/util/JsonWriter.java   |  104 +-
 .../geode/rest/internal/web/util/NumberUtils.java  |    4 +-
 ...alization.filter.SanctionedSerializablesService |   15 +
 .../sanctioned-geode-web-api-serializables.txt     |    0
 geode-web-api/src/main/webapp/META-INF/NOTICE      |    2 +-
 .../rest/internal/web/util/JsonWriterTest.java     |   48 +
 geode-web-management/build.gradle                  |    4 +
 .../rest/LocatorLauncherContextLoader.java         |    2 +-
 .../internal/rest/LocatorWebContext.java           |    6 +-
 .../internal/rest/MockLocatorContextLoader.java    |    4 +-
 ...usterManagementSecurityRestIntegrationTest.java |    4 +-
 .../rest/DeployManagementIntegrationTest.java      |    4 +-
 .../internal/rest/DeploymentIntegrationTest.java   |   11 +-
 .../internal/rest/PdxIntegrationTest.java          |    2 +-
 .../rest/RegionManagementIntegrationTest.java      |    2 +-
 .../internal/rest/ManagementLoggingFilter.java     |   10 +-
 .../DeploymentManagementController.java            |    4 +-
 .../rest/controllers/PingManagementController.java |    2 +-
 .../CustomMappingJackson2HttpMessageConverter.java |    2 +-
 .../rest/security/GeodeAuthenticationProvider.java |    2 +-
 .../rest/security/RestSecurityConfiguration.java   |    2 +-
 .../src/main/webapp/META-INF/NOTICE                |    2 +-
 geode-web/build.gradle                             |    4 +-
 .../AlterRuntimeCommandDistributedTest.java        |   57 +-
 .../commands/ClusterConfigurationDUnitTest.java    |    3 +-
 .../commands/DescribeConfigCommandDUnitTest.java   |    4 +-
 .../cli/commands/ExportConfigCommandDUnitTest.java |    4 +-
 .../cli/commands/GcCommandOverHttpDUnitTest.java   |   24 -
 .../commands/GcCommandOverHttpDistributedTest.java |   24 +
 .../GemfireDataCommandsOverHttpDUnitTest.java      |   24 -
 .../GeodeDataCommandsOverHttpDistributedTest.java  |   26 +
 .../ListIndexCommandOverHttpDUnitTest.java         |   30 -
 .../ListIndexCommandOverHttpDistributedTest.java   |   30 +
 .../commands/QueryCommandOverHttpDUnitTest.java    |   21 +-
 .../RegionMembershipMBeanOverHttpDUnitTest.java    |   25 -
 ...gionMembershipMBeanOverHttpDistributedTest.java |   26 +
 .../security/LogNoPasswordDistributedTest.java     |    2 +-
 .../internal/cli/commands/CommandOverHttpTest.java |    4 +-
 .../ShellCommandsControllerProcessCommandTest.java |    5 +-
 .../support/LoginHandlerInterceptor.java           |    6 +-
 geode-web/src/main/webapp/META-INF/NOTICE          |    2 +-
 .../LoginHandlerInterceptorRequestHeaderTest.java  |    2 +-
 gradle.properties                                  |    4 +-
 gradle/japicmp.gradle                              |   44 +-
 gradle/java.gradle                                 |   97 +-
 gradle/jmh.gradle                                  |   16 +
 gradle/multi-process-test.gradle                   |   60 +-
 gradle/spotless.gradle                             |   16 +-
 gradle/test.gradle                                 |   27 +-
 settings.gradle                                    |   13 +-
 static-analysis/pmd-rules/build.gradle             |    7 +-
 5944 files changed, 204243 insertions(+), 142272 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index a46ede5..a80149f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -25,8 +25,8 @@ github:
   enabled_merge_buttons:
     # enable squash button:
     squash:  true
-    # enable merge button:
-    merge:  true
+    # disable merge button:
+    merge:  false
     # enable rebase button:
     rebase:  true
 
@@ -39,9 +39,11 @@ github:
         contexts:
           - concourse-ci/api-check-test-openjdk11
           - concourse-ci/build
-          - concourse-ci/stress-new-test-openjdk11
           - concourse-ci/unit-test-openjdk11
           - concourse-ci/unit-test-openjdk8
+          - "LGTM analysis: Java"
+          - "LGTM analysis: Python"
+          - "LGTM analysis: JavaScript"
 
       required_pull_request_reviews:
         dismiss_stale_reviews: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3a8dfac..d7fc810 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,8 @@
-Thank you for submitting a contribution to Apache Geode.
+<!-- Thank you for submitting a contribution to Apache Geode. -->
 
-In order to streamline the review of the contribution we ask you
-to ensure the following steps have been taken:
+<!-- In order to streamline the review of the contribution we ask you
+to ensure the following steps have been taken: 
+-->
 
 ### For all changes:
 - [ ] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
@@ -16,7 +17,8 @@ to ensure the following steps have been taken:
 
 - [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
 
-### Note:
+<!-- Note:
 Please ensure that once the PR is submitted, check Concourse for build issues and
 submit an update to your PR as soon as possible. If you need help, please send an
 email to dev@geode.apache.org.
+-->
diff --git a/BUILDING.md b/BUILDING.md
index ebcb842..b25ed3d 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -103,5 +103,5 @@ The following steps have been tested with **IntelliJ IDEA 2020.3.3**
    Some optional sanity tests to make sure things are working properly:
     * Try looking up classes using **Navigate -> Class...**
     * Open and run a distributed test such as BasicDistributedTest in geode-core.
-    * Create a new java class and ensure the Apache license is automatically added to the top of the
+    * Create a new Java class and ensure the Apache license is automatically added to the top of the
       file with no blank line before the package line.
diff --git a/CODEOWNERS b/CODEOWNERS
index 732a4a8..a252cfe 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -23,37 +23,39 @@
 #-----------------------------------------------------------------
 # Serialization
 #-----------------------------------------------------------------
-geode-serialization/**                                            @echobravopapa @Bill
+geode-serialization/**                                            @echobravopapa @Bill @kirklund @kamilla1201 @jchen21
+geode-serialization/**/internal/serialization/filter/*            @kirklund @jchen21
 geode-core/**/org/apache/geode/pdx/**                             @upthewaterspout @dschneider-pivotal @agingade
-geode-core/**/org/apache/geode/codeAnalysis/**                    @upthewaterspout @dschneider-pivotal @agingade
-geode-core/**/org/apache/geode/internal/*                         @echobravopapa @Bill @kirklund
+geode-core/**/org/apache/geode/codeAnalysis/**                    @upthewaterspout @dschneider-pivotal @agingade @kirklund
+geode-core/**/org/apache/geode/internal/*                         @echobravopapa @Bill @kirklund @kamilla1201
+geode-core/**/META-INF/**/*SanctionedSerializablesService         @kirklund @jchen21
 
 #-----------------------------------------------------------------
 # Membership
 #-----------------------------------------------------------------
-geode-membership/**                                               @echobravopapa @Bill
-geode-old-client-support/**                                       @echobravopapa @Bill
-geode-tcp-server/**                                               @echobravopapa @Bill
-geode-core/**/org/apache/geode/distributed/internal/membership/** @echobravopapa @Bill
+geode-membership/**                                               @echobravopapa @Bill @kamilla1201
+geode-old-client-support/**                                       @echobravopapa @Bill @kamilla1201
+geode-tcp-server/**                                               @echobravopapa @Bill @kamilla1201
+geode-core/**/org/apache/geode/distributed/internal/membership/** @echobravopapa @Bill @kirklund @kamilla1201
 
 #-----------------------------------------------------------------
 # P2P Messaging
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/internal/tcp/**                    @echobravopapa @Bill
-geode-core/**/org/apache/geode/distributed/internal/direct/**     @echobravopapa @Bill
-geode-core/**/org/apache/geode/internal/net/**                    @echobravopapa @Bill
-geode-core/**/org/apache/geode/net/**                             @Bill @mivanac
-geode-core/**/org/apache/geode/distributed/*                      @echobravopapa @Bill @kirklund
-geode-core/**/org/apache/geode/distributed/internal/*             @echobravopapa @Bill @kirklund
+geode-core/**/org/apache/geode/internal/tcp/**                    @echobravopapa @Bill @kamilla1201
+geode-core/**/org/apache/geode/distributed/internal/direct/**     @echobravopapa @Bill @kamilla1201
+geode-core/**/org/apache/geode/internal/net/**                    @echobravopapa @Bill @kamilla1201
+geode-core/**/org/apache/geode/net/**                             @Bill @mivanac @kamilla1201
+geode-core/**/org/apache/geode/distributed/*                      @echobravopapa @Bill @kirklund @kamilla1201
+geode-core/**/org/apache/geode/distributed/internal/*             @echobravopapa @Bill @kirklund @kamilla1201
 
 #-----------------------------------------------------------------
 # Client/server messaging and cache operations
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/cache/client/**                    @echobravopapa @Bill @kirklund
-geode-core/**/org/apache/geode/cache/server/**                    @echobravopapa @Bill @kirklund
-geode-core/**/org/apache/geode/cache/client/internal/**           @Bill @echobravopapa
-geode-core/**/org/apache/geode/internal/cache/tier/**             @Bill @echobravopapa @agingade
-geode-assembly/**/apache/geode/client/sni/**                      @Bill @echobravopapa
+geode-core/**/org/apache/geode/cache/client/**                    @echobravopapa @Bill @kamilla1201
+geode-core/**/org/apache/geode/cache/server/**                    @echobravopapa @Bill @kamilla1201
+geode-core/**/org/apache/geode/cache/client/internal/**           @Bill @echobravopapa @kamilla1201
+geode-core/**/org/apache/geode/internal/cache/tier/**             @Bill @echobravopapa @agingade @kirklund @kamilla1201
+geode-assembly/**/apache/geode/client/sni/**                      @Bill @echobravopapa @kamilla1201
 
 #-----------------------------------------------------------------
 # Client Queues
@@ -82,11 +84,11 @@ geode-core/**/org/apache/geode/internal/cache/*                   @nabarunnag @D
 #-----------------------------------------------------------------
 # Region entry management
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/internal/cache/entries/**          @dschneider-pivotal @sabbey37 @upthewaterspout @kirklund @mhansonp
-geode-core/**/org/apache/geode/internal/cache/region/entry/**     @dschneider-pivotal @sabbey37 @upthewaterspout @kirklund @mhansonp
-geode-core/**/org/apache/geode/internal/cache/map/**              @dschneider-pivotal @sabbey37 @upthewaterspout @kirklund @mhansonp
-geode-core/**/org/apache/geode/compression/**                     @dschneider-pivotal @sabbey37 @kirklund
-geode-core/**/org/apache/geode/internal/cache/compression/**      @dschneider-pivotal @sabbey37 @kirklund
+geode-core/**/org/apache/geode/internal/cache/entries/**          @dschneider-pivotal @upthewaterspout @kirklund @mhansonp
+geode-core/**/org/apache/geode/internal/cache/region/entry/**     @dschneider-pivotal @upthewaterspout @kirklund @mhansonp
+geode-core/**/org/apache/geode/internal/cache/map/**              @dschneider-pivotal @upthewaterspout @kirklund @mhansonp
+geode-core/**/org/apache/geode/compression/**                     @dschneider-pivotal @kirklund
+geode-core/**/org/apache/geode/internal/cache/compression/**      @dschneider-pivotal @kirklund
 
 #-----------------------------------------------------------------
 # Partitioned Regions
@@ -121,8 +123,8 @@ geode-core/**/org/apache/geode/internal/cache/locks/**            @pivotal-eshu
 #-----------------------------------------------------------------
 # Function Execution
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/internal/cache/execute/**          @boglesby @sabbey37 @kirklund @nabarunnag
-geode-core/**/org/apache/geode/cache/execute/**                   @boglesby @sabbey37 @kirklund @nabarunnag
+geode-core/**/org/apache/geode/internal/cache/execute/**          @boglesby @kirklund @nabarunnag
+geode-core/**/org/apache/geode/cache/execute/**                   @boglesby @kirklund @nabarunnag
 
 #-----------------------------------------------------------------
 # Querying
@@ -133,9 +135,9 @@ geode-core/**/org/apache/geode/cache/query/**                     @nabarunnag @D
 #-----------------------------------------------------------------
 # Session State:
 #-----------------------------------------------------------------
-extensions/**                                                     @sabbey37 @jdeppe-pivotal @BenjaminPerryRoss
-geode-core/**/org/apache/geode/internal/modules/util/**           @sabbey37 @jdeppe-pivotal @BenjaminPerryRoss
-geode-assembly/**/org/apache/geode/session/**                     @sabbey37 @jdeppe-pivotal @BenjaminPerryRoss
+extensions/**                                                     @jdeppe-pivotal @BenjaminPerryRoss
+geode-core/**/org/apache/geode/internal/modules/util/**           @jdeppe-pivotal @BenjaminPerryRoss
+geode-assembly/**/org/apache/geode/session/**                     @jdeppe-pivotal @BenjaminPerryRoss
 
 #-----------------------------------------------------------------
 # DEV rest API
@@ -156,13 +158,13 @@ geode-memcached/**                                                @nabarunnag @D
 #-----------------------------------------------------------------
 # Misc Utilities
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/internal/util/**                   @nabarunnag @boglesby
+geode-core/**/org/apache/geode/internal/util/**                   @nabarunnag @boglesby @kirklund
 geode-core/**/org/apache/geode/internal/util/concurrent/**        @nabarunnag @boglesby @kirklund
-geode-core/**/org/apache/geode/internal/shared/**                 @nabarunnag @boglesby
+geode-core/**/org/apache/geode/internal/shared/**                 @nabarunnag @boglesby @kirklund
 geode-core/**/org/apache/geode/internal/sequencelog/**            @nabarunnag @boglesby
 geode-core/**/org/apache/geode/internal/concurrent/**             @nabarunnag @boglesby @kirklund
-geode-core/**/org/apache/geode/distributed/internal/unsafe/**     @nabarunnag @boglesby
-geode-core/**/org/apache/geode/internal/lang/**                   @nabarunnag @boglesby
+geode-core/**/org/apache/geode/distributed/internal/unsafe/**     @nabarunnag @boglesby @kirklund
+geode-core/**/org/apache/geode/internal/lang/**                   @nabarunnag @boglesby @kirklund
 geode-core/**/org/apache/geode/internal/monitoring/**             @nabarunnag @boglesby @kirklund
 geode-core/**/org/apache/geode/internal/exception/**              @nabarunnag @boglesby @kirklund
 geode-core/**/org/apache/geode/lang/**                            @nabarunnag @boglesby @kirklund
@@ -198,11 +200,11 @@ geode-assembly/**/apache/geode/cache/wan/**                       @gesterzhou @b
 #-----------------------------------------------------------------
 # Management
 #-----------------------------------------------------------------
-geode-management/**                                               @jdeppe-pivotal @jinmeiliao
+geode-management/**                                               @jdeppe-pivotal @jinmeiliao @kirklund
 geode-assembly/**/org/apache/geode/management/**                  @jdeppe-pivotal @jinmeiliao
 geode-assembly/**/org/apache/geode/tools/pulse/**                 @jdeppe-pivotal @jinmeiliao
 geode-web-management/**                                           @jdeppe-pivotal @jinmeiliao
-geode-gfsh/**                                                     @jdeppe-pivotal @jinmeiliao @mhansonp @kirklund
+geode-gfsh/**                                                     @jdeppe-pivotal @jinmeiliao @mhansonp
 geode-assembly/**/bin/**                                          @jdeppe-pivotal @jinmeiliao @mhansonp @kirklund
 geode-pulse/**                                                    @jdeppe-pivotal @jinmeiliao @mhansonp
 geode-http-service/**                                             @jdeppe-pivotal @jinmeiliao
@@ -210,9 +212,9 @@ geode-web/**                                                      @jdeppe-pivota
 geode-core/**/org/apache/geode/admin/**                           @jdeppe-pivotal @jinmeiliao @kirklund
 geode-core/**/org/apache/geode/alerting/**                        @jdeppe-pivotal @jinmeiliao @kirklund
 geode-core/**/org/apache/geode/management/**                      @jdeppe-pivotal @jinmeiliao @kirklund
-geode-core/**/org/apache/geode/cache/configuration/**             @jdeppe-pivotal @jinmeiliao
-geode-core/**/org/apache/geode/internal/admin/**                  @jdeppe-pivotal @jinmeiliao
-geode-core/**/org/apache/geode/internal/cache/xmlcache/**         @jdeppe-pivotal @jinmeiliao
+geode-core/**/org/apache/geode/cache/configuration/**             @jdeppe-pivotal @jinmeiliao @kirklund
+geode-core/**/org/apache/geode/internal/admin/**                  @jdeppe-pivotal @jinmeiliao @kirklund
+geode-core/**/org/apache/geode/internal/cache/xmlcache/**         @jdeppe-pivotal @jinmeiliao @kirklund
 geode-core/**/org/apache/geode/internal/cache/extension/**        @jdeppe-pivotal @jinmeiliao
 geode-core/**/org/apache/geode/internal/config/**                 @jdeppe-pivotal @jinmeiliao
 geode-core/**/org/apache/geode/internal/process/**                @jdeppe-pivotal @jinmeiliao @kirklund
@@ -223,8 +225,8 @@ geode-core/**/org/apache/geode/cache/internal/*                   @jdeppe-pivota
 #-----------------------------------------------------------------
 geode-core/**/org/apache/geode/examples/**                        @jdeppe-pivotal @jinmeiliao @mhansonp
 geode-core/**/org/apache/geode/examples/security/**               @jdeppe-pivotal @jinmeiliao
-geode-core/**/org/apache/geode/security/**                        @jdeppe-pivotal @jinmeiliao
-geode-core/**/org/apache/geode/internal/security/**               @jdeppe-pivotal @jinmeiliao
+geode-core/**/org/apache/geode/security/**                        @jdeppe-pivotal @jinmeiliao @kirklund
+geode-core/**/org/apache/geode/internal/security/**               @jdeppe-pivotal @jinmeiliao @kirklund
 geode-core/**/org/apache/geode/cache/operations/**                @jdeppe-pivotal @jinmeiliao
 geode-core/**/org/apache/geode/internal/cache/operations/**       @jdeppe-pivotal @jinmeiliao
 geode-assembly/**/apache/geode/ssl/**                             @jdeppe-pivotal @jinmeiliao
@@ -258,7 +260,7 @@ geode-core/**/org/apache/geode/internal/cache/snapshot/**         @agingade @jch
 #-----------------------------------------------------------------
 # JDBC connector
 #-----------------------------------------------------------------
-geode-connectors/**                                               @agingade @jchen21
+geode-connectors/**                                               @agingade @jchen21 @kirklund
 geode-core/**/org/apache/geode/datasource/**                      @agingade @BenjaminPerryRoss @jchen21
 geode-core/**/org/apache/geode/internal/datasource/**             @agingade @BenjaminPerryRoss @jchen21
 
@@ -275,16 +277,16 @@ geode-core/**/org/apache/geode/internal/cache/control/**          @kirklund @Don
 geode-dunit/**                                                    @mhansonp @kirklund
 geode-junit/**                                                    @mhansonp @kirklund
 #geode-jmh/**
-geode-junit/**/org/apache/geode/test/util/**                      @jdeppe-pivotal @onichols-pivotal
-geode-assembly/**/org/apache/geode/test/junit/**                  @jdeppe-pivotal @jinmeiliao
-geode-assembly/**/org/apache/geode/rules/**                       @jdeppe-pivotal @jinmeiliao
+geode-junit/**/org/apache/geode/test/util/**                      @jdeppe-pivotal @onichols-pivotal @kirklund
+geode-assembly/**/org/apache/geode/test/junit/**                  @jdeppe-pivotal @jinmeiliao @kirklund
+geode-assembly/**/org/apache/geode/rules/**                       @jdeppe-pivotal @jinmeiliao @kirklund
 geode-assembly/**/org/apache/geode/launchers/**                   @dschneider-pivotal @boglesby @kirklund @nabarunnag
 geode-assembly/**/resources/**                                    @boglesby @kirklund @nabarunnag @jdeppe-pivotal @jinmeiliao
 
 #-----------------------------------------------------------------
 # Redis API
 #-----------------------------------------------------------------
-geode-apis-compatible-with-redis/**                               @sabbey37 @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans
+geode-for-redis/**                                                @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans @dschneider-pivotal
 
 #-----------------------------------------------------------------
 # Build and tooling
@@ -293,12 +295,12 @@ geode-apis-compatible-with-redis/**                               @sabbey37 @jde
 *gradle*                                                          @rhoughton-pivot @onichols-pivotal
 buildSrc/**                                                       @rhoughton-pivot @jdeppe-pivotal
 buildSrc/**/DependencyConstraints.groovy                          @onichols-pivotal @dickcav @rhoughton-pivot
-ci/**                                                             @onichols-pivotal @dickcav @rhoughton-pivot
-ci/scripts/**                                                     @onichols-pivotal @dickcav @rhoughton-pivot
-ci/scripts/repeat-new-tests.sh                                    @onichols-pivotal @dickcav @rhoughton-pivot @upthewaterspout @jdeppe-pivotal
+ci/**                                                             @onichols-pivotal @dickcav @rhoughton-pivot @smgoller
+ci/scripts/**                                                     @onichols-pivotal @dickcav @rhoughton-pivot @smgoller
+ci/scripts/repeat-new-tests.sh                                    @onichols-pivotal @dickcav @rhoughton-pivot @smgoller @upthewaterspout @jdeppe-pivotal
 dev-tools/dependencies/**                                         @onichols-pivotal @dickcav
 dev-tools/release/**                                              @onichols-pivotal @dickcav
-docker/**                                                         @onichols-pivotal @dickcav
+docker/**                                                         @onichols-pivotal @dickcav @smgoller
 geode-management/src/test/script/update-management-wiki.sh        @onichols-pivotal @dickcav
 #boms/**
 static-analysis/**                                                @rhoughton-pivot @onichols-pivotal
@@ -313,8 +315,8 @@ expected-pom.xml                                                  @rhoughton-piv
 #-----------------------------------------------------------------
 apache-copyright-notice.txt                                       @upthewaterspout @pivotal-amurmann
 BUILDING.md                                                       @rhoughton-pivot @upthewaterspout
-CODE_OF_CONDUCT.md                                                @upthewaterspout @pivotal-amurmann @nonbinaryprogrammer
+CODE_OF_CONDUCT.md                                                @upthewaterspout @pivotal-amurmann @nonbinaryprogrammer @kirklund
 LICENSE                                                           @onichols-pivotal @dickcav
 NOTICE                                                            @onichols-pivotal @dickcav
-/README.md                                                        @upthewaterspout @pivotal-amurmann
+/README.md                                                        @upthewaterspout @pivotal-amurmann @kirklund
 #TESTING.md
diff --git a/CODEWATCHERS b/CODEWATCHERS
index e502d8e..4a56f52 100644
--- a/CODEWATCHERS
+++ b/CODEWATCHERS
@@ -33,10 +33,9 @@ CODEWATCHERS                                                      @onichols-pivo
 #-----------------------------------------------------------------
 # Documentation
 #-----------------------------------------------------------------
-dev-tools/docker/docs/**                                          @alb3rtobr
-geode-book/**                                                     @davebarnes97 @alb3rtobr
-geode-docs/**                                                     @davebarnes97 @alb3rtobr
-geode-book/config.yml                                             @onichols-pivotal @alb3rtobr
+geode-book/**                                                     @davebarnes97
+geode-docs/**                                                     @davebarnes97
+geode-book/config.yml                                             @onichols-pivotal
 geode-book/redirects.rb                                           @onichols-pivotal
 LICENSE                                                           @metatype
 NOTICE                                                            @metatype
@@ -59,10 +58,10 @@ geode-core/**/org/apache/geode/internal/cache/tier/**             @albertogpz
 #-----------------------------------------------------------------
 # WAN messaging and queues
 #-----------------------------------------------------------------
-geode-wan/**                                                      @albertogpz @alb3rtobr
-geode-core/**/org/apache/geode/cache/asyncqueue/**                @albertogpz @alb3rtobr
-geode-core/**/org/apache/geode/cache/wan/**                       @albertogpz @alb3rtobr
-geode-core/**/org/apache/geode/internal/cache/wan/**              @albertogpz @alb3rtobr
+geode-wan/**                                                      @albertogpz
+geode-core/**/org/apache/geode/cache/asyncqueue/**                @albertogpz
+geode-core/**/org/apache/geode/cache/wan/**                       @albertogpz
+geode-core/**/org/apache/geode/internal/cache/wan/**              @albertogpz
 
 #-----------------------------------------------------------------
 # Metrics & Statistics
@@ -78,11 +77,6 @@ geode-cq/**                                                       @mkevo
 geode-core/**/org/apache/geode/cache/query/**                     @mkevo
 
 #-----------------------------------------------------------------
-# Misc
-#-----------------------------------------------------------------
-geode-core/**/org/apache/geode/internal/cache/properties.md       @alb3rtobr
-
-#-----------------------------------------------------------------
 # Build and tooling
 #-----------------------------------------------------------------
-dev-tools/release/**                                              @demery-pivotal
+dev-tools/progress/**                                             @demery-pivotal
diff --git a/KEYS b/KEYS
index 7980b6f..eeaf3f2 100644
--- a/KEYS
+++ b/KEYS
@@ -1156,12 +1156,21 @@ wo1DG6RYnqZm7sa3P0zCUSvrof8tFknV2FwGwRM+8aayXTh3RMquwmPIoQ23ok0v
 -----END PGP PUBLIC KEY BLOCK-----
 pub   rsa4096 2018-01-04 [SC] [expires: 2022-01-04]
       CE6CD0A89480B1B9FCB98699274C66710770C135
-uid           [ultimate] Nabarun Nag <na...@cs.wisc.edu>
+uid           [ unknown] Nabarun Nag <na...@cs.wisc.edu>
 sig 3        274C66710770C135 2018-01-04  Nabarun Nag <na...@cs.wisc.edu>
 sig 3        C8D3705F9DBE2177 2018-02-26  Jason Huynh <ja...@apache.org>
+sig          19DBCAEEC72CFB64 2018-09-17  [User ID not found]
 sub   rsa4096 2018-01-04 [E] [expires: 2022-01-04]
 sig          274C66710770C135 2018-01-04  Nabarun Nag <na...@cs.wisc.edu>
 
+pub   rsa4096 2021-08-27 [SC] [expires: 2025-08-27]
+      97CA988514FC83D049A36F5CC7562171D6E44923
+uid           [ultimate] Nabarun Nag <nn...@apache.org>
+sig 3        C7562171D6E44923 2021-08-27  Nabarun Nag <nn...@apache.org>
+sig          274C66710770C135 2021-08-27  Nabarun Nag <na...@cs.wisc.edu>
+sub   rsa4096 2021-08-27 [E] [expires: 2025-08-27]
+sig          C7562171D6E44923 2021-08-27  Nabarun Nag <nn...@apache.org>
+
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBFpOogwBEADlT2Ue6XDFHqbM/LbZXhHMw4rcT4ifuBGyibbUbhLWGimav5tI
@@ -1200,31 +1209,101 @@ f5M7+x3ALplvCN89EDIbZOXhJMtiFA7PmTWTMMcn9ST5h2vdehHvK87ftl3ral0R
 s8ZogrOjpKud1dB7eQMkTnGk7flp1eMPr0FBSW8TnU8XlvtHNOgyUlp5Izrt5HgJ
 J62+OUiMzQJiOFQ3PR15IaARuhnUdCI3dMPhFl55dKfqLPXfNtRO6NIrsISSjxXQ
 ywt34Dw/NtcAzHNwTsD6FA0gftxk8n7CI23zczk57YBkQ64oJjz0KqAKCYYzda6m
-Ue+5Ag0EWk6iDAEQALjMPDFSeuiP1870C87lqlYIdWBr3s9Xb1L9mr7nfPUax77O
-h+kkqrVUEj23OW5YHCJ2qJayZouDVBWLPUhxr7/EhmnoKCWmJQq14VuD+yYiBIfH
-530EkKHfg2JGl/2vwSIaJGdip+3MyZkykL5tpBI/nDm4zE4mGJAq6ryoOC/EzOHA
-DZvheWFPKvz5UcBQkHhDuAJXWnLXpJOCnbR/09KKdxXutLFozdIwGo+mt6uJvO7n
-rhXy0XQhZSbnIoaI1j/lClEWScc0UX06ytPIDmRzYuahpNPepa1bRAzmK9Qmye0c
-k3+7J7dePIMKhqR8wfJsnZPbIsob3LgB7nvnxVnVW63G6VDTOhxHfwdktES5HJD9
-vCOBxbtEEeduZZHhNTAqw1JDfWw7f0ZkUl4XositMP7RK5axI16YvP5xsqjz99s6
-V4p0XH+H00HHjPt+mSqk4ejhGb1QYm/TJnk4Q9RBBcHKh1oZiTd2ppwHLHEteU0u
-U3bIvxjXe9t0eESC/rG1zLlcCmPXQRl2k35Rs5Wv1DPuNM+uCrEhm2HcZaqPb8B7
-ypaquCjCD4N0FBluc9p8RBK7DCM/zpzBXtOAoDCAH0OuSdmTs2vzi29fKh1nLixj
-U/+CoTrvrYpBJ0NYBIQPXvm7HH01hAqv85/ClxDkdavAiU7KMI6d9AF/ZEwLABEB
-AAGJAjwEGAEIACYWIQTObNColICxufy5hpknTGZxB3DBNQUCWk6iDAIbDAUJB4Yf
-gAAKCRAnTGZxB3DBNXWJD/9p4DLuCqD7iQ1cJ+cpgE3q9RzCdz9CFRv1gZTIlcoR
-iXcKv90xejMiDvZ4s6965gHGIcnT0JdqUopz6l8jY/4HVd1mCBo/daGE7E6uB/IZ
-AmhJdG4R1NQmvFAXmrlbh/Ugvpncdd6D5D7DleoS7npPgH3hs5bEfQ941L7i7m14
-g4QBj0jq/lgL7OKnTAH0JcoDXPVOoWfA3d0Hr5rROw6cZUHFkCvOunKZcbUSu9go
-0wvsGDGNRjfheK4AO3cKayEU+zz67wQq61ByL58Sz0wVmlA4/oY0qvy3NHdWmdx4
-dC6jWbkK0Agr4Xh8Ekyp+4q4eB9ki6q+M1bSe5etgflsA2ytQ4RwzxJJDcbXmg1y
-Twaqq3avl0BbitZ4Quj+ycOWpB1n+BeEVZbKL2QDCFpWAYVFCZ2WXEAHAXK2sJ54
-je31OyjPAGEbX0QX8gpfnXkW3BW519foKJuUKGTu4ZzxdwjkVp422LO9nif0wSYI
-E7E8PZTIolq9xhC103MfaNvF+dtTFli4r7hNa3T1Qq6Eu4NhLMrsR0GvBm298Yw6
-Y79TWNoe0dBLf6B8dmX+aqfWhziCz2Ijy8lF8sfQl2DalG+YpBkBBsNs8j/6lpHr
-Fgh2AddGmNuaP+tMFGCtdeHujkSbx7b1UOkxgLTS7nsRM0l6QN4czTNYcaUFgVU4
-Ig==
-=VFqr
+Ue+JAjMEEAEIAB0WIQSUjoI0FL5pOn90q74Z28ruxyz7ZAUCW6AOPgAKCRAZ28ru
+xyz7ZBbaEACrPTO9/hRuh01yEvqlcwvcoNsBECD6S4N9m0ws68XbtR0HkBoVPrNy
+VoZak6CxH9jUKcQQ7fSL+SyRMEUXkfGX+0wDxogKXIDrF663LjeL3QdKrU1w4Fee
+xSnL31hmoCY5R6MuJU4mq9qjBAOt1ssEO16IN5Smuyx3gkkEoEuGuDBXOBxQ+W63
+Yg66yhkj0AkodgF20kKjAjgDxGaUcuuWqSaM9LZlCH7PXkKM55/a3ticiGubcjAX
+xIEiuZ4Wu4WaFmyNfL0eg7TNvxbvNpYpEiR6gMntJtgCRChzPnXFadaWR2re4HRF
+uuuQ6VN8qb+GwokcX83hy5gq0v1RbWzSpC+LXnWgSkHEM0KgZuEanUAwh3Uksc1z
+hU1UKKD343EBgx5PPuTOOPe+DYPhT35E0cmQnvt+qO9eTyAbdZuGMaaO8Wq9kgJb
+bvLdrerU6I9M2f+2e9KVwNUITKRZgvEwdyTVD8NYjzZiYDTf6Z3bjhauiDjkaY00
+ro32BxYmkLOEUqcDdWclL+oyW0Pz0ClLDqJURRMOEDveCWRngoUC3G3DHDq/MqyJ
+SW3mlY6hE+H20G3y1WvlUVCvFeMg/oQ1M8BEN4NEIqten6bUsV0uNikOBla4clbo
+tPCb4D4C/aPQyxYcw2Gdmob7ru/7FuSeyQFRSYyURm2dWvbg52FK2LkCDQRaTqIM
+ARAAuMw8MVJ66I/XzvQLzuWqVgh1YGvez1dvUv2avud89RrHvs6H6SSqtVQSPbc5
+blgcInaolrJmi4NUFYs9SHGvv8SGaegoJaYlCrXhW4P7JiIEh8fnfQSQod+DYkaX
+/a/BIhokZ2Kn7czJmTKQvm2kEj+cObjMTiYYkCrqvKg4L8TM4cANm+F5YU8q/PlR
+wFCQeEO4Aldactekk4KdtH/T0op3Fe60sWjN0jAaj6a3q4m87ueuFfLRdCFlJuci
+hojWP+UKURZJxzRRfTrK08gOZHNi5qGk096lrVtEDOYr1CbJ7RyTf7snt148gwqG
+pHzB8mydk9siyhvcuAHue+fFWdVbrcbpUNM6HEd/B2S0RLkckP28I4HFu0QR525l
+keE1MCrDUkN9bDt/RmRSXheiyK0w/tErlrEjXpi8/nGyqPP32zpXinRcf4fTQceM
++36ZKqTh6OEZvVBib9MmeThD1EEFwcqHWhmJN3amnAcscS15TS5Tdsi/GNd723R4
+RIL+sbXMuVwKY9dBGXaTflGzla/UM+40z64KsSGbYdxlqo9vwHvKlqq4KMIPg3QU
+GW5z2nxEErsMIz/OnMFe04CgMIAfQ65J2ZOza/OLb18qHWcuLGNT/4KhOu+tikEn
+Q1gEhA9e+bscfTWECq/zn8KXEOR1q8CJTsowjp30AX9kTAsAEQEAAYkCPAQYAQgA
+JhYhBM5s0KiUgLG5/LmGmSdMZnEHcME1BQJaTqIMAhsMBQkHhh+AAAoJECdMZnEH
+cME1dYkP/2ngMu4KoPuJDVwn5ymATer1HMJ3P0IVG/WBlMiVyhGJdwq/3TF6MyIO
+9nizr3rmAcYhydPQl2pSinPqXyNj/gdV3WYIGj91oYTsTq4H8hkCaEl0bhHU1Ca8
+UBeauVuH9SC+mdx13oPkPsOV6hLuek+AfeGzlsR9D3jUvuLubXiDhAGPSOr+WAvs
+4qdMAfQlygNc9U6hZ8Dd3QevmtE7DpxlQcWQK866cplxtRK72CjTC+wYMY1GN+F4
+rgA7dwprIRT7PPrvBCrrUHIvnxLPTBWaUDj+hjSq/Lc0d1aZ3Hh0LqNZuQrQCCvh
+eHwSTKn7irh4H2SLqr4zVtJ7l62B+WwDbK1DhHDPEkkNxteaDXJPBqqrdq+XQFuK
+1nhC6P7Jw5akHWf4F4RVlsovZAMIWlYBhUUJnZZcQAcBcrawnniN7fU7KM8AYRtf
+RBfyCl+deRbcFbnX1+gom5QoZO7hnPF3CORWnjbYs72eJ/TBJggTsTw9lMiiWr3G
+ELXTcx9o28X521MWWLivuE1rdPVCroS7g2EsyuxHQa8Gbb3xjDpjv1NY2h7R0Et/
+oHx2Zf5qp9aHOILPYiPLyUXyx9CXYNqUb5ikGQEGw2zyP/qWkesWCHYB10aY25o/
+60wUYK114e6ORJvHtvVQ6TGAtNLuexEzSXpA3hzNM1hxpQWBVTgimQINBGEoR38B
+EADQwCtzc1RTMrd9ivB0BCujHZeJTVCyjL7ZZL5EpLpZhJU6wuqL5A/oWKyCoHi+
+rtA4F5rA7hFj/4779moZHFcNRSgljkWf+lJpOnzwK5UaC7cUrfSdAfGoIovos4Yz
+uzIP28OL5aek9WzVo+kEnTeL3uV+GFUBYIFG9tVI0L571RY9jqRbjwShMrNfACZc
+snQDVAuFmUIQ9L4kdqx+E+2fFRKkE+Qkw5AAwrdzh5ByMB+zocYeSaylRchVMmjt
+TC+1WxVAjJ1ZWs8LWh5W6ocRgEhoLWNLt9fqXiY7joVat/GF5ggybFxeMS9bI1Em
+vKqnRdfa5ir30HuQafy8LZG2Me6GvNnsGPMETUfHVQVUTB6MdAG9f3Io4BTOiQ3k
+N+A0ydm3KW3RdmLZY+dTSyi1IOK2u4b94JmGreDhXOAp6kDyKRKtzFEEGrK7IBoS
+NUqaLUU1ILJePOjkAX3vrck+PfomZImVEanNPcVpeboHiyP4yb7L2Jm25xfKlzmz
+Ker+ahLKhW1Cz3c6vvLnGe/+FxunFWzrTSCzgNSwb1o5Uyfl+WqdGs54mU62tFaT
+Iz2JdTodAC5AV2js76Pi5zq5kFEcFakpul4ZI3CteSkjADlGnEeJu+0rUKGvxlrB
+BSN7g2nb6Fb98Lghw1vbvpHeMjJseQ+2tvCrE8Yt4uJSAwARAQABtB1OYWJhcnVu
+IE5hZyA8bm5hZ0BhcGFjaGUub3JnPokCVAQTAQgAPhYhBJfKmIUU/IPQSaNvXMdW
+IXHW5EkjBQJhKEd/AhsDBQkHhh81BQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJ
+EMdWIXHW5EkjsZQP/jHy0y+3XChuTBM71S3yphbys7bFFGq89QqyCB6ye9qHw2DM
+3Jt3vDeyRBbnmj4Ybv3H89TDCUUk/n9ILJYWhHSyohacH1cXfX1P0ZPMJZGrdqL0
+IqER9wFcdaDDaBnP+ImeeSXlv1cscwuKPRVJ7EZqDEs2+LeMyQalqshy4Gaj5/yO
+Iam+NLTiYGBhCCK5ngBB79oRYPgVoviKstCHutuiP+ITbC8ZlUaRYpD/TfW8sLHQ
+27yO55Xl0/37HIVXLJYLpvqzSpL6EOwqvUpeykBejrJEjm4pl/kNB35VDBstvz+n
+e2owAyj9U7fiZeNtIjvzWoy/cTeWgeCliGHd/uUtjQ/HQlYvc7yCnnjRk2wphkvL
+ICOwHlX7VZiQbth/fHayt97/TEvNrZCGRDFIBrvQACmu+8K18eMjjdeo9cWp7nGI
+rqObqQD+UHnB7avvSYh98+XAu6B76unV0IdTe6w60tez6+4RUK4siFJLxe/fIfjF
+d+nqQ62XSycsKpnFXlaeSf1HdD9k4o/aX5AMGU+03lLNSdxBI+tSsLUjPJteSTZq
+Lk9foPxk6SVMO46+rP7BIcbTgZmp0Slav7X47AryXwqA8ngpDNRZHtxK75X1ZA7n
+u3rQXXz0peM54B2YJuU3TFhJiJ0igHn+E52cFHVq83ASKDa87hegAfetvR7UiQIz
+BBABCAAdFiEEzmzQqJSAsbn8uYaZJ0xmcQdwwTUFAmEoR8EACgkQJ0xmcQdwwTUN
+jhAAjaN9HoreHeO5HX2itm8dZvYlw4JuFO26wiScIo4mHNdE1S1NRktbhE6aqoOi
+1MWnEToQAh5a+Thi8IOJViA2vhQh+p4sCK6q3aVQqh98a8VFlptW14ZNbbs18rbs
+11xp8Uneo4jweHlzIQ3x9e33gqWGx+HVgol+KbOo+o+jzY4W9RS/PhMTi9PV/3gM
+MExfiMdN2rsUKfHH+Kv35XTRNKpkaDBIkdut9F5bS6jxY43XAHXVihMiRI7tGELC
+bZydri1kcs2KXGU0NxYfWmCTvZ48bwlPjHbAzhhEeax6nPUpmCO6/oX4q0neIrZM
+9WZ0ZSWho2EBBfCfzR6I/zEmv4KVDa4OBsaY4UsOmqt3R+u2IdpjhJWxsAeCS/Ea
+kqJDyMtyrzaMLnRJzZkZ2PxLmHMttNt54Sj6iH/qb3lNNWuDGBSOaCTLzw0Si7K6
+vzW8W40MYiLO9ajyEcOt5kEqLHkrduCG+Yy7NLFUljtmFVuaVwY2MZgw5hRhZmHL
+kKTC6Q6hm01mS0qcxp6qJXpXWuPNCEfQ9evAlbRqrlYQIT/0ZauYVcIdt0Yp3WGC
+mPnZ+C2CUs+sb/BzT2ZpO811FtdnYIyoYvJ0mWMCbx+gevSb8EaKAUwTzuyEIFTS
+tNh/Y7Ay0owb2Uz7LlBgVeD17/fbBypAOu4CIF4igloK5Ei5Ag0EYShHfwEQALbI
+iqdU4iFdyAPqX69eou2P7nqXFtY2H5+2F1kRuz4jrG+1lVG6GPO7BSiGYDa35+Vn
+OsV5pLFmJUXnDutw5jeRyrS6JydEB9j+hQHLqV4aHaT3Za4zYjCSYT9rpYRfMX28
+rZ2jrdBs0SXnzHlVMmp4x+kbEsEeoKvGZGKZgW5nbSkao9KsrYVsDzigRU7xfGcs
+vEfIboN8y4+PqvWmiY1wBd3FjJWvSI+bK2+V64NjeWjQM6CXf5i4VgXobNKWNUDO
+6224k9AGq26dyZdESBzLnJm9f3CSHIcna6pADJKpAhBuPg15txvncrvGCdtacBvl
+cyl9sbx/35gFWXpZxjSQa135iP9YmdvjPV6TmaANMTqIdXBZy+p/nJE/tLKZ1Q8j
+8PO/2R4Aqj8Sk1FT8f8vfkC/aqKYgIPOS+FRtw6JA61awCkFxNUpWv+YpUf/A1uA
+HesBaSHQI0JY+kwiE6CxOtoGfUUpiHaIEOltxkiLGV1nUxq65bk88MU7uC0lnM+o
+Rxk9II4daSbZA/jAOd4CGrfgacEQIcZMU5as18iyMiEEpu1JyPcr8LD6DgiIrHtF
+WsyoWWofdTwxAJH9u55ptwXtlSxGy6MRksBu6ubewocTn6DMuiV0RqcGtvw9D/zp
+FZLx21czpj0mM0Ma3ChAjHem9rkfOR1AF2csXeinABEBAAGJAjwEGAEIACYWIQSX
+ypiFFPyD0Emjb1zHViFx1uRJIwUCYShHfwIbDAUJB4YfNQAKCRDHViFx1uRJI6qM
+EACXiqwvuifzqSqzh6mZir071in5aJZfJF5Nk/SnsMwmEGNXxFJ6PxlIihp51xR5
+Wqk43gm9CNtFL12Eg5Vs3WU96gHyRd7Gs+em/QamuqoS8TNRtzsfEMPpUd7/+Zrh
+4PqfsDXKyfmq82j5BfKJw4VutmGAoC7aWkD6KQe4st3+zVzbWskoL7MGm/HhOoz2
+cvsBJBg3OGc2iIsLKT2RRP3iF7BOPdCazbaMHyFvimy736ZCyBYSTOhMb/CfzXDg
+rvxB8GMIQncmOrxE2EwgN1qsQNo+mf5R946HnUZuPsBOatPiL1/hkKYRf2SbokvB
+mabsDq1bDtL2yf6d6tVaU/yrS0JcUBO4qw7TvmplZCMxWiIQw4TjxRCHu0WkFIJW
+dq9W4yQK5k+f9pTDni/RznTQcqkd+3Y87m+dT8k3MrG1qabADv1rhFwXGwHTUNhw
+MGrAWVv/9T6OcnpqsGd+aTvAvgq9kbbBTJJBlUzAIN7R8K+F2lfpClvKjdcN1p+2
+ALKgBCdTBE/Hyu8bDrCUEnvNe+L0Fy0x/faQzBw3Uj6CN2sBl86onUlIccK1T/Az
+WkpgOKJn6mD0ijHQOVfTIfqnyaK+HXvMBa/lFW/QyKuY9Fpta9+zkfGNVK74mAXB
+m9Epf/15I6v1xt5EDsr9T87v6OCZ7oSwn1xPn0OPPwPOAQ==
+=KMx+
 -----END PGP PUBLIC KEY BLOCK-----
 pub   rsa4096 2018-09-01 [SC]
       D5C5C950D61898EDE8928820D6048392BDFB7797
diff --git a/LICENSE b/LICENSE
index d03810c..86ccd7d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -280,6 +280,8 @@ Apache Geode bundles the following files under the MIT License:
     Kelvin Luck
   - MooTools (http://mootools.net), Copyright (c) 2006-2015 Valerio
     Proietti, <http://mad4milk.net/>
+  - OrderStatisticTree (https://github.com/coderodde/OrderStatisticTree),
+    Copyright (c) 2021 Rodion Efremov
   - Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation
   - Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
     2015 Nathan Cahill
diff --git a/NOTICE b/NOTICE
index e005a2a..057522b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Geode
-Copyright 2016-2021 The Apache Software Foundation.
+Copyright 2016-2022 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -19,3 +19,7 @@ Copyright 2016 AddThis
 
 This product includes software developed by the MX4J
 project (http://mx4j.sourceforge.net).
+
+striped-executor-service
+Copyright 2000-2012 Heinz Max Kabutz
+From The Java Specialists' Newsletter (http://www.javaspecialists.eu)
diff --git a/README.md b/README.md
index 3582dd5..063caa1 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,22 @@
-[<img src="https://geode.apache.org/img/Apache_Geode_logo.png" align="center"/>](http://geode.apache.org)
+<div align="center">
+    
+[![Apache Geode logo](https://geode.apache.org/img/Apache_Geode_logo.png)](http://geode.apache.org)
 
-[![Build Status](https://concourse.apachegeode-ci.info/api/v1/teams/main/pipelines/apache-develop-main/jobs/Build/badge)](https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-develop-main) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.geode/geode-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.geod [...]
+[![Build Status](https://concourse.apachegeode-ci.info/api/v1/teams/main/pipelines/apache-develop-main/badge)](https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-develop-main) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.geode/geode-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.geode%22) [![ho [...]
+
+</div>
 
 ## Contents
 1. [Overview](#overview)
-2. [How to Get Apache Geode](#obtaining)
-3. [Main Concepts and Components](#concepts)
-4. [Location of Directions for Building from Source](#building)
-5. [Geode in 5 minutes](#started)
-6. [Application Development](#development)
-7. [Documentation](https://geode.apache.org/docs/)
-8. [Wiki](https://cwiki.apache.org/confluence/display/GEODE/Index)
-9. [How to Contribute?](https://cwiki.apache.org/confluence/display/GEODE/How+to+Contribute)
-10. [Export Control](#export)
+1. [How to Get Apache Geode](#obtaining)
+1. [Main Concepts and Components](#concepts)
+1. [Location of Directions for Building from Source](#building)
+1. [Geode in 5 minutes](#started)
+1. [Application Development](#development)
+1. [Documentation](https://geode.apache.org/docs/)
+1. [Wiki](https://cwiki.apache.org/confluence/display/GEODE/Index)
+1. [How to Contribute](https://cwiki.apache.org/confluence/display/GEODE/How+to+Contribute)
+1. [Export Control](#export)
 
 ## <a name="overview"></a>Overview
 
@@ -40,7 +44,7 @@ latency and 24x7 availability requirements.
 You can download Apache Geode from the
 [website](https://geode.apache.org/releases/), run a Docker
 [image](https://hub.docker.com/r/apachegeode/geode/), or install with
-[homebrew](https://formulae.brew.sh/formula/apache-geode) on OSX. Application developers
+[Homebrew](https://formulae.brew.sh/formula/apache-geode) on OSX. Application developers
 can load dependencies from [Maven
 Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.geode%22).
 
diff --git a/boms/build.gradle b/boms/build.gradle
deleted file mode 100644
index ae6f28c..0000000
--- a/boms/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 1dc45d6..927e660 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -16,11 +16,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-  <!-- This module was also published with a richer model, Gradle metadata,  -->
-  <!-- which should be used instead. Do not delete the following line which  -->
-  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
-  <!-- that they should prefer consuming it instead. -->
-  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
   <artifactId>geode-all-bom</artifactId>
@@ -55,17 +50,17 @@
       <dependency>
         <groupId>com.arakelian</groupId>
         <artifactId>java-jq</artifactId>
-        <version>1.1.0</version>
+        <version>1.3.0</version>
       </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.7.8</version>
+        <version>2.7.9</version>
       </dependency>
       <dependency>
         <groupId>com.github.davidmoten</groupId>
         <artifactId>geo</artifactId>
-        <version>0.7.7</version>
+        <version>0.8.0</version>
       </dependency>
       <dependency>
         <groupId>com.github.stefanbirkner</groupId>
@@ -85,7 +80,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>30.1.1-jre</version>
+        <version>31.0.1-jre</version>
       </dependency>
       <dependency>
         <groupId>com.healthmarketscience.rmiio</groupId>
@@ -165,7 +160,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.8.0</version>
+        <version>2.11.0</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
@@ -185,27 +180,22 @@
       <dependency>
         <groupId>io.github.classgraph</groupId>
         <artifactId>classgraph</artifactId>
-        <version>4.8.104</version>
+        <version>4.8.138</version>
       </dependency>
       <dependency>
         <groupId>io.github.resilience4j</groupId>
         <artifactId>resilience4j-retry</artifactId>
-        <version>1.7.0</version>
+        <version>1.7.1</version>
       </dependency>
       <dependency>
         <groupId>io.lettuce</groupId>
         <artifactId>lettuce-core</artifactId>
-        <version>6.1.1.RELEASE</version>
+        <version>6.1.6.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
-        <version>1.6.6</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-all</artifactId>
-        <version>4.1.59.Final</version>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>io.swagger</groupId>
@@ -215,7 +205,7 @@
       <dependency>
         <groupId>it.unimi.dsi</groupId>
         <artifactId>fastutil</artifactId>
-        <version>8.5.4</version>
+        <version>8.5.8</version>
       </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>
@@ -275,17 +265,17 @@
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
-        <version>5.8.0</version>
+        <version>5.10.0</version>
       </dependency>
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna-platform</artifactId>
-        <version>5.8.0</version>
+        <version>5.10.0</version>
       </dependency>
       <dependency>
         <groupId>net.minidev</groupId>
         <artifactId>json-smart</artifactId>
-        <version>2.3.1</version>
+        <version>2.4.7</version>
       </dependency>
       <dependency>
         <groupId>net.openhft</groupId>
@@ -300,12 +290,12 @@
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-java</artifactId>
-        <version>6.33.0</version>
+        <version>6.42.0</version>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-test</artifactId>
-        <version>6.33.0</version>
+        <version>6.42.0</version>
       </dependency>
       <dependency>
         <groupId>net.spy</groupId>
@@ -340,42 +330,42 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.14</version>
+        <version>4.4.15</version>
       </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>
-        <version>1.7.1</version>
+        <version>1.8.0</version>
       </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.19.0</version>
+        <version>3.22.0</version>
       </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
-        <version>4.0.3</version>
+        <version>4.1.1</version>
       </dependency>
       <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
-        <version>1.68</version>
+        <groupId>org.buildobjects</groupId>
+        <artifactId>jproc</artifactId>
+        <version>2.8.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-core-uberjar</artifactId>
-        <version>1.9.3</version>
+        <version>1.9.9</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.4.40.v20210413</version>
+        <version>9.4.44.v20210927</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-webapp</artifactId>
-        <version>9.4.40.v20210413</version>
+        <version>9.4.44.v20210927</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
@@ -398,6 +388,11 @@
         <version>1.11.0.Final</version>
       </dependency>
       <dependency>
+        <groupId>org.jctools</groupId>
+        <artifactId>jctools-core</artifactId>
+        <version>3.3.0</version>
+      </dependency>
+      <dependency>
         <groupId>org.jgroups</groupId>
         <artifactId>jgroups</artifactId>
         <version>3.6.14.Final</version>
@@ -405,7 +400,12 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.9.0</version>
+        <version>4.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-junit-jupiter</artifactId>
+        <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
@@ -415,7 +415,7 @@
       <dependency>
         <groupId>org.openjdk.jmh</groupId>
         <artifactId>jmh-core</artifactId>
-        <version>1.26</version>
+        <version>1.32</version>
       </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>
@@ -430,17 +430,17 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.30</version>
+        <version>1.7.32</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.hateoas</groupId>
         <artifactId>spring-hateoas</artifactId>
-        <version>1.3.0</version>
+        <version>1.4.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.ldap</groupId>
         <artifactId>spring-ldap-core</artifactId>
-        <version>2.3.2.RELEASE</version>
+        <version>2.3.5.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.shell</groupId>
@@ -460,7 +460,7 @@
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>3.5.2</version>
+        <version>3.6.3</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -468,39 +468,49 @@
         <version>2.12.0</version>
       </dependency>
       <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.4.01</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit-pioneer</groupId>
+        <artifactId>junit-pioneer</artifactId>
+        <version>1.5.0</version>
+      </dependency>
+      <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>2.12.3</version>
+        <version>2.13.1</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.12.3</version>
+        <version>2.13.1</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.12.3</version>
+        <version>2.13.1</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-joda</artifactId>
-        <version>2.12.3</version>
+        <version>2.13.1</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>2.12.3</version>
+        <version>2.13.1</version>
       </dependency>
       <dependency>
         <groupId>com.jayway.jsonpath</groupId>
         <artifactId>json-path-assert</artifactId>
-        <version>2.5.0</version>
+        <version>2.7.0</version>
       </dependency>
       <dependency>
         <groupId>com.jayway.jsonpath</groupId>
         <artifactId>json-path</artifactId>
-        <version>2.5.0</version>
+        <version>2.7.0</version>
       </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
@@ -535,27 +545,27 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>2.14.1</version>
+        <version>2.17.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.14.1</version>
+        <version>2.17.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jcl</artifactId>
-        <version>2.14.1</version>
+        <version>2.17.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jul</artifactId>
-        <version>2.14.1</version>
+        <version>2.17.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
-        <version>2.14.1</version>
+        <version>2.17.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.lucene</groupId>
@@ -588,6 +598,36 @@
         <version>2.2</version>
       </dependency>
       <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>5.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>5.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>5.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>5.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-codec-redis</artifactId>
+        <version>4.1.74.Final</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-handler</artifactId>
+        <version>4.1.74.Final</version>
+      </dependency>
+      <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-api</artifactId>
         <version>3.141.59</version>
@@ -610,128 +650,122 @@
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-config</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-core</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-ldap</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-test</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-web</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-oauth2-core</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-oauth2-client</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-oauth2-jose</artifactId>
-        <version>5.4.6</version>
+        <version>5.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aspects</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-oxm</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
-        <version>5.3.6</version>
+        <version>5.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
-        <version>2.4.5</version>
+        <version>2.6.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jetty</artifactId>
-        <version>2.4.5</version>
+        <version>2.6.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
-        <version>2.4.5</version>
+        <version>2.6.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
-        <version>2.4.5</version>
+        <version>2.6.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.session</groupId>
         <artifactId>spring-session-data-redis</artifactId>
-        <version>2.4.3</version>
+        <version>2.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.jetbrains</groupId>
         <artifactId>annotations</artifactId>
-        <version>20.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geode</groupId>
-        <artifactId>geode-apis-compatible-with-redis</artifactId>
-        <version>${version}</version>
-        <scope>compile</scope>
+        <version>23.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
@@ -771,6 +805,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
+        <artifactId>geode-for-redis</artifactId>
+        <version>${version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
         <artifactId>geode-gfsh</artifactId>
         <version>${version}</version>
         <scope>compile</scope>
@@ -855,6 +895,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
+        <artifactId>geode-server-all</artifactId>
+        <version>${version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
         <artifactId>geode-tcp-server</artifactId>
         <version>${version}</version>
         <scope>compile</scope>
diff --git a/boms/geode-client-bom/build.gradle b/boms/geode-client-bom/build.gradle
index e89fdfa..f012b47 100644
--- a/boms/geode-client-bom/build.gradle
+++ b/boms/geode-client-bom/build.gradle
@@ -42,4 +42,3 @@ publishing {
     }
   }
 }
-
diff --git a/build.gradle b/build.gradle
index 349f664..839231d 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,14 +21,14 @@ plugins {
   id "base"
   id "idea"
   id "eclipse"
-  id "com.diffplug.spotless" version "5.11.1" apply false
-  id "com.github.ben-manes.versions" version "0.38.0" apply false
-  id "nebula.lint" version "16.17.1" apply false
-  id "com.palantir.docker" version "0.26.0" apply false
+  id "com.diffplug.spotless" version "6.2.2" apply false
+  id "com.github.ben-manes.versions" version "0.42.0" apply false
+  id "nebula.lint" version "17.6.1" apply false
+  id "com.palantir.docker" version "0.32.0" apply false
   id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false
-  id "org.ajoberstar.grgit" version "4.1.0" apply false
+  id "org.ajoberstar.grgit" version "4.1.1" apply false
   id "org.nosphere.apache.rat" version "0.7.0" apply false
-  id "org.sonarqube" version "3.1.1" apply false
+  id "org.sonarqube" version "3.3" apply false
   id "me.champeau.gradle.japicmp" apply false // Version defined in buildSrc/build.gradle
   id 'me.champeau.gradle.jmh' version '0.5.3' apply false
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 1c02ade..f811c17 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -22,9 +22,7 @@ plugins {
 
 repositories {
   mavenCentral()
-  maven {
-    url "https://plugins.gradle.org/m2/"
-  }
+  gradlePluginPortal()
 }
 
 dependencies {
@@ -33,12 +31,14 @@ dependencies {
   }
   implementation(gradleApi())
   implementation('org.apache.commons:commons-lang3:3.12.0')
-  implementation('org.apache.maven:maven-artifact:3.6.3')
-  implementation('com.google.guava:guava:30.1.1-jre')
-  implementation('com.github.docker-java:docker-java:3.2.7')
-  implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9')
+  implementation('org.apache.maven:maven-artifact:3.8.1')
+  implementation('com.google.guava:guava:31.0.1-jre')
+  implementation('me.champeau.gradle:japicmp-gradle-plugin:0.3.0')
   implementation('junit:junit:4.13.2')
 
+  // Pin jgit to 5.13.0 to fix grgit having open dependencies on jgit, which rolled to java 11 with version 6.
+  runtimeOnly('org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r')
+
   testAnnotationProcessor(this.project)
 }
 
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/PasswordDialog.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/PasswordDialog.groovy
index bcd2243..b54affb 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/PasswordDialog.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/PasswordDialog.groovy
@@ -30,8 +30,8 @@ class PasswordDialog {
         label(text: prompt)
         input = passwordField()
         button(defaultButton: true, text: 'OK', actionPerformed: {
-          password = input.password.toString(); // Set pass variable to value of input field
-          dispose(); // Close dialog
+          password = input.password.toString() // Set pass variable to value of input field
+          dispose() // Close dialog
         })
       }
       }
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
index 8cd0d9b..4fb2cc4 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
@@ -16,18 +16,18 @@
  *
  */
 
-package org.apache.geode.gradle;
+package org.apache.geode.gradle
 
-public class TestPropertiesWriter {
-  public static void writeTestProperties(File parent, String name) {
-    Properties props = new Properties();
-    props.setProperty('log-level', 'config');
-    File propsFile = new File(testResultsDir(parent, name), 'gemfire.properties');
-    BufferedWriter writer = propsFile.newWriter();
-    props.store(writer, 'Autogenerated Gemfire properties');
+class TestPropertiesWriter {
+  static void writeTestProperties(File parent, String name) {
+    Properties props = new Properties()
+      props.setProperty('log-level', 'config')
+      File propsFile = new File(testResultsDir(parent, name), 'gemfire.properties')
+      BufferedWriter writer = propsFile.newWriter()
+      props.store(writer, 'Autogenerated Gemfire properties')
   }
 
-  public static File testResultsDir(File parent, String name) {
+    static File testResultsDir(File parent, String name) {
    return new File(parent, name)
   }
 }
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/AllowMajorBreakingChanges.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/AllowMajorBreakingChanges.groovy
index bf79658..c0f8f26 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/AllowMajorBreakingChanges.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/AllowMajorBreakingChanges.groovy
@@ -25,7 +25,7 @@ import me.champeau.gradle.japicmp.report.Severity
 class AllowMajorBreakingChanges extends AbstractRecordingSeenMembers {
   @Override
   Violation maybeAddViolation(final JApiCompatibility member) {
-    if (!member.isBinaryCompatible()) {
+    if (!member.isBinaryCompatible() || !member.isSourceCompatible()) {
       return Violation.notBinaryCompatible(member, Severity.warning)
     } else {
       return null
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeApiRegressionRule.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeApiRegressionRule.groovy
index dab956e..1f2af83 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeApiRegressionRule.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeApiRegressionRule.groovy
@@ -25,7 +25,7 @@ import me.champeau.gradle.japicmp.report.stdrules.AbstractRecordingSeenMembers
 class GeodeApiRegressionRule extends AbstractRecordingSeenMembers {
   private final Map<String, String> acceptedRegressions
 
-  public GeodeApiRegressionRule() {
+  GeodeApiRegressionRule() {
     def jsonSlurper = new JsonSlurper()
     acceptedRegressions = jsonSlurper.parse(getClass().getResource('/japicmp_exceptions.json').openStream()) as Map
   }
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeSpiRegressionRule.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeSpiRegressionRule.groovy
new file mode 100644
index 0000000..68c137d
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/GeodeSpiRegressionRule.groovy
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geode.gradle.japicmp
+
+import groovy.json.JsonSlurper
+import japicmp.model.JApiCompatibility
+import me.champeau.gradle.japicmp.report.Violation
+import me.champeau.gradle.japicmp.report.stdrules.AbstractRecordingSeenMembers
+
+class GeodeSpiRegressionRule extends AbstractRecordingSeenMembers {
+  private final Map<String, String> acceptedRegressions
+
+  GeodeSpiRegressionRule() {
+    def jsonSlurper = new JsonSlurper()
+    acceptedRegressions = jsonSlurper.parse(getClass().getResource('/japicmp_exceptions.json').openStream()) as Map
+  }
+
+  @Override
+  Violation maybeAddViolation(final JApiCompatibility member) {
+    if (!member.isSourceCompatible()) {
+      def exception = acceptedRegressions[Violation.describe(member)]
+      if (exception) {
+        Violation.accept(member, exception)
+      } else {
+        println("Correct, or add exception for: [${Violation.describe(member)}]")
+        Violation.error(member, "Is not source compatible")
+      }
+    }
+  }
+}
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/ParentIsExperimental.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/ParentIsExperimental.groovy
index 171ea4c..2c9611e 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/ParentIsExperimental.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/japicmp/ParentIsExperimental.groovy
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.geode.gradle.japicmp;
+package org.apache.geode.gradle.japicmp
 
 import me.champeau.gradle.japicmp.report.Violation
 import me.champeau.gradle.japicmp.report.stdrules.AbstractRecordingSeenMembers
@@ -28,9 +28,9 @@ import japicmp.model.JApiCompatibility
 
 class ParentIsExperimental extends AbstractRecordingSeenMembers {
   @Override
-  public Violation maybeAddViolation(final JApiCompatibility member) {
+  Violation maybeAddViolation(final JApiCompatibility member) {
     boolean isExperimental = true
-    if (!member.isBinaryCompatible()) {
+    if (!member.isBinaryCompatible() || !member.isSourceCompatible()) {
       if (member instanceof JApiMethod || member instanceof JApiConstructor) {
         isExperimental = isClassExperimental(member.jApiClass)
       } else if (member instanceof JApiClass) {
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index fbc7a94..2633533 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -34,20 +34,20 @@ class DependencyConstraints implements Plugin<Project> {
     // These version numbers are consumed by :geode-modules-assembly:distAppServer filtering
     // Some of these are referenced below as well
     deps.put("antlr.version", "2.7.7")
-    deps.put("commons-io.version", "2.8.0")
+    deps.put("commons-io.version", "2.11.0")
     deps.put("commons-lang3.version", "3.12.0")
     deps.put("commons-validator.version", "1.7")
-    deps.put("fastutil.version", "8.5.4")
+    deps.put("fastutil.version", "8.5.8")
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
-    deps.put("log4j.version", "2.14.1")
-    deps.put("micrometer.version", "1.6.6")
-    deps.put("shiro.version", "1.7.1")
-    deps.put("slf4j-api.version", "1.7.30")
+    deps.put("log4j.version", "2.17.1")
+    deps.put("micrometer.version", "1.8.2")
+    deps.put("shiro.version", "1.8.0")
+    deps.put("slf4j-api.version", "1.7.32")
     deps.put("jboss-modules.version", "1.11.0.Final")
-    deps.put("jackson.version", "2.12.3")
+    deps.put("jackson.version", "2.13.1")
     deps.put("springshell.version", "1.2.0.RELEASE")
-    deps.put("springframework.version", "5.3.6")
+    deps.put("springframework.version", "5.3.15")
 
     // These version numbers are used in testing various versions of tomcat and are consumed explicitly
     // in will be called explicitly in the relevant extensions module, and respective configurations
@@ -55,17 +55,22 @@ class DependencyConstraints implements Plugin<Project> {
     // specifying @zip in a dependency, the manner in which we consume them in custom configurations.
     // This would possibly be corrected if they were proper source sets.
     deps.put("tomcat6.version", "6.0.37")
-    deps.put("tomcat7.version", "7.0.108")
-    deps.put("tomcat8.version", "8.5.65")
-    deps.put("tomcat9.version", "9.0.45")
+    deps.put("tomcat7.version", "7.0.109")
+    deps.put("tomcat8.version", "8.5.66")
+    deps.put("tomcat9.version", "9.0.58")
 
     // The jetty version is also hard-coded in geode-assembly:test
     // at o.a.g.sessions.tests.GenericAppServerInstall.java
-    deps.put("jetty.version", "9.4.40.v20210413")
+    deps.put("jetty.version", "9.4.44.v20210927")
 
     // These versions are referenced in test.gradle, which is aggressively injected into all projects.
     deps.put("junit.version", "4.13.2")
+    deps.put("junit-jupiter.version", "5.8.2")
     deps.put("cglib.version", "3.3.0")
+
+    // This old version is for geode-assembly:acceptanceTest for gradle-in-gradle tests. As noted there, do not let
+    // this version be the same as the geode build itself.
+    deps.put("gradle-tooling-api.version", "5.1.1")
     return deps
   }
 
@@ -83,13 +88,13 @@ class DependencyConstraints implements Plugin<Project> {
         // informal, inter-group dependencySet
         api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
         api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
-        api(group: 'com.arakelian', name: 'java-jq', version: '1.1.0')
-        api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.8')
-        api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.7')
+        api(group: 'com.arakelian', name: 'java-jq', version: '1.3.0')
+        api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.9')
+        api(group: 'com.github.davidmoten', name: 'geo', version: '0.8.0')
         api(group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0')
         api(group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1')
         api(group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2')
-        api(group: 'com.google.guava', name: 'guava', version: '30.1.1-jre')
+        api(group: 'com.google.guava', name: 'guava', version: '31.0.1-jre')
         api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
         api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.6')
         api(group: 'com.nimbusds', name:'nimbus-jose-jwt', version:'8.11')
@@ -111,11 +116,10 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1')
         api(group: 'commons-validator', name: 'commons-validator', version: get('commons-validator.version'))
         // Careful when upgrading this dependency: see GEODE-7370 and GEODE-8150.
-        api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.104')
-        api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.0')
-        api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.1.RELEASE')
+        api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.138')
+        api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.1')
+        api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.6.RELEASE')
         api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
-        api(group: 'io.netty', name: 'netty-all', version: '4.1.59.Final')
         api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
         api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version'))
         api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2')
@@ -129,45 +133,49 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'junit', name: 'junit', version: get('junit.version'))
         api(group: 'mx4j', name: 'mx4j-tools', version: '3.0.1')
         api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
-        api(group: 'net.java.dev.jna', name: 'jna', version: '5.8.0')
-        api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0')
-        api(group: 'net.minidev', name: 'json-smart', version: '2.3.1')
+        api(group: 'net.java.dev.jna', name: 'jna', version: '5.10.0')
+        api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.10.0')
+        api(group: 'net.minidev', name: 'json-smart', version: '2.4.7')
         api(group: 'net.openhft', name: 'compiler', version: '2.4.1')
         api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.33.0')
-        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.33.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.42.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.42.0')
         api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
         api(group: 'org.apache.bcel', name: 'bcel', version: '6.5.0')
         api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))
         api(group: 'org.apache.commons', name: 'commons-text', version: 1.9)
         api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
         api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13')
-        api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.14')
+        api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.15')
         api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
-        api(group: 'org.assertj', name: 'assertj-core', version: '3.19.0')
-        api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
-        api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.68')
-        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.3')
+        api(group: 'org.assertj', name: 'assertj-core', version: '3.22.0')
+        api(group: 'org.awaitility', name: 'awaitility', version: '4.1.1')
+        api(group: 'org.buildobjects', name: 'jproc', version: '2.8.0')
+        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.9')
         api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
         api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
         api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
         api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
         api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
         api(group: 'org.jboss.modules', name: 'jboss-modules', version: get('jboss-modules.version'))
+        api(group: 'org.jctools', name: 'jctools-core', version: '3.3.0')
         api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))
-        api(group: 'org.mockito', name: 'mockito-core', version: '3.9.0')
+        api(group: 'org.mockito', name: 'mockito-core', version: '4.2.0')
+        api(group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.2.0')
         api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
-        api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.26')
+        api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.32')
         api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
         api(group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0')
         api(group: 'org.slf4j', name: 'slf4j-api', version: get('slf4j-api.version'))
-        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.3.0')
-        api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.2.RELEASE')
+        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.4.1')
+        api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.5.RELEASE')
         api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
         api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3')
         api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
-        api(group: 'redis.clients', name: 'jedis', version: '3.5.2')
+        api(group: 'redis.clients', name: 'jedis', version: '3.6.3')
         api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
+        api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')
+        api(group: 'org.junit-pioneer', name: 'junit-pioneer', version: '1.5.0')
       }
     }
 
@@ -182,7 +190,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('jackson-datatype-jsr310')
     }
 
-    dependencySet(group: 'com.jayway.jsonpath', version: '2.5.0') {
+    dependencySet(group: 'com.jayway.jsonpath', version: '2.7.0') {
       entry('json-path-assert')
       entry('json-path')
     }
@@ -222,6 +230,21 @@ class DependencyConstraints implements Plugin<Project> {
       entry('hamcrest')
     }
 
+    dependencySet(group: 'org.junit.jupiter', version: get('junit-jupiter.version')) {
+      entry('junit-jupiter-api')
+      entry('junit-jupiter-params')
+      entry('junit-jupiter-engine')
+    }
+
+    dependencySet(group: 'org.junit.vintage', version: get('junit-jupiter.version')) {
+      entry('junit-vintage-engine')
+    }
+
+    dependencySet(group: 'io.netty', version: '4.1.74.Final') {
+      entry('netty-codec-redis')
+      entry('netty-handler')
+    }
+
     dependencySet(group: 'org.seleniumhq.selenium', version: '3.141.59') {
       entry('selenium-api')
       entry('selenium-chrome-driver')
@@ -229,7 +252,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('selenium-support')
     }
 
-    dependencySet(group: 'org.springframework.security', version: '5.4.6') {
+    dependencySet(group: 'org.springframework.security', version: '5.6.1') {
       entry('spring-security-config')
       entry('spring-security-core')
       entry('spring-security-ldap')
@@ -253,18 +276,18 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-webmvc')
     }
 
-    dependencySet(group: 'org.springframework.boot', version: '2.4.5') {
+    dependencySet(group: 'org.springframework.boot', version: '2.6.3') {
       entry('spring-boot-starter')
       entry('spring-boot-starter-jetty')
       entry('spring-boot-starter-web')
       entry('spring-boot-starter-data-redis')
     }
 
-    dependencySet(group: 'org.springframework.session', version: '2.4.3') {
+    dependencySet(group: 'org.springframework.session', version: '2.6.1') {
       entry('spring-session-data-redis')
     }
 
-    dependencySet(group: 'org.jetbrains', version: '20.1.0') {
+    dependencySet(group: 'org.jetbrains', version: '23.0.0') {
       entry('annotations')
     }
 
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/dockerized/DockerTestWorkerConfig.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/dockerized/DockerTestWorkerConfig.groovy
deleted file mode 100644
index 61cca06..0000000
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/dockerized/DockerTestWorkerConfig.groovy
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.gradle.testing.dockerized
-
-import org.gradle.api.Project
-
-class DockerTestWorkerConfig {
-    static long durationWarningThreshold = 60_000
-    String image
-    String javaHome
-    String localUserID
-    String name
-    int timeoutMillis = 300_000
-    String user
-    Map<String, String> volumes = new HashMap<>()
-
-    DockerTestWorkerConfig(Project project) {
-        name = project.path
-        image = project.dunitDockerImage
-        user = project.dunitDockerUser
-
-        if (project.hasProperty('dunitDockerJVM') && !project.dunitDockerJVM.trim().isEmpty()) {
-            javaHome = project.dunitDockerJVM as String
-        } else if (project.hasProperty('testJVM') && !project.testJVM.trim().isEmpty()) {
-            javaHome = project.testJVM as String
-        }
-
-        // Mount the user's Gradle home dir, the Geode project root directory, and any
-        // user-specified volumes.
-        def gradleUserHomeDir = project.gradle.startParameter.gradleUserHomeDir.getAbsolutePath() as String
-        def geodeDir = new File(System.getenv('PWD')).getCanonicalPath()
-        volumes = [(geodeDir)         : geodeDir,
-                   (gradleUserHomeDir): gradleUserHomeDir]
-
-        if (project.hasProperty('dunitDockerVolumes')) {
-            volumes.putAll(project.dunitDockerVolumes)
-        }
-
-        if (project.hasProperty("dunitDockerTimeout")) {
-            timeoutMillis = Integer.parseUnsignedInt(project.dunitDockerTimeout)
-        }
-
-        // Unfortunately this snippet of code is here and is required by
-        // dev-tools/docker/base/entrypoint.sh. This allows preserving the outer user inside the
-        // running container. Required for Jenkins and other environments. There doesn't seem to be
-        // a way to pass this environment variable in from a Jenkins Gradle job.
-        if (System.env['LOCAL_USER_ID'] == null) {
-            def username = System.getProperty("user.name")
-            localUserID = ['id', '-u', username].execute().text.trim() as String
-        }
-    }
-
-    /**
-     * Adjust the process builder's command and environment to run in a Docker container.
-     */
-    def dockerize(processBuilder) {
-        def command = processBuilder.command()
-        def environment = processBuilder.environment()
-
-        // The JAVA_HOME and PATH environment variables set by Gradle are meaningless inside a
-        // Docker container. Remove them.
-        if (environment['JAVA_HOME']) {
-            environment.remove 'JAVA_HOME'
-            environment['JAVA_HOME_REMOVED'] = ""
-        }
-        if (environment['PATH']) {
-            environment.remove 'PATH'
-            environment['PATH_REMOVED'] = ""
-        }
-
-        if (javaHome) {
-            environment['JAVA_HOME'] = javaHome
-            command.set(0, "${javaHome}/bin/java" as String)
-        }
-
-        if (localUserID) {
-            environment['LOCAL_USER_ID'] = localUserID
-        }
-    }
-}
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/dockerized/DockerizedTestPlugin.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/dockerized/DockerizedTestPlugin.groovy
deleted file mode 100644
index 6f7c570..0000000
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/dockerized/DockerizedTestPlugin.groovy
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.gradle.testing.dockerized
-
-
-import org.apache.geode.gradle.testing.Executers
-import org.apache.geode.gradle.testing.Workers
-import org.apache.geode.gradle.testing.isolation.WorkingDirectoryIsolator
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.tasks.testing.Test
-import org.gradle.internal.remote.MessagingServer
-import org.gradle.internal.remote.internal.inet.TcpIncomingConnector
-import org.gradle.process.internal.worker.WorkerProcessFactory
-
-import javax.inject.Inject
-
-/**
- * Extends each test task with a configuration that it can use to launch its test workers in Docker
- * containers. The <Geode project root>/gradle/multi-process-test.gradle file defines which test
- * tasks actually apply the configuration to run test workers.
- */
-class DockerizedTestPlugin implements Plugin<Project> {
-    /**
-     * A custom {@link MessagingServer} that supports communication between Gradle and processes
-     * running in Docker containers.
-     */
-    def static dockerMessagingServer
-    /**
-     * The singleton {@link MessagingServer} created by Gradle. This plugin borrows the server's
-     * internal components to build a custom {@code MessagingServer} that can communicate with
-     * processes running in Docker containers.
-     */
-    def static gradleMessagingServer
-    /**
-     * The singleton {@link WorkerProcessFactory} created by Gradle. This plugin borrows the
-     * factory's internal components to build a custom {@code WorkerProcessFactory} that launches
-     * processes in Docker containers.
-     */
-    def static gradleWorkerProcessFactory
-
-    /**
-     * The injected values are singletons. Gradle injects the same instances into each instance of
-     * this plugin.
-     * <p>
-     * CAVEAT: The types of these parameters are declared internal by Gradle v6.8.3. Future
-     * versions of Gradle may not include these types, or may change their implementation.
-     * <p>
-     * CAVEAT: The Gradle v6.8.3 documentation does not list these types among the services that
-     * Gradle will inject into plugins. Future versions of Gradle may not inject these values.
-     */
-    @Inject
-    DockerizedTestPlugin(MessagingServer gradleMessagingServer,
-                         WorkerProcessFactory gradleWorkerProcessFactory) {
-        initializeGradleWorkerProcessFactory(gradleWorkerProcessFactory)
-        initializeGradleMessagingServer(gradleMessagingServer)
-    }
-
-    @Override
-    void apply(Project project) {
-        if (!project.hasProperty('parallelDunit')) {
-            return
-        }
-
-        initializeMessagingServer()
-
-        def dockerTestWorkerConfig = new DockerTestWorkerConfig(project)
-        def dockerProcessLauncher = new DockerProcessLauncher(dockerTestWorkerConfig, new WorkingDirectoryIsolator())
-        def dockerWorkerProcessFactory = Workers.createWorkerProcessFactory(
-                gradleWorkerProcessFactory,
-                dockerProcessLauncher,
-                dockerMessagingServer)
-
-        def useDockerTestWorker = {
-            it.doFirst {
-                testExecuter = Executers.withFactory(it, dockerWorkerProcessFactory)
-            }
-        }
-
-        project.tasks.withType(Test).each(useDockerTestWorker)
-        project.tasks.whenTaskAdded() {
-            if (it instanceof Test) {
-                it.configure(useDockerTestWorker)
-            }
-        }
-    }
-
-    synchronized static initializeGradleMessagingServer(server) {
-        if (!gradleMessagingServer) {
-            gradleMessagingServer = server
-        }
-    }
-
-    synchronized static void initializeGradleWorkerProcessFactory(factory) {
-        if (!gradleWorkerProcessFactory) {
-            gradleWorkerProcessFactory = factory
-        }
-    }
-
-    synchronized static void initializeMessagingServer() {
-        if (dockerMessagingServer) {
-            return
-        }
-
-        def gradleConnector = gradleMessagingServer.connector
-        def gradleExecutorFactory = gradleConnector.executorFactory
-        def gradleIdGenerator = gradleConnector.idGenerator
-
-        /**
-         * Use a custom {@link WildcardBindingInetAddressFactory} to allow connections from
-         * processes in Docker containers.
-         */
-        def wildcardAddressFactory = new WildcardBindingInetAddressFactory()
-        def dockerConnector = new TcpIncomingConnector(
-                gradleExecutorFactory,
-                wildcardAddressFactory,
-                gradleIdGenerator
-        )
-        /**
-         * Use a custom {@link DockerMessagingServer} that yields connection addresses usable
-         * by processes in Docker containers.
-         */
-        dockerMessagingServer = new DockerMessagingServer(dockerConnector, gradleExecutorFactory)
-    }
-}
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/isolation/IsolatedTestPlugin.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/isolation/IsolatedTestPlugin.groovy
new file mode 100644
index 0000000..10769bc
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/isolation/IsolatedTestPlugin.groovy
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+package org.apache.geode.gradle.testing.isolation
+
+import org.apache.geode.gradle.testing.Executers
+import org.apache.geode.gradle.testing.Workers
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
+import org.gradle.internal.remote.MessagingServer
+import org.gradle.process.internal.worker.WorkerProcessFactory
+
+import javax.inject.Inject
+
+/**
+ * Configures isolated test tasks to launch each test worker with a distinct range of available
+ * ports. A test task is an isolated test task if it has an {@code isolatedTest} property.
+ */
+class IsolatedTestPlugin implements Plugin<Project> {
+    static def gradleWorkerProcessFactory
+    static def gradleMessagingServer
+    static def portRangeWorkerProcessFactory
+
+    @Inject
+    IsolatedTestPlugin(MessagingServer gradleMessagingServer,
+                       WorkerProcessFactory gradleWorkerProcessFactory) {
+        initializeGradleWorkerProcessFactory(gradleWorkerProcessFactory)
+        initializeGradleMessagingServer(gradleMessagingServer)
+    }
+
+    @Override
+    void apply(Project project) {
+        initializePortRangeWorkerProcessFactory(project.gradle.startParameter.maxWorkerCount)
+
+        def usePortRangeTestWorker = {
+            if (!it.hasProperty('isolatedTest')) {
+                return
+            }
+            it.doFirst {
+                testExecuter = Executers.withFactory(it, portRangeWorkerProcessFactory)
+            }
+        }
+
+        project.tasks.withType(Test).each(usePortRangeTestWorker)
+        project.tasks.whenTaskAdded() {
+            if (it instanceof Test) {
+                it.configure(usePortRangeTestWorker)
+            }
+        }
+    }
+
+    synchronized static initializePortRangeWorkerProcessFactory(int partitionCount) {
+        if (portRangeWorkerProcessFactory != null) {
+            return
+        }
+        portRangeWorkerProcessFactory = Workers.createWorkerProcessFactory(
+            gradleWorkerProcessFactory,
+            new PortRangeProcessLauncher(partitionCount, new WorkingDirectoryIsolator()),
+            gradleMessagingServer
+        )
+    }
+
+    synchronized static initializeGradleMessagingServer(server) {
+        if (!gradleMessagingServer) {
+            gradleMessagingServer = server
+        }
+    }
+
+    synchronized static void initializeGradleWorkerProcessFactory(factory) {
+        if (!gradleWorkerProcessFactory) {
+            gradleWorkerProcessFactory = factory
+        }
+    }
+}
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy
index bafeab9..82fc4ba 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy
@@ -46,7 +46,7 @@ class RepeatTest extends Test {
      */
     @Override
     protected TestExecuter<JvmTestExecutionSpec> createTestExecuter() {
-        return new RepeatableTestExecuter(
+        return new RepeatTestExecuter(
                 super.createTestExecuter().workerFactory,
                 getActorFactory(),
                 getModuleRegistry(),
@@ -54,6 +54,7 @@ class RepeatTest extends Test {
                 getServices().get(StartParameter.class).getMaxWorkerCount(),
                 getServices().get(Clock.class),
                 getServices().get(DocumentationRegistry.class),
-                (DefaultTestFilter) getFilter())
+                (DefaultTestFilter) getFilter(),
+                times)
     }
 }
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerConnectionAcceptor.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerConnectionAcceptor.java
deleted file mode 100644
index 8e38d26..0000000
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerConnectionAcceptor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- *
- */
-
-package org.apache.geode.gradle.testing.dockerized;
-
-import static java.util.Collections.list;
-import static java.util.stream.Collectors.toList;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.List;
-
-import org.gradle.api.UncheckedIOException;
-import org.gradle.internal.remote.Address;
-import org.gradle.internal.remote.ConnectionAcceptor;
-import org.gradle.internal.remote.internal.inet.MultiChoiceAddress;
-
-/**
- * Wraps a {@link ConnectionAcceptor} to give it a {@link MultiChoiceAddress} that processes in
- * Docker containers can use to connect to Gradle's messaging server.
- */
-class DockerConnectionAcceptor implements ConnectionAcceptor {
-  private static final List<InetAddress> DOCKER_ACCEPTABLE_ADDRESSES;
-
-  static {
-    try {
-      DOCKER_ACCEPTABLE_ADDRESSES = list(NetworkInterface.getNetworkInterfaces()).stream()
-          .filter(DockerConnectionAcceptor::isAcceptable)
-          .flatMap(i -> list(i.getInetAddresses()).stream())
-          .filter(DockerConnectionAcceptor::isAcceptable)
-          .collect(toList());
-    } catch (SocketException e) {
-      throw new UncheckedIOException("Unable to identify usable addresses", e);
-    }
-  }
-
-  private final MultiChoiceAddress address;
-  private final ConnectionAcceptor delegate;
-
-  /**
-   * Creates a {@code MultiChoiceAddress} whose candidate addresses are acceptable for processes in
-   * Docker containers to use to attempt to connect to Gradle's messaging server. The messaging
-   * server will accept connections from one of those candidate addresses.
-   */
-  DockerConnectionAcceptor(ConnectionAcceptor delegate) {
-    this.delegate = delegate;
-    // The delegate's candidates are the host's loopback addresses, which processes in Docker
-    // containers cannot use.
-    MultiChoiceAddress original = (MultiChoiceAddress) delegate.getAddress();
-    // Replace the delegate's unacceptable candidate addresses with acceptable ones.
-    address = new MultiChoiceAddress(original.getCanonicalAddress(), original.getPort(),
-        DOCKER_ACCEPTABLE_ADDRESSES);
-  }
-
-  @Override
-  public Address getAddress() {
-    return address;
-  }
-
-  @Override
-  public void requestStop() {
-    delegate.requestStop();
-  }
-
-  @Override
-  public void stop() {
-    delegate.stop();
-  }
-
-  /**
-   * Reports whether the candidate interface is acceptable for processes in Docker containers to use
-   * to connect to Gradle's messaging server. An interface is acceptable if it satisfies all of:
-   * <ul>
-   *   <li>it is up</li>
-   *   <li>it is not a loopback interface</li>
-   *   <li>it is not a point to point interface (e.g. VPN)</li>
-   */
-  private static boolean isAcceptable(NetworkInterface candidate) {
-    try {
-      return !candidate.isLoopback()
-          && !candidate.isPointToPoint()
-          && candidate.isUp();
-    } catch (SocketException ignored) {
-      return false;
-    }
-  }
-
-  /**
-   * Reports whether the candidate address is acceptable for processes in Docker containers to use
-   * to connect to Gradle's messaging server. An address is acceptable if it is reachable.
-   */
-  private static boolean isAcceptable(InetAddress candidate) {
-    try {
-      return candidate.isReachable(2000);
-    } catch (IOException ignored) {
-      return false;
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerMessagingServer.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerMessagingServer.java
deleted file mode 100644
index 69a28c7..0000000
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerMessagingServer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.gradle.testing.dockerized;
-
-import org.gradle.api.Action;
-import org.gradle.internal.concurrent.ExecutorFactory;
-import org.gradle.internal.remote.ConnectionAcceptor;
-import org.gradle.internal.remote.MessagingServer;
-import org.gradle.internal.remote.ObjectConnection;
-import org.gradle.internal.remote.internal.ConnectCompletion;
-import org.gradle.internal.remote.internal.IncomingConnector;
-import org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection;
-
-/**
- * A copy of MessageHubBackedServer from Gradle v6.8.3, modified to accept connections from
- * processes running in Docker containers.
- */
-public class DockerMessagingServer implements MessagingServer {
-  private final IncomingConnector connector;
-  private final ExecutorFactory executorFactory;
-
-  public DockerMessagingServer(IncomingConnector connector, ExecutorFactory executorFactory) {
-    this.connector = connector;
-    this.executorFactory = executorFactory;
-  }
-
-  /**
-   * Transforms Gradle's standard connection acceptor into one that will accept connections from
-   * worker processes in Docker containers. A connection acceptor reports a list of candidate
-   * addresses for worker processes to try to connect to. Gradle's standard acceptor reports the
-   * host's loopback addresses, which processes in Docker containers cannot use. The transformed
-   * acceptor instead reports a list of non-loopback addresses, and the Dockerized process will be
-   * able to use at least one of those to connect to this server.
-   */
-  @Override
-  public ConnectionAcceptor accept(Action<ObjectConnection> action) {
-    ConnectEventAction connectEventAction = new ConnectEventAction(action);
-    ConnectionAcceptor originalConnectionAcceptor = connector.accept(connectEventAction, true);
-    return new DockerConnectionAcceptor(originalConnectionAcceptor);
-  }
-
-  /**
-   * An unmodified copy of MessageHubBackedServer.ConnectionEvent from Gradle v6.8.3.
-   */
-  private class ConnectEventAction implements Action<ConnectCompletion> {
-    private final Action<ObjectConnection> action;
-
-    public ConnectEventAction(Action<ObjectConnection> action) {
-      this.action = action;
-    }
-
-    @Override
-    public void execute(ConnectCompletion completion) {
-      action.execute(new MessageHubBackedObjectConnection(executorFactory, completion));
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerProcess.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerProcess.java
deleted file mode 100644
index d799b29..0000000
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerProcess.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.gradle.testing.dockerized;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.geode.gradle.testing.dockerized.DockerTestWorkerConfig.getDurationWarningThreshold;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.async.ResultCallbackTemplate;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.api.model.WaitResponse;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
-import org.gradle.internal.UncheckedException;
-
-/**
- * Represents a process running in a Docker container.
- */
-public class DockerProcess extends Process {
-  private static final Logger LOGGER = Logging.getLogger(DockerProcess.class);
-
-  private final String owner;
-  private final DockerClient client;
-  private final String containerId;
-  private final int timeoutMillis;
-  private final Runnable onCompletion;
-  private final PipedOutputStream stdIn = new PipedOutputStream();
-  private final PipedInputStream stdOut = new PipedInputStream();
-  private final PipedInputStream stdErr = new PipedInputStream();
-  private final PipedInputStream stdInToContainer = new PipedInputStream();
-  private final PipedOutputStream stdOutFromContainer = new PipedOutputStream();
-  private final PipedOutputStream stdErrFromContainer = new PipedOutputStream();
-  private final AtomicInteger exitCode = new AtomicInteger();
-  private final CountDownLatch finished = new CountDownLatch(1);
-  private final OutputListener outputListener = new OutputListener();
-  private final TerminationListener terminationListener = new TerminationListener();
-
-  /**
-   * Creates a {@link Process} that represents a process running in a Docker container.
-   *
-   * @param owner the name of this process's owner (used for diagnostics)
-   * @param client a Docker client to use to listen for process output and termination
-   * @param containerId the ID of the container in which the process is running
-   * @param timeoutMillis duration to wait for each listener to start
-   * @param onCompletion a runnable to run when this process completes
-   * @return a Process that represents the process in the container
-   */
-  public static Process attachedTo(String owner, DockerClient client, String containerId,
-      int timeoutMillis, Runnable onCompletion) {
-    DockerProcess process = new DockerProcess(
-        owner, client, containerId, timeoutMillis, onCompletion);
-    try {
-      process.attach();
-    } catch (Exception e) {
-      UncheckedException.throwAsUncheckedException(e);
-    }
-    return process;
-  }
-
-  private DockerProcess(String owner, DockerClient client, String containerId, int timeoutMillis,
-      Runnable onCompletion) {
-    this.owner = owner;
-    this.client = client;
-    this.containerId = containerId;
-    this.timeoutMillis = timeoutMillis;
-    this.onCompletion = onCompletion;
-  }
-
-  @Override
-  public OutputStream getOutputStream() {
-    return stdIn;
-  }
-
-  @Override
-  public InputStream getInputStream() {
-    return stdOut;
-  }
-
-  @Override
-  public InputStream getErrorStream() {
-    return stdErr;
-  }
-
-  @Override
-  public int waitFor() throws InterruptedException {
-    finished.await();
-    return exitValue();
-  }
-
-  @Override
-  public int exitValue() {
-    if (finished.getCount() != 0) {
-      throw new IllegalThreadStateException(toString() + " is still running");
-    }
-    return exitCode.get();
-  }
-
-  @Override
-  public void destroy() {
-    finish();
-  }
-
-  @Override
-  public String toString() {
-    return String.format("DockerProcess{%s:%s}", owner, containerId);
-  }
-
-  /**
-   * Attach this {@code DockerProcess}'s input and output streams to the container's, and set a
-   * callback for when the containerized process finishes.
-   *
-   * @throws Exception if an error occurs while attaching to the container
-   */
-  private void attach() throws Exception {
-    listenForTermination();
-    connectStreams();
-    listenForOutput();
-  }
-
-  private void listenForOutput() throws InterruptedException {
-    LOGGER.debug("{} installing {}", this, outputListener);
-    try {
-      long startTime = System.currentTimeMillis();
-    client.attachContainerCmd(containerId)
-        .withFollowStream(true)
-        .withStdOut(true)
-        .withStdErr(true)
-        .withStdIn(stdInToContainer)
-        .exec(outputListener);
-      LOGGER.debug("{} installed {}", this, outputListener);
-      long duration = System.currentTimeMillis() - startTime;
-      if(duration > getDurationWarningThreshold()) {
-        LOGGER.warn("{} {} installation took {}ms", this, outputListener, duration);
-      }
-    } catch (RuntimeException e) {
-      String message = String.format("%s error while installing %s", this, outputListener);
-      throw new RuntimeException(message, e);
-    }
-    waitUntilStarted(outputListener);
-  }
-
-  private void connectStreams() throws IOException {
-    stdInToContainer.connect(stdIn);
-    stdOutFromContainer.connect(stdOut);
-    stdErrFromContainer.connect(stdErr);
-  }
-
-  private void listenForTermination() throws InterruptedException {
-    LOGGER.debug("{} installing {}", this, terminationListener);
-    try {
-      long startTime = System.currentTimeMillis();
-      client.waitContainerCmd(containerId)
-          .exec(terminationListener);
-      LOGGER.debug("{} installed {}", this, terminationListener);
-      long duration = System.currentTimeMillis() - startTime;
-      if(duration > getDurationWarningThreshold()) {
-        LOGGER.warn("{} {} installation took {}ms", this, terminationListener, duration);
-      }
-    } catch (RuntimeException e) {
-      String message = String.format("%s error while installing %s", this, terminationListener);
-      throw new RuntimeException(message, e);
-    }
-    waitUntilStarted(terminationListener);
-  }
-
-  private void waitUntilStarted(ResultCallbackTemplate<?, ?> listener)
-      throws InterruptedException {
-    if (timeoutMillis > 0) {
-      LOGGER.debug("{} waiting {}ms for {} to start", this, timeoutMillis, listener);
-      if (!listener.awaitStarted(timeoutMillis, MILLISECONDS)) {
-        String message = String.format(
-            "%s timed out after %dms waiting for %s to start", this, timeoutMillis, listener);
-        throw new RuntimeException(message);
-      }
-    } else {
-      LOGGER.debug("{} waiting for {} to start", this, listener);
-      listener.awaitStarted();
-    }
-    LOGGER.debug("{} {} started", this, listener);
-  }
-
-  private void finish() {
-    close("stdin", stdIn);
-    close("stdout", stdOut);
-    close("stderr", stdErr);
-    close("stdin to container", stdInToContainer);
-    close("stdout from container", stdOutFromContainer);
-    close("stderr from container", stdErrFromContainer);
-    close("client", client);
-    finished.countDown();
-    onCompletion.run();
-  }
-
-  private void close(String name, Closeable closeable) {
-    try {
-      closeable.close();
-      LOGGER.debug("{} closed {}", this, name);
-    } catch (IOException e) {
-      String message = String.format("%s error while closing %s", this, name);
-      LOGGER.warn(message, e);
-    }
-  }
-
-  /**
-   * A listener for Docker to notify whenever the containerized process writes new output. The
-   * listener copies each frame of the process's output to this DockerProcess's stdout or stderr.
-   */
-  private class OutputListener extends ResultCallback.Adapter<Frame> {
-    @Override
-    public void onNext(Frame frame) {
-      byte[] payload = frame.getPayload();
-      StreamType streamType = frame.getStreamType();
-      try {
-        switch (streamType) {
-          case STDOUT:
-            stdOutFromContainer.write(payload);
-            break;
-          case STDERR:
-            stdErrFromContainer.write(payload);
-            break;
-          default:
-        }
-      } catch (IOException e) {
-        String message = String.format("%s %s error while writing to %s",
-            DockerProcess.this.toString(), this, streamType);
-        LOGGER.error(message, e);
-      }
-    }
-    @Override
-    public String toString() {
-      return "output listener";
-    }
-
-  }
-
-  /**
-   * A listener for Docker to notify when the containerized process terminates. The listener records
-   * the process's exit code, stops watching its streams, closes this {@code DockerProcess}'s output
-   * streams, and removes the Docker container.
-   */
-  private class TerminationListener extends ResultCallback.Adapter<WaitResponse> {
-    @Override
-    public void onNext(WaitResponse response) {
-      Integer statusCode = response.getStatusCode();
-      LOGGER.debug("{} {} called: process exited with status code {}",
-          DockerProcess.this, this, statusCode);
-      exitCode.set(statusCode);
-      try {
-        outputListener.close();
-        outputListener.awaitCompletion();
-      } catch (Exception e) {
-        String message = String.format("%s error while removing %s", DockerProcess.this, this);
-        LOGGER.warn(message, e);
-      } finally {
-        finish();
-      }
-    }
-
-    @Override
-    public String toString() {
-      return "termination listener";
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerProcessLauncher.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerProcessLauncher.java
deleted file mode 100644
index eb190d4..0000000
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/DockerProcessLauncher.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.gradle.testing.dockerized;
-
-import static java.util.stream.Collectors.toList;
-import static org.apache.geode.gradle.testing.dockerized.DockerTestWorkerConfig.getDurationWarningThreshold;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
-import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
-import org.gradle.internal.UncheckedException;
-
-import org.apache.geode.gradle.testing.process.ProcessLauncher;
-
-/**
- * A process launcher that launches each process in a Docker container.
- */
-public class DockerProcessLauncher implements ProcessLauncher {
-  private static final Logger LOGGER = Logging.getLogger(DockerProcessLauncher.class);
-  private final DockerTestWorkerConfig config;
-  private final Consumer<ProcessBuilder> adjustment;
-
-  /**
-   * @param config the configuration of the docker containers
-   * @param adjustment configures the process builder before it is dockerized
-   */
-  public DockerProcessLauncher(DockerTestWorkerConfig config, Consumer<ProcessBuilder> adjustment) {
-    this.config = config;
-    this.adjustment = adjustment;
-  }
-
-  /**
-   * Launches the specified process in a Docker container.
-   *
-   * @param processBuilder a builder that specifies the process to launch
-   * @return a Process that represents the process running in the Docker container
-   */
-  @Override
-  public Process start(ProcessBuilder processBuilder) {
-    adjustment.accept(processBuilder);
-    config.dockerize(processBuilder);
-    int timeout = config.getTimeoutMillis();
-
-    // For synchronous Docker operations (create, start, inspect), time out if connecting or
-    // reading takes too long.
-    DockerClient clientForSynchronousOperations = dockerClient(timeout, timeout);
-
-    String containerId = createContainer(processBuilder, clientForSynchronousOperations);
-
-    try {
-      startContainer(clientForSynchronousOperations, containerId);
-      // For asynchronous Docker operations, time out only on connects. The DockerProcess uses the
-      // async client to listen for process output and process termination. Because the client must
-      // listen indefinitely for these events, do not time out on reads.
-      DockerClient clientForAsynchronousOperations = dockerClient(timeout, 0);
-      return DockerProcess.attachedTo(
-          config.getName(), clientForAsynchronousOperations, containerId, timeout,
-          () -> removeContainer(clientForSynchronousOperations, containerId));
-    } catch (Exception e) {
-      removeContainer(clientForSynchronousOperations, containerId);
-      UncheckedException.throwAsUncheckedException(e);
-      return null; // Unreachable
-    }
-  }
-
-  /**
-   * Creates a docker client with the given timeouts.
-   *
-   * @param connectTimeout timeout for connecting, or 0 to disable connect timeouts
-   * @param readTimeout timeout for reading, or 0 to disable read timeouts
-   */
-  private static DockerClient dockerClient(int connectTimeout, int readTimeout) {
-    AbstractDockerCmdExecFactory cmdExecFactory = new NettyDockerCmdExecFactory();
-    if (connectTimeout > 0) {
-      cmdExecFactory.withConnectTimeout(connectTimeout);
-    }
-    if (readTimeout > 0) {
-      cmdExecFactory.withReadTimeout(readTimeout);
-    }
-    // Must use the deprecated withDockerCmdExecFactory() because it is currently the only way to
-    // use Netty, and Netty is currently the only transport that supports timeouts.
-    @SuppressWarnings("deprecation")
-    DockerClient client = DockerClientBuilder.getInstance()
-        .withDockerCmdExecFactory(cmdExecFactory)
-        .build();
-    return client;
-  }
-
-  private String createContainer(ProcessBuilder processBuilder, DockerClient client) {
-    CreateContainerCmd createContainerCommand = client.createContainerCmd(config.getImage())
-        .withTty(false)
-        .withStdinOpen(true)
-        .withWorkingDir(processBuilder.directory().getAbsolutePath())
-        .withEnv(asStrings(processBuilder.environment()))
-        .withCmd(processBuilder.command());
-    setUser(createContainerCommand);
-    setVolumes(createContainerCommand);
-    LOGGER.debug("{} creating container", this);
-    try {
-      long startTime = System.currentTimeMillis();
-      String containerId = createContainerCommand.exec().getId();
-      long duration = System.currentTimeMillis() - startTime;
-      if (duration > getDurationWarningThreshold()) {
-        LOGGER.warn("{} create took {}ms", this, duration);
-      }
-      LOGGER.debug("{} created container {}", this, containerId);
-      return containerId;
-    } catch (RuntimeException e) {
-      String message = String.format("%s error while creating container", this);
-      throw new RuntimeException(message, e);
-    }
-  }
-
-  private void startContainer(DockerClient client, String containerId) {
-    LOGGER.debug("{} starting container {}", this, containerId);
-    try {
-      long startTime = System.currentTimeMillis();
-      client.startContainerCmd(containerId).exec();
-      LOGGER.debug("{} started container {}", this, containerId);
-      long duration = System.currentTimeMillis() - startTime;
-      if (duration > getDurationWarningThreshold()) {
-        LOGGER.warn("{} start {} took {}ms", this, containerId, duration);
-      }
-    } catch (RuntimeException e) {
-      String message = String.format("%s error while starting container %s", this, containerId);
-      throw new RuntimeException(message, e);
-    }
-    InspectContainerResponse report;
-    try {
-      long startTime = System.currentTimeMillis();
-      report = client.inspectContainerCmd(containerId).exec();
-      long duration = System.currentTimeMillis() - startTime;
-      if (duration > getDurationWarningThreshold()) {
-        LOGGER.warn("{} inspect {} took {}ms", this, containerId, duration);
-      }
-    } catch (RuntimeException e) {
-      String message = String.format("%s error while inspecting container %s", this, containerId);
-      throw new RuntimeException(message, e);
-    }
-    InspectContainerResponse.ContainerState state = report.getState();
-    LOGGER.debug("{} container {} state is {}", this, containerId, state);
-    Boolean isRunning = state.getRunning();
-    if (isRunning == null || !isRunning) {
-      String message = String.format("%s cannot attach to container %s because it is %s",
-          this, containerId, state.getStatus());
-      throw new RuntimeException(message);
-    }
-  }
-
-  private void removeContainer(DockerClient client, String containerId) {
-    LOGGER.debug("{} removing container {}", this, containerId);
-    try {
-      long startTime = System.currentTimeMillis();
-      client.removeContainerCmd(containerId)
-          .withForce(true)
-          .exec();
-      long duration = System.currentTimeMillis() - startTime;
-      if (duration > getDurationWarningThreshold()) {
-        LOGGER.warn("{} remove {} took {}ms", this, containerId, duration);
-      }
-      LOGGER.debug("{} removed container {}", this, containerId);
-    } catch (Exception e) {
-      String message = String.format("%s error while removing container %s", this, containerId);
-      LOGGER.warn(message, e);
-    }
-    try {
-      client.close();
-      LOGGER.debug("{} closed client", this);
-    } catch (IOException e) {
-      String message = String.format("%s error while closing client", this);
-      LOGGER.warn(message, e);
-    }
-  }
-
-  private void setUser(CreateContainerCmd command) {
-    String user = config.getUser();
-    if (user != null) {
-      command.withUser(user);
-    }
-  }
-
-  private void setVolumes(CreateContainerCmd command) {
-    List<Bind> binds = config.getVolumes().entrySet().stream()
-        .map(e -> new Bind(e.getKey(), new Volume(e.getValue())))
-        .collect(toList());
-    List<Volume> volumes = binds.stream()
-        .map(Bind::getVolume)
-        .collect(toList());
-    command.withVolumes(volumes);
-    command.getHostConfig().withBinds(binds);
-  }
-
-  @Override
-  public String toString() {
-    return "DockerProcessLauncher{" + config.getName() + "}";
-  }
-
-  private static List<String> asStrings(Map<String, String> map) {
-    return map.entrySet().stream()
-        .map(e -> e.getKey() + "=" + e.getValue())
-        .collect(toList());
-  }
-}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/WildcardBindingInetAddressFactory.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/WildcardBindingInetAddressFactory.java
deleted file mode 100644
index b1fdad9..0000000
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/dockerized/WildcardBindingInetAddressFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- *
- */
-
-package org.apache.geode.gradle.testing.dockerized;
-
-import java.net.InetAddress;
-
-import org.gradle.internal.remote.internal.inet.InetAddressFactory;
-
-/**
- * Overrides Gradle's standard {@link InetAddressFactory} to report the host's wildcard address as
- * the factory's local binding address.
- */
-class WildcardBindingInetAddressFactory extends InetAddressFactory {
-  @Override
-  public InetAddress getLocalBindingAddress() {
-    return super.getWildcardBindingAddress();
-  }
-}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/CompletableProcess.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/CompletableProcess.java
new file mode 100644
index 0000000..b04eefb
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/CompletableProcess.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+package org.apache.geode.gradle.testing.isolation;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+
+/**
+ * Wraps a Java {@link Process} to execute a completion function when it terminates.
+ */
+public class CompletableProcess extends Process {
+  private static final Logger LOGGER = Logging.getLogger(CompletableProcess.class);
+  private final String description;
+  private final Process delegate;
+  private Runnable onCompletion;
+
+  public CompletableProcess(String description, Process delegate, Runnable onCompletion) {
+    this.description = description;
+    this.delegate = delegate;
+    this.onCompletion = onCompletion;
+    LOGGER.debug("{} started", this);
+  }
+
+  @Override
+  public OutputStream getOutputStream() {
+    return delegate.getOutputStream();
+  }
+
+  @Override
+  public InputStream getInputStream() {
+    return delegate.getInputStream();
+  }
+
+  @Override
+  public InputStream getErrorStream() {
+    return delegate.getErrorStream();
+  }
+
+  @Override
+  public int waitFor() throws InterruptedException {
+    try {
+      LOGGER.debug("{} waiting for process to finish", this);
+      return delegate.waitFor();
+    } finally {
+      LOGGER.debug("{} finished", this);
+      cleanUp();
+    }
+  }
+
+  @Override
+  public int exitValue() {
+    int exitValue = delegate.exitValue();
+    LOGGER.debug("{} reporting exit value {}", this, exitValue);
+    return exitValue;
+  }
+
+  @Override
+  public void destroy() {
+    LOGGER.debug("Destroying {}", this);
+    delegate.destroy();
+    LOGGER.debug("{} destroyed", this);
+    cleanUp();
+  }
+
+  @Override
+  public String toString() {
+    return "CompletableProcess{" + description + '}';
+  }
+
+  private synchronized void cleanUp() {
+    if (onCompletion == null) {
+      return;
+    }
+    LOGGER.debug("{} cleaning up", this);
+    onCompletion.run();
+    onCompletion = null;
+    LOGGER.debug("{} cleaned up", this);
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRange.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRange.java
new file mode 100644
index 0000000..2096bfd
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRange.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+package org.apache.geode.gradle.testing.isolation;
+
+/**
+ * Represents a range of ports.
+ */
+public class PortRange {
+  private final int lowerBound;
+  private final int upperBound;
+
+  public PortRange(int lowerBound, int upperBound) {
+    this.lowerBound = lowerBound;
+    this.upperBound = upperBound;
+  }
+
+  public int lowerBound() {
+    return lowerBound;
+  }
+
+  public int upperBound() {
+    return upperBound;
+  }
+
+  public int size() {
+    return upperBound - lowerBound + 1;
+  }
+
+  /**
+   * Partition this port range into a number of sub-ranges and return the selected sub-range.
+   * The partitions are such that sizes of the largest and smallest differ by no more than 1.
+   */
+  public PortRange partition(int partitionIndex, int numberOfPartitions) {
+    int partitionLowerBound = partitionLowerBound(partitionIndex, numberOfPartitions);
+    int partitionUpperBound = partitionLowerBound(partitionIndex + 1, numberOfPartitions) - 1;
+    return new PortRange(partitionLowerBound, partitionUpperBound);
+  }
+
+  @Override
+  public String toString() {
+    return "[" + +lowerBound + "," + upperBound + ']';
+  }
+
+  private int partitionLowerBound(int partitionIndex, int numberOfPartitions) {
+    return lowerBound() + size() * partitionIndex / numberOfPartitions;
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRangeContext.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRangeContext.java
new file mode 100644
index 0000000..93f6162
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRangeContext.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+package org.apache.geode.gradle.testing.isolation;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.List;
+import java.util.stream.IntStream;
+
+/**
+ * Defines the membership and non-membership port ranges for a test worker process.
+ */
+public class PortRangeContext {
+  private static final String AVAILABLE_PORT_LOWER_BOUND_PROPERTY = "AvailablePort.lowerBound";
+  private static final String AVAILABLE_PORT_UPPER_BOUND_PROPERTY = "AvailablePort.upperBound";
+  private static final String MEMBERSHIP_PORT_RANGE_PROPERTY = "gemfire.membership-port-range";
+
+  /**
+   * The full range of port numbers available for non-membership port use.
+   * <p>
+   * This range must match AvailablePort's default port range: [20001, 29999]
+   */
+  public static final PortRange AVAILABLE_PORT_FULL_RANGE = new PortRange(20001, 29999);
+
+  /**
+   * The full range of port numbers available for membership port use.
+   * <p>
+   * This range must match MembershipConfig.DEFAULT_MEMBERSHIP_PORT_RANGE: [41000, 61000]
+   */
+  public static final PortRange MEMBERSHIP_PORT_FULL_RANGE = new PortRange(41000, 61000);
+
+  private final PortRange membershipPorts;
+  private final PortRange availablePorts;
+
+  private PortRangeContext(int index, int numberOfContexts) {
+    membershipPorts = MEMBERSHIP_PORT_FULL_RANGE.partition(index, numberOfContexts);
+    availablePorts = AVAILABLE_PORT_FULL_RANGE.partition(index, numberOfContexts);
+  }
+
+  /**
+   * Return a list with the specified number of distinct port range contexts.
+   */
+  public static List<PortRangeContext> create(int numberOfContexts) {
+    return IntStream.range(0, numberOfContexts)
+      .mapToObj(i -> new PortRangeContext(i, numberOfContexts))
+      .collect(toList());
+  }
+
+  /**
+   * Configure the process builder to add this context's port ranges as system properties for the
+   * process being launched.
+   */
+  public void configure(ProcessBuilder processBuilder) {
+    List<String> command = processBuilder.command();
+    command.add(1, String.format("-D%s=%d-%d", MEMBERSHIP_PORT_RANGE_PROPERTY,
+      membershipPorts.lowerBound(), membershipPorts.upperBound()));
+    command.add(1, String.format("-D%s=%d", AVAILABLE_PORT_LOWER_BOUND_PROPERTY,
+      availablePorts.lowerBound()));
+    command.add(1, String.format("-D%s=%d", AVAILABLE_PORT_UPPER_BOUND_PROPERTY,
+      availablePorts.upperBound()));
+  }
+
+  @Override
+  public String toString() {
+    return "PortRangeContext{" +
+      "availablePorts=" + availablePorts +
+      ", membershipPorts=" + membershipPorts +
+      '}';
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRangeProcessLauncher.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRangeProcessLauncher.java
new file mode 100644
index 0000000..24b394f
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/PortRangeProcessLauncher.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+package org.apache.geode.gradle.testing.isolation;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+
+import org.apache.geode.gradle.testing.process.AdjustableProcessLauncher;
+
+/**
+ * Assigns each test worker process a port range context distinct from that of any concurrently
+ * executing test worker process.
+ */
+public class PortRangeProcessLauncher extends AdjustableProcessLauncher {
+  private static final Logger LOGGER = Logging.getLogger(PortRangeProcessLauncher.class);
+  private static List<PortRangeContext> availableContexts;
+
+  public PortRangeProcessLauncher(int maxWorkers, Consumer<ProcessBuilder> adjustment) {
+    super(adjustment);
+    initializeContexts(maxWorkers);
+  }
+
+  /**
+   * Starts a test worker process with a port range context distinct from that of any concurrently
+   * executing test worker process. The returned {@code Process} is configured to release its
+   * assigned port range context when it terminates.
+   *
+   * @param processBuilder the builder that Gradle configured to start the test worker process
+   * @return a new {@code Process} to manage the test worker process and its port range context
+   */
+  @Override
+  public Process start(ProcessBuilder processBuilder) {
+    List<String> command = processBuilder.command();
+    String workerName = command.get(command.size() - 1);
+    PortRangeContext context = acquireContext(workerName);
+    try {
+      context.configure(processBuilder);
+      Process process = super.start(processBuilder);
+      return new CompletableProcess(workerName, process, () -> releaseContext(workerName, context));
+    } catch(Throwable e) {
+      releaseContext(workerName, context);
+      throw e;
+    }
+  }
+
+  private static synchronized void initializeContexts(int numberOfContexts) {
+    if (availableContexts == null) {
+      availableContexts = PortRangeContext.create(numberOfContexts);
+      LOGGER.debug("Initialized {} port range contexts: {}", numberOfContexts, availableContexts);
+    }
+  }
+
+  private static synchronized PortRangeContext acquireContext(String owner) {
+    PortRangeContext context = availableContexts.remove(0);
+    LOGGER
+      .debug("{} acquired {} ({} available contexts)", owner, context, availableContexts.size());
+    return context;
+  }
+
+  private static synchronized void releaseContext(String owner, PortRangeContext context) {
+    availableContexts.add(context);
+    LOGGER
+      .debug("{} released {} ({} available contexts)", owner, context, availableContexts.size());
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/WorkingDirectoryIsolator.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/WorkingDirectoryIsolator.java
index 0a892fb..1edd654 100644
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/WorkingDirectoryIsolator.java
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/isolation/WorkingDirectoryIsolator.java
@@ -75,7 +75,7 @@ public class WorkingDirectoryIsolator implements Consumer<ProcessBuilder> {
     Path originalClasspathFile = Paths.get(matcher.group().substring(1));
     Path newClasspathFile = directory.resolve("gradle-worker-classpath.txt");
     copy(originalClasspathFile, newClasspathFile);
-    String newClasspathFileArg = "@" + newClasspathFile.toString();
+    String newClasspathFileArg = "@" + newClasspathFile;
     command.set(argIndex, newClasspathFileArg);
   }
 
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestClassProcessor.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestClassProcessor.java
new file mode 100644
index 0000000..a639b4e
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestClassProcessor.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.gradle.testing.repeat;
+
+import org.gradle.api.internal.tasks.testing.TestClassProcessor;
+import org.gradle.api.internal.tasks.testing.TestClassRunInfo;
+import org.gradle.api.internal.tasks.testing.TestResultProcessor;
+
+/**
+ * A test class processor that decorates its result processor to associate each test event with
+ * the test class execution that reported it.
+ */
+public class ExecutionTrackingTestClassProcessor implements TestClassProcessor {
+  private final TestClassProcessor processor;
+  private final int iterationCount;
+
+  public ExecutionTrackingTestClassProcessor(TestClassProcessor processor,
+      int iterationCount) {
+    this.processor = processor;
+    this.iterationCount = iterationCount;
+  }
+
+  @Override
+  public void startProcessing(TestResultProcessor resultProcessor) {
+    processor.startProcessing(
+        new ExecutionTrackingTestResultProcessor(resultProcessor, iterationCount));
+  }
+
+  @Override
+  public void processTestClass(TestClassRunInfo testClass) {
+    processor.processTestClass(testClass);
+  }
+
+  @Override
+  public void stop() {
+    processor.stop();
+  }
+
+  @Override
+  public void stopNow() {
+    processor.stopNow();
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java
new file mode 100644
index 0000000..4d0e76d
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.gradle.testing.repeat;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.gradle.api.internal.tasks.testing.DefaultTestClassDescriptor;
+import org.gradle.api.internal.tasks.testing.DefaultTestDescriptor;
+import org.gradle.api.internal.tasks.testing.TestCompleteEvent;
+import org.gradle.api.internal.tasks.testing.TestDescriptorInternal;
+import org.gradle.api.internal.tasks.testing.TestResultProcessor;
+import org.gradle.api.internal.tasks.testing.TestStartEvent;
+import org.gradle.api.internal.tasks.testing.worker.WorkerTestClassProcessor;
+import org.gradle.api.tasks.testing.TestOutputEvent;
+
+/**
+ * A test result processor that associates each test event with the test class execution that
+ * reported it.
+ */
+public class ExecutionTrackingTestResultProcessor implements TestResultProcessor {
+  private static final Map<String, AtomicInteger> EXECUTION_COUNTERS = new ConcurrentHashMap<>();
+  private final TestResultProcessor processor;
+  private final String executionNameFormat;
+  // The ID of the test class execution reported by this processor. The ID is generated when the
+  // first class starts. The first class is the top-level class being executed in this execution.
+  // Subsequent classes (if any) are all nested classes, and will get the same execution ID as their
+  // top-level class, making it possible to identify the classes that were executed together.
+  private int executionId;
+  private String workerName;
+
+  public ExecutionTrackingTestResultProcessor(TestResultProcessor processor, int repetitions) {
+    this.processor = processor;
+    int idWidth = String.valueOf(repetitions).length();
+    executionNameFormat = "%s-%0" + idWidth + 'd';
+  }
+
+  /**
+   * Reports a test start event, appending an execution ID to the test class name. The execution ID
+   * is a simple counter that distinguishes one execution of a given test class from another.
+   */
+  @Override
+  public void started(TestDescriptorInternal test, TestStartEvent event) {
+    processor.started(executionTrackingDescriptor(test), event);
+  }
+
+  @Override
+  public void completed(Object testId, TestCompleteEvent event) {
+    processor.completed(testId, event);
+  }
+
+  @Override
+  public void output(Object testId, TestOutputEvent event) {
+    processor.output(testId, event);
+  }
+
+  @Override
+  public void failure(Object testId, Throwable result) {
+    processor.failure(testId, result);
+  }
+
+  private TestDescriptorInternal executionTrackingDescriptor(TestDescriptorInternal original) {
+    if (original instanceof DefaultTestDescriptor) {
+      return executionTrackingTestDescriptor(original);
+    }
+    if (original instanceof DefaultTestClassDescriptor) {
+      if (executionId == 0) {
+        executionId = nextExecutionIdFor(original.getClassName());
+      }
+      return executionTrackingClassDescriptor(original);
+    }
+    if (!(original instanceof WorkerTestClassProcessor.WorkerTestSuiteDescriptor)) {
+      warnUnrecognized(original);
+    } else {
+      workerName = original.getName();
+    }
+    return original;
+  }
+
+  private TestDescriptorInternal executionTrackingClassDescriptor(TestDescriptorInternal original) {
+    String executionTrackingClassName = executionTrackingClassNameFor(original);
+    return new DefaultTestClassDescriptor(original.getId(), executionTrackingClassName,
+        original.getClassDisplayName());
+  }
+
+  private TestDescriptorInternal executionTrackingTestDescriptor(TestDescriptorInternal original) {
+    String executionTrackingClassName = executionTrackingClassNameFor(original);
+    return new DefaultTestDescriptor(original.getId(), executionTrackingClassName,
+        original.getName(), original.getClassDisplayName(), original.getDisplayName());
+  }
+
+  private String executionTrackingClassNameFor(TestDescriptorInternal original) {
+    return String.format(executionNameFormat, original.getClassName(), executionId);
+  }
+
+  private static int nextExecutionIdFor(String className) {
+    AtomicInteger executionCounter =
+        EXECUTION_COUNTERS.computeIfAbsent(className, name -> new AtomicInteger());
+    return executionCounter.incrementAndGet();
+  }
+
+  private void warnUnrecognized(TestDescriptorInternal original) {
+    System.out.printf(
+        "WARNING: %s does not recognize test descriptor type %s (className=%s, name=%s)%n",
+        getClass().getName(), original.getClass().getSimpleName(), original.getClassName(),
+        original.getName());
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java
new file mode 100644
index 0000000..58f0681
--- /dev/null
+++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.gradle.testing.repeat;
+
+import java.io.File;
+import java.util.List;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+import org.gradle.api.file.FileTree;
+import org.gradle.api.internal.DocumentationRegistry;
+import org.gradle.api.internal.classpath.ModuleRegistry;
+import org.gradle.api.internal.tasks.testing.JvmTestExecutionSpec;
+import org.gradle.api.internal.tasks.testing.TestClassProcessor;
+import org.gradle.api.internal.tasks.testing.TestExecuter;
+import org.gradle.api.internal.tasks.testing.TestFramework;
+import org.gradle.api.internal.tasks.testing.TestResultProcessor;
+import org.gradle.api.internal.tasks.testing.WorkerTestClassProcessorFactory;
+import org.gradle.api.internal.tasks.testing.detection.DefaultTestClassScanner;
+import org.gradle.api.internal.tasks.testing.detection.DefaultTestExecuter;
+import org.gradle.api.internal.tasks.testing.detection.TestFrameworkDetector;
+import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter;
+import org.gradle.api.internal.tasks.testing.processors.MaxNParallelTestClassProcessor;
+import org.gradle.api.internal.tasks.testing.processors.PatternMatchTestClassProcessor;
+import org.gradle.api.internal.tasks.testing.processors.RestartEveryNTestClassProcessor;
+import org.gradle.api.internal.tasks.testing.processors.RunPreviousFailedFirstTestClassProcessor;
+import org.gradle.api.internal.tasks.testing.processors.TestMainAction;
+import org.gradle.api.internal.tasks.testing.worker.ForkingTestClassProcessor;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.internal.Factory;
+import org.gradle.internal.actor.ActorFactory;
+import org.gradle.internal.time.Clock;
+import org.gradle.internal.work.WorkerLeaseRegistry;
+import org.gradle.process.internal.worker.WorkerProcessFactory;
+
+/**
+ * A copy of {@link DefaultTestExecuter} from Gradle v6.8.3, modified to process each test class
+ * as many times as it was submitted. This is required by our {@link RepeatTest} task, because:
+ * <ul>
+ *   <li>Geode's {@code RepeatTest} task operates by submitting each test class for processing
+ *   multiple times.</li>
+ *   <li>Gradle's {@code DefaultTestExecuter} includes a
+ *   {@link RunPreviousFailedFirstTestClassProcessor}, which de-duplicates the submitted test
+ *   classes, preventing the {@code RepeatTest} from repeating the tests.</li>
+ * </ul>
+ * <p>
+ * This executer omits the {@code RunPreviousFailedFirstTestClassProcessor}, and so each test class
+ * is processed as many times as {@code RepeatTest} submits it. See the comment in {@link #execute}.
+ * <p>
+ * This executer also assigns an ID to each execution of a test class, and appends that ID onto the
+ * class name for that test instance. Gradle writes each test's output to a log associated with
+ * the class name. Appending an execution ID onto the class name causes Gradle to write the output
+ * from each instance to its own log.
+ */
+public class RepeatTestExecuter implements TestExecuter<JvmTestExecutionSpec> {
+  private static final Logger LOGGER = Logging.getLogger(RepeatTestExecuter.class);
+
+  private final WorkerProcessFactory workerFactory;
+  private final ActorFactory actorFactory;
+  private final ModuleRegistry moduleRegistry;
+  private final WorkerLeaseRegistry workerLeaseRegistry;
+  private final int maxWorkerCount;
+  private final Clock clock;
+  private final DocumentationRegistry documentationRegistry;
+  private final DefaultTestFilter testFilter;
+  private final int iterationCount;
+  private TestClassProcessor processor;
+
+  public RepeatTestExecuter(WorkerProcessFactory workerFactory, ActorFactory actorFactory,
+      ModuleRegistry moduleRegistry, WorkerLeaseRegistry workerLeaseRegistry, int maxWorkerCount,
+      Clock clock, DocumentationRegistry documentationRegistry, DefaultTestFilter testFilter,
+      int iterationCount) {
+    this.workerFactory = workerFactory;
+    this.actorFactory = actorFactory;
+    this.moduleRegistry = moduleRegistry;
+    this.workerLeaseRegistry = workerLeaseRegistry;
+    this.maxWorkerCount = maxWorkerCount;
+    this.clock = clock;
+    this.documentationRegistry = documentationRegistry;
+    this.testFilter = testFilter;
+    this.iterationCount = iterationCount;
+  }
+
+  @Override
+  public void execute(final JvmTestExecutionSpec testExecutionSpec,
+      TestResultProcessor testResultProcessor) {
+    final TestFramework testFramework = testExecutionSpec.getTestFramework();
+    final WorkerTestClassProcessorFactory testInstanceFactory = testFramework.getProcessorFactory();
+    final WorkerLeaseRegistry.WorkerLease
+        currentWorkerLease =
+        workerLeaseRegistry.getCurrentWorkerLease();
+    final Set<File> classpath = ImmutableSet.copyOf(testExecutionSpec.getClasspath());
+    final Set<File> modulePath = ImmutableSet.copyOf(testExecutionSpec.getModulePath());
+    final List<String>
+        testWorkerImplementationModules =
+        testFramework.getTestWorkerImplementationModules();
+    final Factory<TestClassProcessor> forkingProcessorFactory = () -> {
+      TestClassProcessor forkingTestClassProcessor =
+          new ForkingTestClassProcessor(currentWorkerLease, workerFactory, testInstanceFactory,
+              testExecutionSpec.getJavaForkOptions(), classpath, modulePath,
+              testWorkerImplementationModules, testFramework.getWorkerConfigurationAction(),
+              moduleRegistry, documentationRegistry);
+      // Wrap the forking processor to make it distinguish different executions of a test class
+      return new ExecutionTrackingTestClassProcessor(forkingTestClassProcessor, iterationCount);
+    };
+    final Factory<TestClassProcessor>
+        reforkingProcessorFactory =
+        () -> new RestartEveryNTestClassProcessor(forkingProcessorFactory,
+            testExecutionSpec.getForkEvery());
+    // Create the chain of test class processors, omitting the
+    // RunPreviousFailedFirstTestClassProcessor that Gradle's DefaultTestExecuter creates.
+    processor =
+        new PatternMatchTestClassProcessor(testFilter,
+            new MaxNParallelTestClassProcessor(getMaxParallelForks(testExecutionSpec),
+                reforkingProcessorFactory, actorFactory));
+
+    final FileTree testClassFiles = testExecutionSpec.getCandidateClassFiles();
+
+    Runnable detector;
+    if (testExecutionSpec.isScanForTestClasses() && testFramework.getDetector() != null) {
+      TestFrameworkDetector testFrameworkDetector = testFramework.getDetector();
+      testFrameworkDetector.setTestClasses(testExecutionSpec.getTestClassesDirs().getFiles());
+      testFrameworkDetector.setTestClasspath(classpath);
+      detector = new DefaultTestClassScanner(testClassFiles, testFrameworkDetector, processor);
+    } else {
+      detector = new DefaultTestClassScanner(testClassFiles, null, processor);
+    }
+
+    new TestMainAction(detector, processor, testResultProcessor, clock, testExecutionSpec.getPath(),
+        "Gradle Test Run " + testExecutionSpec.getIdentityPath()).run();
+  }
+
+  @Override
+  public void stopNow() {
+    if (processor != null) {
+      processor.stopNow();
+    }
+  }
+
+  private int getMaxParallelForks(JvmTestExecutionSpec testExecutionSpec) {
+    int maxParallelForks = testExecutionSpec.getMaxParallelForks();
+    if (maxParallelForks > maxWorkerCount) {
+      LOGGER.info("{}.maxParallelForks ({}) is larger than max-workers ({}), forcing it to {}",
+          testExecutionSpec.getPath(), maxParallelForks, maxWorkerCount, maxWorkerCount);
+      maxParallelForks = maxWorkerCount;
+    }
+    return maxParallelForks;
+  }
+}
diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatableTestExecuter.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatableTestExecuter.java
deleted file mode 100644
index 1536ea5..0000000
--- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatableTestExecuter.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.gradle.testing.repeat;
-
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.internal.DocumentationRegistry;
-import org.gradle.api.internal.classpath.ModuleRegistry;
-import org.gradle.api.internal.tasks.testing.JvmTestExecutionSpec;
-import org.gradle.api.internal.tasks.testing.TestClassProcessor;
-import org.gradle.api.internal.tasks.testing.TestExecuter;
-import org.gradle.api.internal.tasks.testing.TestFramework;
-import org.gradle.api.internal.tasks.testing.TestResultProcessor;
-import org.gradle.api.internal.tasks.testing.WorkerTestClassProcessorFactory;
-import org.gradle.api.internal.tasks.testing.detection.DefaultTestClassScanner;
-import org.gradle.api.internal.tasks.testing.detection.DefaultTestExecuter;
-import org.gradle.api.internal.tasks.testing.detection.TestFrameworkDetector;
-import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter;
-import org.gradle.api.internal.tasks.testing.processors.MaxNParallelTestClassProcessor;
-import org.gradle.api.internal.tasks.testing.processors.PatternMatchTestClassProcessor;
-import org.gradle.api.internal.tasks.testing.processors.RestartEveryNTestClassProcessor;
-import org.gradle.api.internal.tasks.testing.processors.RunPreviousFailedFirstTestClassProcessor;
-import org.gradle.api.internal.tasks.testing.processors.TestMainAction;
-import org.gradle.api.internal.tasks.testing.worker.ForkingTestClassProcessor;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
-import org.gradle.internal.Factory;
-import org.gradle.internal.actor.ActorFactory;
-import org.gradle.internal.time.Clock;
-import org.gradle.internal.work.WorkerLeaseRegistry;
-import org.gradle.process.internal.worker.WorkerProcessFactory;
-
-/**
- * A copy of {@link DefaultTestExecuter} from Gradle v6.8.3, modified to process each test class
- * as many times as it was submitted. This is required by our {@link RepeatTest} task, because:
- * <ul>
- *   <li>Geode's {@code RepeatTest} task operates by submitting each test class for processing
- *   multiple times.</li>
- *   <li>Gradle's {@code DefaultTestExecuter} includes a
- *   {@link RunPreviousFailedFirstTestClassProcessor}, which de-duplicates the submitted test
- *   classes, preventing the {@code RepeatTest} from repeating the tests.</li>
- * </ul>
- * <p>
- * This class omits the {@code RunPreviousFailedFirstTestClassProcessor}, and so each test class
- * is processed as many times as {@code RepeatTest} submits it. See the comment in {@link #execute}.
- */
-public class RepeatableTestExecuter implements TestExecuter<JvmTestExecutionSpec> {
-  private static final Logger LOGGER = Logging.getLogger(RepeatableTestExecuter.class);
-
-  private final WorkerProcessFactory workerFactory;
-  private final ActorFactory actorFactory;
-  private final ModuleRegistry moduleRegistry;
-  private final WorkerLeaseRegistry workerLeaseRegistry;
-  private final int maxWorkerCount;
-  private final Clock clock;
-  private final DocumentationRegistry documentationRegistry;
-  private final DefaultTestFilter testFilter;
-  private TestClassProcessor processor;
-
-  public RepeatableTestExecuter(WorkerProcessFactory workerFactory, ActorFactory actorFactory,
-      ModuleRegistry moduleRegistry, WorkerLeaseRegistry workerLeaseRegistry, int maxWorkerCount,
-      Clock clock, DocumentationRegistry documentationRegistry, DefaultTestFilter testFilter) {
-    this.workerFactory = workerFactory;
-    this.actorFactory = actorFactory;
-    this.moduleRegistry = moduleRegistry;
-    this.workerLeaseRegistry = workerLeaseRegistry;
-    this.maxWorkerCount = maxWorkerCount;
-    this.clock = clock;
-    this.documentationRegistry = documentationRegistry;
-    this.testFilter = testFilter;
-  }
-
-  @Override
-  public void execute(final JvmTestExecutionSpec testExecutionSpec,
-      TestResultProcessor testResultProcessor) {
-    final TestFramework testFramework = testExecutionSpec.getTestFramework();
-    final WorkerTestClassProcessorFactory testInstanceFactory = testFramework.getProcessorFactory();
-    final WorkerLeaseRegistry.WorkerLease
-        currentWorkerLease =
-        workerLeaseRegistry.getCurrentWorkerLease();
-    final Set<File> classpath = ImmutableSet.copyOf(testExecutionSpec.getClasspath());
-    final Set<File> modulePath = ImmutableSet.copyOf(testExecutionSpec.getModulePath());
-    final List<String>
-        testWorkerImplementationModules =
-        testFramework.getTestWorkerImplementationModules();
-    final Factory<TestClassProcessor> forkingProcessorFactory = new Factory<TestClassProcessor>() {
-      @Override
-      public TestClassProcessor create() {
-        return new ForkingTestClassProcessor(currentWorkerLease, workerFactory, testInstanceFactory,
-            testExecutionSpec.getJavaForkOptions(),
-            classpath, modulePath, testWorkerImplementationModules,
-            testFramework.getWorkerConfigurationAction(), moduleRegistry, documentationRegistry);
-      }
-    };
-    final Factory<TestClassProcessor>
-        reforkingProcessorFactory =
-        new Factory<TestClassProcessor>() {
-          @Override
-          public TestClassProcessor create() {
-            return new RestartEveryNTestClassProcessor(forkingProcessorFactory,
-                testExecutionSpec.getForkEvery());
-          }
-        };
-    // Create the chain of test class processors, omitting the
-    // RunPreviousFailedFirstTestClassProcessor that Gradle's DefaultTestExecuter creates.
-    processor =
-        new PatternMatchTestClassProcessor(testFilter,
-            new MaxNParallelTestClassProcessor(getMaxParallelForks(testExecutionSpec),
-                reforkingProcessorFactory, actorFactory));
-
-    final FileTree testClassFiles = testExecutionSpec.getCandidateClassFiles();
-
-    Runnable detector;
-    if (testExecutionSpec.isScanForTestClasses() && testFramework.getDetector() != null) {
-      TestFrameworkDetector testFrameworkDetector = testFramework.getDetector();
-      testFrameworkDetector.setTestClasses(testExecutionSpec.getTestClassesDirs().getFiles());
-      testFrameworkDetector.setTestClasspath(classpath);
-      detector = new DefaultTestClassScanner(testClassFiles, testFrameworkDetector, processor);
-    } else {
-      detector = new DefaultTestClassScanner(testClassFiles, null, processor);
-    }
-
-    new TestMainAction(detector, processor, testResultProcessor, clock, testExecutionSpec.getPath(),
-        "Gradle Test Run " + testExecutionSpec.getIdentityPath()).run();
-  }
-
-  @Override
-  public void stopNow() {
-    if (processor != null) {
-      processor.stopNow();
-    }
-  }
-
-  private int getMaxParallelForks(JvmTestExecutionSpec testExecutionSpec) {
-    int maxParallelForks = testExecutionSpec.getMaxParallelForks();
-    if (maxParallelForks > maxWorkerCount) {
-      LOGGER.info("{}.maxParallelForks ({}) is larger than max-workers ({}), forcing it to {}",
-          testExecutionSpec.getPath(), maxParallelForks, maxWorkerCount, maxWorkerCount);
-      maxParallelForks = maxWorkerCount;
-    }
-    return maxParallelForks;
-  }
-}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/geode-dockerized-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/geode-dockerized-test.properties
deleted file mode 100644
index 1ea705c..0000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/geode-dockerized-test.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class = org.apache.geode.gradle.testing.dockerized.DockerizedTestPlugin
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/geode-isolated-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/geode-isolated-test.properties
new file mode 100644
index 0000000..b5c844c
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/geode-isolated-test.properties
@@ -0,0 +1 @@
+implementation-class = org.apache.geode.gradle.testing.isolation.IsolatedTestPlugin
diff --git a/buildSrc/src/main/resources/japicmp_exceptions.json b/buildSrc/src/main/resources/japicmp_exceptions.json
index 474e143..d7ee511 100755
--- a/buildSrc/src/main/resources/japicmp_exceptions.json
+++ b/buildSrc/src/main/resources/japicmp_exceptions.json
@@ -1,8 +1,6 @@
 {
-  "Class org.apache.geode.net.SSLParameterExtension": "Old implementation exposed an internal class",
-  "Method org.apache.geode.net.SSLParameterExtension.init(org.apache.geode.distributed.internal.DistributionConfig)": "Old implementation exposed an internal class",
-  "Class org.apache.geode.cache.execute.FunctionContext": "Interface not intended for client applications",
-  "Method org.apache.geode.cache.execute.FunctionContext.getPrincipal()": "Interface not intended for client applications",
-  "Class org.apache.geode.distributed.ConfigurationProperties" : "Geode API compatible with Redis is experimental and is subject to change in future releases",
-  "Class org.apache.geode.management.builder.GeodeClusterManagementServiceBuilder": "Moved internal class to fix split packages between geode-core and geode-management"
+  "Class org.apache.geode.management.builder.GeodeClusterManagementServiceBuilder": "Moved internal class to fix split packages between geode-core and geode-management",
+  "Class org.apache.geode.management.api.ClusterManagementOperation": "Fixed missing @Experimental annotation",
+  "Method org.apache.geode.management.api.ClusterManagementOperation.getEndpoint()": "Fixed missing @Experimental annotation",
+  "Method org.apache.geode.management.api.ClusterManagementOperation.getOperator()": "Fixed missing @Experimental annotation"
 }
diff --git a/buildSrc/src/test/java/org/apache/geode/gradle/test/isolation/PortRangeTest.java b/buildSrc/src/test/java/org/apache/geode/gradle/test/isolation/PortRangeTest.java
new file mode 100644
index 0000000..5bb126b
--- /dev/null
+++ b/buildSrc/src/test/java/org/apache/geode/gradle/test/isolation/PortRangeTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file to You under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geode.gradle.test.isolation;
+
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.stream.IntStream;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.geode.gradle.testing.isolation.PortRange;
+
+public class PortRangeTest {
+  @Test
+  public void firstPartitionHasSameLowerBoundAsFullRange() {
+    PortRange fullRange = new PortRange(11111, 19994); // Arbitrary
+    PortRange firstPartition = fullRange.partition(0, 24);
+    assertEquals(fullRange.lowerBound(), firstPartition.lowerBound());
+  }
+
+  @Test
+  public void lastPartitionHasSameUpperBoundAsSourceRange() {
+    PortRange fullRange = new PortRange(3333, 20002); // Arbitrary
+    PortRange lastPartition = fullRange.partition(23, 24);
+    assertEquals(fullRange.upperBound(), lastPartition.upperBound());
+  }
+
+  @Test
+  public void adjacentPartitionsHaveAdjacentBounds() {
+    PortRange fullRange = new PortRange(22222, 33211); // Arbitrary
+    int numberOfPartitions = 24;
+    List<PortRange> partitions = IntStream.range(0, numberOfPartitions)
+        .mapToObj(i -> fullRange.partition(i, numberOfPartitions))
+        .collect(toList());
+
+    for (int i = 1; i < partitions.size(); i++) {
+      int lowerPartitionUpperBound = partitions.get(i - 1).upperBound();
+      int upperPartitionLowerBound = partitions.get(i).lowerBound();
+      boolean areAdjacent = upperPartitionLowerBound == lowerPartitionUpperBound + 1;
+
+      String description = String.format(
+          "partition %d upper bound (%d) is adjacent to partition %d lower bound (%d)",
+          i - 1, lowerPartitionUpperBound, i, upperPartitionLowerBound);
+      assertTrue(description, areAdjacent);
+    }
+  }
+
+  @Test
+  public void partitionSizesDifferByNoMoreThan1() {
+    PortRange fullRange = new PortRange(12345, 23451); // Arbitrary
+    int numberOfPartitions = 24;
+
+    int[] partitionSizes = IntStream.range(0, numberOfPartitions)
+        .mapToObj(i -> fullRange.partition(i, numberOfPartitions))
+        .mapToInt(p -> p.upperBound() - p.lowerBound() + 1)
+        .sorted()
+        .toArray();
+
+    int minPartitionSize = partitionSizes[0];
+    int maxPartitionSize = partitionSizes[partitionSizes.length - 1];
+
+    String description = String.format(
+        "minimum (%d) and maximum (%d) partition sizes differ by no more than 1",
+        minPartitionSize, maxPartitionSize);
+    assertTrue(description, maxPartitionSize - minPartitionSize <= 1);
+  }
+}
diff --git a/buildSrc/src/test/java/org/apache/geode/javac/SimpleFileManager.java b/buildSrc/src/test/java/org/apache/geode/javac/SimpleFileManager.java
index e65f287..0e99bc7 100644
--- a/buildSrc/src/test/java/org/apache/geode/javac/SimpleFileManager.java
+++ b/buildSrc/src/test/java/org/apache/geode/javac/SimpleFileManager.java
@@ -26,7 +26,7 @@ import javax.tools.StandardJavaFileManager;
 
 public class SimpleFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {
 
-  private List<SimpleClassFile> compiled = new ArrayList<>();
+  private final List<SimpleClassFile> compiled = new ArrayList<>();
 
   public SimpleFileManager(StandardJavaFileManager fileManager) {
     super(fileManager);
diff --git a/buildSrc/src/test/java/org/apache/geode/javac/SimpleSourceFile.java b/buildSrc/src/test/java/org/apache/geode/javac/SimpleSourceFile.java
index 5a4090f..0ec14b2 100644
--- a/buildSrc/src/test/java/org/apache/geode/javac/SimpleSourceFile.java
+++ b/buildSrc/src/test/java/org/apache/geode/javac/SimpleSourceFile.java
@@ -20,7 +20,7 @@ import java.net.URI;
 import javax.tools.SimpleJavaFileObject;
 
 public class SimpleSourceFile extends SimpleJavaFileObject {
-  private String content;
+  private final String content;
 
   public SimpleSourceFile(String qualifiedClassName, String testSource) {
     super(URI.create(String.format("file://%s%s", qualifiedClassName.replaceAll("\\.", "/"),
diff --git a/buildSrc/src/test/java/org/apache/geode/javac/TestAnnotationProcessor.java b/buildSrc/src/test/java/org/apache/geode/javac/TestAnnotationProcessor.java
index 73a2dae..8381596 100644
--- a/buildSrc/src/test/java/org/apache/geode/javac/TestAnnotationProcessor.java
+++ b/buildSrc/src/test/java/org/apache/geode/javac/TestAnnotationProcessor.java
@@ -40,7 +40,7 @@ public class TestAnnotationProcessor {
       + "public class Test {\n"
       + "}\n";
 
-  private TestCompiler compiler = new TestCompiler();
+  private final TestCompiler compiler = new TestCompiler();
 
   @Test
   public void checkValidAnnotations() {
diff --git a/ci/bin/concourse_job_performance.py b/ci/bin/concourse_job_performance.py
index c604e4f..6c38af3 100755
--- a/ci/bin/concourse_job_performance.py
+++ b/ci/bin/concourse_job_performance.py
@@ -36,7 +36,7 @@ from colors import color
 from tqdm import tqdm
 import yaml
 
-TEST_FAILURE_REGEX = re.compile('(\S+)\s*>\s*(\S+).*FAILED')
+TEST_FAILURE_REGEX = re.compile('([A-Za-z_][A-Za-z0-9_]*) > ([A-Za-z_].*) FAILED')
 
 YELLOW_STARS_SEPARATOR = color("***********************************************************************************",
                                fg='yellow')
@@ -73,7 +73,7 @@ def main(url, team, pipeline, job, number_of_builds, authorization_cookie, threa
 
 def get_cookie(url):
     home = os.environ['HOME']
-    data = yaml.load(open(f"{home}/.flyrc"))
+    data = yaml.safe_load(open(f"{home}/.flyrc"))
     for target in data["targets"]:
         api = data["targets"][target]["api"]
         if api == url:
diff --git a/ci/images/google-geode-builder/packer.json b/ci/images/google-geode-builder/packer.json
index 8f691fd..475d6d4 100644
--- a/ci/images/google-geode-builder/packer.json
+++ b/ci/images/google-geode-builder/packer.json
@@ -2,7 +2,6 @@
   "variables": {
     "pipeline_prefix": "local-testing-",
     "hashed_pipeline_prefix": "0b7ad56c-671b-5244-9f36-01f92928abf8",
-    "geode_docker_image": "unset",
     "gcp_project": "unset",
     "java_build_version": "8",
     "packer_ttl": ""
@@ -16,6 +15,7 @@
       "zone": "us-central1-f",
       "image_family": "{{user `pipeline_prefix`}}linux-geode-builder",
       "image_name": "{{user `hashed_pipeline_prefix`}}gb-{{timestamp}}",
+      "disk_size": "100",
       "tags": ["packer"],
       "labels": {
         "time-to-live": "{{user `packer_ttl`}}",
@@ -30,9 +30,6 @@
     },
     {
       "type": "shell",
-      "environment_vars": [
-        "GEODE_DOCKER_IMAGE={{user `geode_docker_image`}}"
-      ],
       "execute_command": "sudo -S sh -c '{{ .Vars }} {{ .Path }}'",
       "script": "scripts/setup.sh"
     },
diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index badd411..d12dc74 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -82,7 +82,6 @@ gcloud config set component_manager/disable_update_check true
 gcloud config set metrics/environment github_docker_image
 gcloud components install docker-credential-gcr --quiet
 gcloud auth configure-docker --quiet
-docker pull ${GEODE_DOCKER_IMAGE}
 curl -Lo /usr/local/bin/dunit-progress https://github.com/jdeppe-pivotal/progress-util/releases/download/0.2/progress.linux
 chmod +x /usr/local/bin/dunit-progress
 wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip
@@ -98,3 +97,4 @@ echo "export PATH=/google-cloud-sdk/bin:${PATH}" > /etc/profile.d/google_sdk_pat
 apt-get remove -y unattended-upgrades && apt-get -y autoremove
 apt-get clean
 rm -rf /var/lib/apt/lists/*
+echo "kernel.pid_max=983040" > /etc/sysctl.d/99-geode.conf
diff --git a/ci/images/google-windows-geode-builder/packer.json b/ci/images/google-windows-geode-builder/packer.json
index 40254fe..16b6f7b 100644
--- a/ci/images/google-windows-geode-builder/packer.json
+++ b/ci/images/google-windows-geode-builder/packer.json
@@ -2,7 +2,6 @@
   "variables": {
     "pipeline_prefix": "local-testing-",
     "hashed_pipeline_prefix": "0b7ad56c-671b-5244-9f36-01f92928abf8",
-    "geode_docker_image": "unset",
     "gcp_project": "unset",
     "gcp_network": "default",
     "gcp_subnetwork": "default",
@@ -135,6 +134,9 @@
         "ps -Name java -ErrorAction ignore",
 
         "write-output '>>>>>>>>>> Final cleanup <<<<<<<<<<'",
+        "pushd geode",
+        ".\\gradlew.bat --no-daemon clean",
+        "popd",
         "rm -force -recurse geode"
       ]
     },
diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile
deleted file mode 100644
index edc22d7..0000000
--- a/ci/images/test-container/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM ubuntu:bionic
-ENTRYPOINT []
-
-ARG CHROME_DRIVER_VERSION=2.35
-
-WORKDIR /tmp/work
-RUN  apt-get update \
-  && apt-get install -y --no-install-recommends \
-     apt-transport-https \
-     ca-certificates \
-     bzip2 \
-     curl \
-     git \
-     gnupg \
-     lsb-release \
-     lsof \
-     net-tools \
-     procps \
-     software-properties-common \
-     unzip \
-     xz-utils \
-  && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
-  && echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" > /etc/apt/sources.list.d/bellsoft.list \
-  && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
-  && curl -fsSL https://download.bell-sw.com/pki/GPG-KEY-bellsoft | apt-key add - \
-  && apt-get update \
-  && apt-get install -y --no-install-recommends \
-    aptitude \
-    google-chrome-stable \
-  && wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
-  && rm -rf /opt/selenium/chromedriver \
-  && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
-  && rm /tmp/chromedriver_linux64.zip \
-  && mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver \
-  && useradd --shell /bin/bash -u 93043 -o -c "" -m geode \
-  && cp -R /etc/alternatives /etc/keep-alternatives \
-  && apt-get install -y --no-install-recommends \
-    java-common \
-    bellsoft-java11 \
-    bellsoft-java8 \
-  && update-java-alternatives -s bellsoft-java8-amd64 \
-  && rm -rf /etc/alternatives \
-  && mv /etc/keep-alternatives /etc/alternatives \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm -rf /tmp/work
diff --git a/ci/pipelines/examples/deploy_pipeline.sh b/ci/pipelines/examples/deploy_pipeline.sh
index 261912b..287f653 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -44,16 +44,6 @@ if [ "${GEODE_BRANCH}" = "HEAD" ]; then
   exit 1
 fi
 
-MY_NAME=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/name" -H "Metadata-Flavor: Google")
-MY_ZONE=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/zone" -H "Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone ${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
 pushd ${SCRIPTDIR} 2>&1 > /dev/null
 
   cat > repository.yml <<YML
diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml
index 4f3f55b..b5e33ce 100644
--- a/ci/pipelines/examples/jinja.template.yml
+++ b/ci/pipelines/examples/jinja.template.yml
@@ -20,6 +20,9 @@
 
 {% macro common_instance_params(test) -%}
 GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+GCP_ZONE: ((gcp-zone))
 CPUS: {{ test.CPUS }}
 RAM: {{ test.RAM }}
 DISK: {{ test.DISK }}
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh b/ci/pipelines/geode-build/deploy_pipeline.sh
index f0e38ba..2cf1640 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -40,16 +40,6 @@ fi
 echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
 echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
 
-MY_NAME=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/name" -H "Metadata-Flavor: Google")
-MY_ZONE=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/zone" -H "Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone ${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r '.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
 #echo "DEBUG INFO *****************************"
 #echo "Pipeline prefix = ${PIPELINE_PREFIX}"
 #echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 6b6d20d..59dc0fb 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -60,6 +60,9 @@
 
 {% macro common_instance_params(test) -%}
 GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+GCP_ZONE: ((gcp-zone))
 CPUS: {{ test.CPUS }}
 RAM: {{ test.RAM }}
 DISK: {{ test.DISK }}
@@ -497,8 +500,8 @@ jobs:
           AWS_REGION: us-west-2
           ARTIFACT_BUCKET: ((artifact-bucket))
           BENCHMARKS_BRANCH: {{benchmarks.benchmark_branch}}
-          BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-          BASELINE_VERSION: {{benchmarks.baseline_version}}
+          BASELINE_BRANCH: {{run_var.baseline_branch if run_var.baseline_branch is defined else benchmarks.baseline_branch_default}}
+          BASELINE_VERSION: {{run_var.baseline_version if run_var.baseline_version is defined else benchmarks.baseline_version_default}}
           FLAGS: {{ run_var.flag }}
           TAG_POSTFIX: -{{ run_var.title }}
           TEST_OPTIONS: {{ run_var.options }}
@@ -525,8 +528,8 @@ jobs:
               AWS_DEFAULT_REGION: us-west-2
               AWS_REGION: us-west-2
               ARTIFACT_BUCKET: ((artifact-bucket))
-              BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-              BASELINE_VERSION: {{benchmarks.baseline_version}}
+              BASELINE_BRANCH: {{run_var.baseline_branch if run_var.baseline_branch is defined else benchmarks.baseline_branch_default}}
+              BASELINE_VERSION: {{run_var.baseline_version if run_var.baseline_version is defined else benchmarks.baseline_version_default}}
               FLAGS: {{ run_var.flag }}
               TAG_POSTFIX: -{{ run_var.title }}
               TEST_OPTIONS: {{ run_var.options }}
diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml
index c5148c9..92ce228 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -113,28 +113,6 @@ resources:
     password: ((docker-password))
     repository: gcr.io/((gcp-project))/((pipeline-prefix))alpine-tools
 
-- name: ubuntu-docker-image
-  type: registry-image
-  icon: docker
-  source:
-    repository: ubuntu
-    tag: bionic
-
-- name: test-container-dockerfile
-  type: git
-  source:
-    branch: ((geode-build-branch))
-    paths:
-    - ci/images/test-container/*
-    {{ github_access() | indent(4) }}
-
-- name: test-container-docker-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: gcr.io/((gcp-project))/((pipeline-prefix))test-container
-
 - name: concourse-metadata-resource-dockerfile
   type: git
   source:
@@ -287,9 +265,6 @@ jobs:
   serial: true
   plan:
   - in_parallel:
-    - get: test-container-docker-image
-      passed: [build-test-container-docker-image]
-      trigger: true
     - get: google-geode-builder
       trigger: true
     - get: alpine-tools-docker-image
@@ -310,9 +285,11 @@ jobs:
       - name: results
       platform: linux
       params:
-        GEODE_DOCKER_IMAGE: gcr.io/((gcp-project))/((pipeline-prefix))test-container
         PIPELINE_PREFIX: ((pipeline-prefix))
         GCP_PROJECT: ((gcp-project))
+        GCP_NETWORK: ((gcp-network))
+        GCP_SUBNETWORK: ((gcp-subnet))
+        INTERNAL: "true"
         CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
         JAVA_BUILD_VERSION: 8
       run:
@@ -345,9 +322,11 @@ jobs:
       - name: results
       platform: linux
       params:
-        GEODE_DOCKER_IMAGE: gcr.io/((gcp-project))/((pipeline-prefix))test-container
... 634256 lines suppressed ...