You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2017/02/07 19:03:25 UTC
[04/19] geode git commit: GEODE-2431: Update to Awaitility 2.0
GEODE-2431: Update to Awaitility 2.0
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bc6db4a6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bc6db4a6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bc6db4a6
Branch: refs/heads/feature/GEODE-2267
Commit: bc6db4a6301607a352def097a96ddd72d13d42fd
Parents: c8d2166
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Feb 3 18:36:50 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Feb 6 12:25:18 2017 -0800
----------------------------------------------------------------------
.../geode/tools/pulse/PulseDataExportTest.java | 2 +-
.../apache/geode/SystemFailureJUnitTest.java | 2 +-
...ventQueueEvictionAndExpirationJUnitTest.java | 2 +-
.../AutoConnectionSourceImplJUnitTest.java | 2 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 2 +-
...ientExecutorSubmitTaskWithExceptionTest.java | 2 +-
.../query/cq/dunit/CqQueryTestListener.java | 2 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 2 +-
.../apache/geode/cache30/Bug44418JUnitTest.java | 4 +--
.../cache30/ClientMembershipDUnitTest.java | 2 +-
.../geode/cache30/ClientServerCCEDUnitTest.java | 2 +-
.../geode/cache30/ReconnectDUnitTest.java | 2 +-
.../geode/distributed/LocatorDUnitTest.java | 2 +-
.../geode/distributed/LocatorJUnitTest.java | 2 +-
.../internal/DistributionManagerDUnitTest.java | 2 +-
.../GemFireDeadlockDetectorDUnitTest.java | 2 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 2 +-
...hreadPoolExecutorWithKeepAliveJUnitTest.java | 2 +-
.../cache/ClientServerTransactionDUnitTest.java | 2 +-
.../cache/DiskRegRecoveryJUnitTest.java | 2 +-
.../internal/cache/EntryEventImplTest.java | 2 +-
...eAndForgetFunctionOnAllServersDUnitTest.java | 2 +-
.../cache/FixedPRSinglehopDUnitTest.java | 2 +-
.../internal/cache/GemFireCacheImplTest.java | 2 +-
.../MultipleOplogsRollingFeatureJUnitTest.java | 2 +-
.../geode/internal/cache/OplogJUnitTest.java | 2 +-
.../PartitionedRegionSingleHopDUnitTest.java | 2 +-
.../internal/cache/SingleHopStatsDUnitTest.java | 2 +-
.../geode/internal/cache/TXManagerImplTest.java | 2 +-
.../ha/BlockingHARegionQueueJUnitTest.java | 2 +-
.../cache/ha/HARegionQueueJUnitTest.java | 2 +-
.../cache/locks/TXLockServiceDUnitTest.java | 2 +-
...tentColocatedPartitionedRegionDUnitTest.java | 2 +-
.../PersistentPartitionedRegionDUnitTest.java | 2 +-
.../cache/partitioned/ShutdownAllDUnitTest.java | 2 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 2 +-
.../ClientServerForceInvalidateDUnitTest.java | 2 +-
.../DurableClientQueueSizeDUnitTest.java | 2 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 4 +--
.../sockets/HAStartupAndFailoverDUnitTest.java | 2 +-
.../sockets/UpdatePropagationDUnitTest.java | 2 +-
.../AsyncEventQueueValidationsJUnitTest.java | 2 +-
.../internal/net/SSLSocketIntegrationTest.java | 4 +--
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 2 +-
...leProcessControllerIntegrationJUnitTest.java | 2 +-
.../statistics/StatSamplerIntegrationTest.java | 2 +-
.../statistics/StatisticsDistributedTest.java | 2 +-
.../management/CacheManagementDUnitTest.java | 2 +-
...ersalMembershipListenerAdapterDUnitTest.java | 2 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 2 +-
...erConfigurationServiceUsingDirDUnitTest.java | 4 +--
.../internal/security/MultiUserDUnitTest.java | 2 +-
.../PDXGfshPostProcessorOnRemoteServerTest.java | 2 +-
.../security/PDXPostProcessorDUnitTest.java | 2 +-
.../org/apache/geode/test/dunit/Invoke.java | 8 +++---
.../geode/test/dunit/RepeatableRunnable.java | 3 +-
.../test/dunit/StoppableWaitCriterion.java | 2 +-
.../java/org/apache/geode/test/dunit/VM.java | 2 +-
.../java/org/apache/geode/test/dunit/Wait.java | 30 ++++++++++----------
.../apache/geode/test/dunit/WaitCriterion.java | 8 +++---
.../dunit/rules/GfshShellConnectionRule.java | 2 +-
.../rules/LocatorServerConfigurationRule.java | 2 +-
.../test/dunit/rules/LocatorStarterRule.java | 2 +-
.../sockets/DurableClientSimpleDUnitTest.java | 2 +-
.../cli/commands/ClientCommandsDUnitTest.java | 2 +-
.../security/CQPDXPostProcessorDUnitTest.java | 2 +-
.../LuceneIndexCreationIntegrationTest.java | 2 +-
...IndexCreationPersistenceIntegrationTest.java | 2 +-
.../LuceneIndexMaintenanceIntegrationTest.java | 2 +-
.../LuceneQueriesPeerPRRedundancyDUnitTest.java | 2 +-
.../cli/LuceneIndexCommandsDUnitTest.java | 2 +-
.../management/LuceneManagementDUnitTest.java | 2 +-
.../tools/pulse/tests/rules/ServerRule.java | 2 +-
.../util/AutoBalancerIntegrationJUnitTest.java | 2 +-
.../cache/wan/Simple2CacheServerDUnitTest.java | 2 +-
.../geode/internal/cache/wan/WANTestBase.java | 2 +-
...oncurrentParallelGatewaySenderDUnitTest.java | 2 +-
...allelGatewaySenderOperation_2_DUnitTest.java | 2 +-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 2 +-
...llelGatewaySenderQueueOverflowDUnitTest.java | 2 +-
.../wan/parallel/ParallelWANStatsDUnitTest.java | 2 +-
...rialGatewaySenderEventListenerDUnitTest.java | 2 +-
.../SerialGatewaySenderQueueDUnitTest.java | 2 +-
.../serial/SerialWANConflationDUnitTest.java | 2 +-
.../wan/serial/SerialWANStatsDUnitTest.java | 2 +-
.../management/WANManagementDUnitTest.java | 2 +-
gradle/dependency-versions.properties | 2 +-
gradle/test.gradle | 2 +-
89 files changed, 113 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
index 3c4fe70..28d50da 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
@@ -16,7 +16,7 @@
package org.apache.geode.tools.pulse;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.cache.client.ClientCacheFactory;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
index 279d8dd..cb37399 100644
--- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category(UnitTest.class)
public class SystemFailureJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
index bafb499..587602a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
@@ -21,7 +21,7 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 2f9f867..6f71dbc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
/**
*
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index bd8143e..700605e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -50,7 +50,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Assert;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
index 3a9ece9..529ed93 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
@@ -16,7 +16,7 @@ package org.apache.geode.cache.client.internal;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Rule;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java b/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
index 79209ef..c14eaac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
@@ -31,7 +31,7 @@ import org.apache.geode.cache.query.CqStatusListener;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
/**
*
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 5a0d3fc..d4f3c3e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -25,7 +25,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
index abb4a9f..9d50da7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug44418JUnitTest.java
@@ -23,7 +23,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import com.jayway.awaitility.core.ConditionTimeoutException;
+import org.awaitility.core.ConditionTimeoutException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static com.jayway.awaitility.Awaitility.with;
+import static org.awaitility.Awaitility.with;
import static org.junit.Assert.fail;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index 3756163..8aae5d5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -32,7 +32,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.ClientServerTest;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
index 9780563..75cd95b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
@@ -17,7 +17,7 @@ package org.apache.geode.cache30;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import java.util.ArrayList;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 03ce0b8..68ef7f0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.cache30;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 2e80107..dac66d9 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.ForcedDisconnectException;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.LogWriter;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
index fb41256..d7c96d6 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -56,7 +56,7 @@ import static org.apache.geode.internal.AvailablePort.SOCKET;
import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
import static org.junit.Assert.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category({IntegrationTest.class, MembershipTest.class})
@RunWith(Parameterized.class)
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
index 3b8da03..ccce013 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
@@ -17,7 +17,7 @@ package org.apache.geode.distributed.internal;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.test.dunit.Assert.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import java.net.InetAddress;
import java.net.UnknownHostException;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
index 9b68b23..e0bbde0 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 792a1fd..5365307 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -61,7 +61,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category({IntegrationTest.class, MembershipTest.class})
public class GMSHealthMonitorJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 14fedc6..b3076be 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
index c354c98..f47d40e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category(IntegrationTest.class)
public class ScheduledThreadPoolExecutorWithKeepAliveJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index a37aebd..270fbce 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit;
import javax.naming.Context;
import javax.transaction.UserTransaction;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import static org.apache.geode.distributed.ConfigurationProperties.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
index d6ee1ea..3fd091b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
index 07d7f4d..2ad9d02 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
@@ -20,7 +20,7 @@ import static org.mockito.Mockito.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
index d733ae0..33e312d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static java.util.concurrent.TimeUnit.*;
@Category(DistributedTest.class)
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
index 8c6d8b2..87b1e6e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
index 5f550e2..288a3e1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
index 85d19af..fbd7571 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.DistributionConfig;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
index 7df8982..7549ea7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.IntStream;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.commons.io.FileUtils;
import org.junit.Assert;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index 43096d6..ff82d4b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -32,7 +32,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
index 0d57155..0283674 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
index 3a5de2f..2e6225b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.partitioned.DestroyMessage;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category(UnitTest.class)
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
index ee1cd6d..125fb81 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
index 43f1ac7..796b27f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.After;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
index 14267a4..c23b64f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.locks;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 504c16b..47520bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 9479883..ba3444c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.cache.partitioned;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static java.util.concurrent.TimeUnit.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 52d1327..11254e7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index f31fd70..b569cf3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index 375279d..1a76daa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.cache.tier.sockets;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static org.junit.Assert.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 161ada4..de6d3c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -19,7 +19,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.util.JSR166TestCase.m2;
import static org.junit.Assert.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import java.io.Serializable;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
index c4032cb..1c03a0f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
@@ -15,8 +15,8 @@
package org.apache.geode.internal.cache.tier.sockets;
import static org.apache.geode.test.dunit.Invoke.*;
-import static com.jayway.awaitility.Awaitility.*;
-import static com.jayway.awaitility.Duration.*;
+import static org.awaitility.Awaitility.*;
+import static org.awaitility.Duration.*;
import static org.junit.Assert.*;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 391c906..98cb309 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index fbcbe3e..a3b0c2a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -26,7 +26,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 6c5d69c..049513b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.*;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
import org.junit.After;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 90ed468..d98c5d2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.net;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.internal.security.SecurableCommunicationChannel.*;
import static org.assertj.core.api.Assertions.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import com.sun.tools.hat.internal.model.StackTrace;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 034e967..0a0c331 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.offheap;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationJUnitTest.java
index 6feb81e..6ed12d4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationJUnitTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.process;
import static com.googlecode.catchexception.CatchException.*;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static java.util.concurrent.TimeUnit.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
index 0682739..62dc0af 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.statistics;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static java.util.concurrent.TimeUnit.*;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
index c9be72f..50311ce 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.statistics;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.test.dunit.Assert.*;
import static org.apache.geode.test.dunit.Host.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java
index 680579d..1e7af0c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.management;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static com.jayway.awaitility.Awaitility.*;
+import static org.awaitility.Awaitility.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
index eb2e662..e0d3d8b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -18,7 +18,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.test.dunit.Assert.*;
import static org.apache.geode.test.dunit.LogWriterUtils.*;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import java.io.IOException;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index fde7580..9174806 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static com.jayway.awaitility.Awaitility.waitAtMost;
+import static org.awaitility.Awaitility.waitAtMost;
import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
index fff7681..10d949e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceUsingDirDUnitTest.java
@@ -28,8 +28,8 @@ import static org.apache.geode.test.dunit.Host.getHost;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.core.ConditionFactory;
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
index b1e7765..37e7f45 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserDUnitTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.security.TestSecurityManager;
import org.json.JSONException;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
index 3fc3864..ae9b04f 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
index f6105e1..f8b17bc 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
index 002abd4..93c6fdd 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
@@ -128,7 +128,7 @@ public class Invoke {
}
/**
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} with
+ * @deprecated Please use {@link org.awaitility.Awaitility} with
* {@link #invokeInEveryVM(SerializableCallableIF)} instead.
*/
public static void invokeRepeatingIfNecessary(final VM vm, final RepeatableRunnable runnable) {
@@ -136,7 +136,7 @@ public class Invoke {
}
/**
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} with
+ * @deprecated Please use {@link org.awaitility.Awaitility} with
* {@link #invokeInEveryVM(SerializableCallableIF)} instead.
*/
public static void invokeRepeatingIfNecessary(final VM vm, final RepeatableRunnable runnable,
@@ -145,7 +145,7 @@ public class Invoke {
}
/**
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} with
+ * @deprecated Please use {@link org.awaitility.Awaitility} with
* {@link #invokeInEveryVM(SerializableCallableIF)} instead.
*/
public static void invokeInEveryVMRepeatingIfNecessary(final RepeatableRunnable runnable) {
@@ -157,7 +157,7 @@ public class Invoke {
* <code>run()</code> throws an assertion failure, its execution is repeated, until no assertion
* failure occurs or <code>repeatTimeoutMs</code> milliseconds have passed.
*
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} with
+ * @deprecated Please use {@link org.awaitility.Awaitility} with
* {@link #invokeInEveryVM(SerializableCallableIF)} instead.
*/
public static void invokeInEveryVMRepeatingIfNecessary(final RepeatableRunnable runnable,
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java b/geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java
index 57edf58..3403aa2 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java
@@ -18,8 +18,7 @@ package org.apache.geode.test.dunit;
* A RepeatableRunnable is an object that implements a method that can be invoked repeatably without
* causing any side affects.
*
- * @deprecated Please use SerializableRunnable with {@link com.jayway.awaitility.Awaitility}
- * instead.
+ * @deprecated Please use SerializableRunnable with {@link org.awaitility.Awaitility} instead.
*/
@Deprecated
public interface RepeatableRunnable {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java b/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
index bea1ca2..775584f 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
@@ -19,7 +19,7 @@ package org.apache.geode.test.dunit;
*
* Extracted from DistributedTestCase.
*
- * @deprecated Use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Use {@link org.awaitility.Awaitility} instead.
*/
public interface StoppableWaitCriterion extends WaitCriterion {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
index 6055f8b..0b188ae 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
@@ -21,7 +21,7 @@ import java.io.StringWriter;
import java.rmi.RemoteException;
import java.util.concurrent.Callable;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import hydra.MethExecutorResult;
import org.apache.geode.internal.process.ProcessUtils;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
index f25810e..20fbb5b 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
@@ -38,15 +38,15 @@ import org.apache.geode.internal.logging.LogService;
* Extracted from DistributedTestCase.
*
* <p>
- * Deprecated in favor of using {@link com.jayway.awaitility.Awaitility}.
+ * Deprecated in favor of using {@link org.awaitility.Awaitility}.
*
* <p>
* Examples of using Awaitility:
*
* <pre>
*
- * import static com.jayway.awaitility.Awaitility.*;
- * import static com.jayway.awaitility.Duration.*; // optional
+ * import static org.awaitility.Awaitility.*;
+ * import static org.awaitility.Duration.*; // optional
* import static java.util.concurrent.TimeUnit.*; // optional
*
* await().atMost(2, SECONDS).until(() -> isDone());
@@ -96,8 +96,8 @@ import org.apache.geode.internal.logging.LogService;
*
* To:
*
- * import static com.jayway.awaitility.Awaitility.*;
- * import static com.jayway.awaitility.Duration.*;
+ * import static org.awaitility.Awaitility.*;
+ * import static org.awaitility.Duration.*;
* import static java.util.concurrent.TimeUnit.*;
*
* await("resource never closed").atMost(2, SECONDS).untilCall(() -> isClosed());
@@ -107,11 +107,11 @@ import org.apache.geode.internal.logging.LogService;
* await("resource never closed").atMost(2, SECONDS).pollDelay(ZERO).pollInterval(200, MILLISECONDS).untilCall(() -> isClosed());
* </pre>
*
- * @deprecated Use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Use {@link org.awaitility.Awaitility} instead.
*
- * @see com.jayway.awaitility.Awaitility
- * @see com.jayway.awaitility.Duration
- * @see com.jayway.awaitility.core.ConditionFactory
+ * @see org.awaitility.Awaitility
+ * @see org.awaitility.Duration
+ * @see org.awaitility.core.ConditionFactory
*/
@Deprecated
public class Wait {
@@ -123,7 +123,7 @@ public class Wait {
/**
* Pause for a default interval (250 milliseconds).
*
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static void pause() {
pause(250);
@@ -133,7 +133,7 @@ public class Wait {
* Pause for the specified milliseconds. Make sure system clock has advanced by the specified
* number of millis before returning.
*
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static final void pause(final int milliseconds) {
if (milliseconds >= 1000 || logger.isDebugEnabled()) { // check for debug but log at info
@@ -160,7 +160,7 @@ public class Wait {
* @param timeoutMillis total time to wait, in milliseconds
* @param pollingInterval pause interval between waits
* @param throwOnTimeout if false, don't generate an error
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
@Deprecated
public static void waitForCriterion(final WaitCriterion waitCriterion, final long timeoutMillis,
@@ -209,7 +209,7 @@ public class Wait {
*
* @param cacheTimeMillisSource region that provides cacheTimeMillis
* @return the last time stamp observed
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static final long waitForExpiryClockToChange(final LocalRegion cacheTimeMillisSource) {
return waitForExpiryClockToChange(cacheTimeMillisSource,
@@ -222,7 +222,7 @@ public class Wait {
* @param cacheTimeMillisSource region that provides cacheTimeMillis
* @param baseTime the timestamp that the clock must exceed
* @return the last time stamp observed
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static final long waitForExpiryClockToChange(final LocalRegion cacheTimeMillisSource,
final long baseTime) {
@@ -243,7 +243,7 @@ public class Wait {
* @param milliseconds total amount of time to wait
* @param pollingInterval interval to pause for the wait
* @param throwOnTimeout if false, no error is thrown.
- * @deprecated Please use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
public static void waitMutex(final WaitCriterion waitCriterion, final Object mutex,
final long milliseconds, final long pollingInterval, final boolean throwOnTimeout) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java b/geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java
index 332fe84..3f95c0f 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java
@@ -23,12 +23,12 @@ package org.apache.geode.test.dunit;
* <p>
* See javadocs on {@link Wait} for examples and guidelines for converting to Awaitility.
*
- * @deprecated Use {@link com.jayway.awaitility.Awaitility} instead.
+ * @deprecated Use {@link org.awaitility.Awaitility} instead.
*
* @see Wait
- * @see com.jayway.awaitility.Awaitility
- * @see com.jayway.awaitility.Duration
- * @see com.jayway.awaitility.core.ConditionFactory
+ * @see org.awaitility.Awaitility
+ * @see org.awaitility.Duration
+ * @see org.awaitility.core.ConditionFactory
*/
public interface WaitCriterion {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
index c74d6c7..05f81c8 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
@@ -16,7 +16,7 @@ package org.apache.geode.test.dunit.rules;
import static org.assertj.core.api.Assertions.assertThat;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.HeadlessGfsh;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerConfigurationRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerConfigurationRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerConfigurationRule.java
index bbca60c..0a63962 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerConfigurationRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerConfigurationRule.java
@@ -27,7 +27,7 @@ import java.net.UnknownHostException;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.rules.ExternalResource;
import org.apache.geode.distributed.Locator;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
index 6fc0d03..00a0f1e 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
@@ -21,7 +21,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_S
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalLocator;
import org.junit.rules.ExternalResource;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 0ea7050..0a45494 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -69,7 +69,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 0f8f5a0..7dd92bf 100644
--- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -43,7 +43,7 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
index c8b6802..0bafb68 100644
--- a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
index b21d9c0..b696676 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
@@ -52,7 +52,7 @@ import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
index 3b6146b..81e76f5 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
index 644ed78..e6c4503 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
import java.io.Serializable;
import java.util.concurrent.TimeUnit;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
index 59c14a2..a9772eb 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
index 1c8bc88..2bb5b4b 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.*;
import org.apache.geode.test.junit.categories.DistributedTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
index ef4681c..ab146f8 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
index 7822caa..af3d64b 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
@@ -17,7 +17,7 @@
package org.apache.geode.tools.pulse.tests.rules;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.management.internal.JettyHelper;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
index 7c336b0..d3c48aa 100755
--- a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
+++ b/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
index 9937cc0..d548613 100755
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
@@ -50,7 +50,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.ha.HAContainerRegion;
import org.apache.geode.test.junit.categories.FlakyTest;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
@Category(DistributedTest.class)
public class Simple2CacheServerDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 3f7f4c2..4620f1d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
http://git-wip-us.apache.org/repos/asf/geode/blob/bc6db4a6/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index 6a932a9..c109ea2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.wan.concurrent;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import org.junit.experimental.categories.Category;
import org.junit.Test;